github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 06:48:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
28,202 Commits 140 Branches 571 Tags
227670a4073105f08e2d2d9dcdfd93b47057ae37
Commit Graph

28202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Scandurra
227670a407 Merge branch 'master' into ns-use-display-layers 2016-03-22 12:01:07 +01:00
Michelle Tilley
64308bbacb Revert "Revert "Allow pasting white space when autoIndentOnPaste is enabled"" 
This reverts commit 5c03894227.
 2016-03-21 16:27:48 -07:00
Michelle Tilley
449abd7364 Revert "Revert "Add spec for inserting white-space-only lines"" 
This reverts commit fd17457c17.
 2016-03-21 16:27:41 -07:00
Nathan Sobo
fd17457c17 Revert "Add spec for inserting white-space-only lines" 
This reverts commit 746afb98ad.

@BinaryMuse Heads up this is the test associated with the other commit
you reverted. Had to revert it as well to get the build green. Didn’t
see a revert on beta so I’m assuming this is good enough?
 2016-03-21 17:18:47 -06:00
Michelle Tilley
c5ed25a131 ⬆️ apm 2016-03-21 15:32:42 -07:00
Michelle Tilley
439825ea37 ⬆️ settings-view 2016-03-21 14:32:45 -07:00
Michelle Tilley
32a1d21a0d ⬆️ apm 2016-03-21 14:03:25 -07:00
Antonio Scandurra
8f2ebe8b79 🔥 2016-03-21 17:46:58 +01:00
Michelle Tilley
5c03894227 Revert "Allow pasting white space when autoIndentOnPaste is enabled" 
This reverts commit 0088053de4.
 2016-03-20 22:22:33 -07:00
Nathan Sobo
5aba734a41 Remove specialTokens object from TokenizedLine 2016-03-18 19:21:12 -06:00
Nathan Sobo
b0c5870425 Remove dead code from TokenizedLine 2016-03-18 18:15:41 -06:00
Nathan Sobo
1994e3b404 Remove TokenizedLine::copy 2016-03-18 18:10:04 -06:00
Nathan Sobo
462157039b Drop indentLevel and soft wrap support from TokenizedLine 2016-03-18 18:09:23 -06:00
Nathan Sobo
d62ef599cd Replace tokens with tagCodes in DisplayLayer.prototype.getScreenLines 2016-03-18 15:57:49 -06:00
Nathan Sobo
1a2f306db3 🚿 Remove commented code 2016-03-18 15:57:03 -06:00
Antonio Scandurra
0cd6bd19af Implement isWrapBoundary for DisplayLayer 
So that we can correctly soft wrap CJK characters.
 2016-03-18 18:30:35 +01:00
Josh Abernathy
39592599b1 Merge pull request #11201 from atom/bf-async-await 
Remove an unnecessary call to then().
 2016-03-18 13:29:11 -04:00
Michael Bolin
bb8f114dcb Remove an unnecessary call to then(). 
I see that this file has a little use of async/await and many uses of `then()`.
Things would be much less verbose and much more linear if async/await were used throughout.
Would Atom be open to a PR that changes this?

For bonus points, we could also replace `'use babel'` with `/* @flow */` at the top of the file :)
 2016-03-18 09:56:33 -07:00
Antonio Scandurra
bbcbe9e809 Implement ratioForCharacter 2016-03-18 14:58:13 +01:00
Antonio Scandurra
3c70ff92f4 💚 Add TextEditor.prototype.screenLineForScreenRow 
This is going to supplant our internal usage of
TextEditor.prototype.tokenizedLineForScreenRow().
 2016-03-18 14:26:29 +01:00
Antonio Scandurra
d1306ae944 Remove invisibles handling from TokenizedBuffer 2016-03-18 14:09:52 +01:00
Antonio Scandurra
d666e4c008 Fix lastScreenRowForBufferRow 
…which was mistakenly translating screen positions to buffer positions,
and not vice versa.
 2016-03-18 11:48:52 +01:00
Antonio Scandurra
5fc699f791 Use intersecting folds when duplicating lines 2016-03-18 11:44:23 +01:00
Antonio Scandurra
d86309e46b Use DisplayLayer.prototype.foldBufferRange in Selection.prototype.fold 2016-03-18 11:33:29 +01:00
Antonio Scandurra
83da3ca440 Fix moveLineUp and moveLineDown 2016-03-18 11:24:22 +01:00
Antonio Scandurra
1d1bdf5872 Improve folds behavior when duplicating lines 
Now we will select the entire screen line (which could contain some
free-form fold), and we duplicate its contents preserving the structure
of the existing folds.
 2016-03-18 11:04:30 +01:00
Wliu
74407fc025 Merge pull request #11194 from fruchtose/destory-typo 
Fix typo: destory -> destroy
 2016-03-17 22:50:11 -04:00
Josh Abernathy
eb72a23039 Merge pull request #11188 from atom/bump-status-bar 
Bump status-bar
 2016-03-17 22:45:22 -04:00
joshaber
dd5886e135 ⬆️ line-ending-selector@0.4.1 2016-03-17 22:19:48 -04:00
joshaber
543015af97 ⬆️ incompatible-packages@0.26.1 2016-03-17 22:19:38 -04:00
Robert Fruchtman
1c5ad8db0f destory -> destroy 2016-03-17 19:11:07 -07:00
joshaber
145396a73f Hwoops 2016-03-17 22:05:15 -04:00
joshaber
85526198f7 ⬆️ line-ending-selector@0.4 2016-03-17 22:03:26 -04:00
joshaber
7863ffbac7 ⬆️ incompatible-packages@0.26 2016-03-17 22:03:16 -04:00
Michelle Tilley
4e9fa72fd1 ⬆️ about 2016-03-17 13:24:59 -07:00
joshaber
ffe13db768 Revert "Revert "⬆️ status-bar@1.2.0"" 
This reverts commit acbd349312.
 2016-03-17 15:51:33 -04:00
joshaber
acbd349312 Revert "⬆️ status-bar@1.2.0" 
This reverts commit 215f120789.
 2016-03-17 13:43:06 -04:00
Hubot
292233f6cb 1.8.0-dev 2016-03-17 12:11:31 -05:00
Daniel Hengeveld
7c4dcf8f58 Merge branch 'master' of github.com:atom/atom 2016-03-17 15:45:41 +01:00
Daniel Hengeveld
e3a5a93b88 ⬆️ settings@0.235.0 2016-03-17 15:45:24 +01:00
joshaber
215f120789 ⬆️ status-bar@1.2.0 2016-03-17 10:34:02 -04:00
Antonio Scandurra
bf5a0d8c8c Adjust assertions based on the new soft-wrap logic 2016-03-17 15:11:27 +01:00
Antonio Scandurra
43f27780fd Fix specs related to the produced HTML line output 
This verifies that with the new DisplayLayer the produced output is
cleaner when tags interleave.
 2016-03-17 14:56:23 +01:00
Antonio Scandurra
5efb969a63 💚 Start fixing TextEditorComponent specs 2016-03-17 11:33:17 +01:00
Antonio Scandurra
f57fb3176a Add back lineIdForScreenRow 2016-03-17 11:19:05 +01:00
Antonio Scandurra
23ddeb7f08 🔥 Put back commented out LOC 2016-03-17 10:38:23 +01:00
Antonio Scandurra
708da39355 Avoid using tokenizedLineForScreenRow in TextEditorPresenter specs 2016-03-17 10:35:54 +01:00
Antonio Scandurra
661417e362 Update lines in TextEditorPresenter.prototype.getPostMeasurementState() 
Calling ::updateHorizontalDimensions might cause the editor vertical
coordinates (e.g. height, scroll top) to change, so we need to fetch
lines again from `DisplayLayer`.
 2016-03-17 09:42:36 +01:00
Antonio Scandurra
670123a9f7 More fixes in FakeLinesYardstick 2016-03-17 09:28:48 +01:00
Antonio Scandurra
2e41e9ead4 Reset DisplayLayer every time config changes 2016-03-16 19:19:00 +01:00