github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
32,478 Commits 140 Branches 571 Tags
1e38da6519a4dace2f40ec0099bceec5e64b239a
Commit Graph

354 Commits

Author SHA1 Message Date
Max Brunsfeld
ee2e18737e Fix maintenance of grammars for copied editors 2016-08-08 11:17:30 -07:00
Max Brunsfeld
ddfb124cb8 Merge branch 'master' into ns-mb-detangle-editor 2016-08-05 09:39:43 -07:00
Max Brunsfeld
74f8890592 ⬆️ text-buffer for marker layer destruction fixes 2016-08-04 12:37:51 -07:00
Max Brunsfeld
43f34f73da Supply missing softWrapHangingIndent parameter to display layer 2016-08-02 16:20:23 -07:00
Max Brunsfeld
3d796df401 Stop using GrammarRegistry in TextEditor 2016-07-27 14:09:17 -07:00
Max Brunsfeld
a44d5833a8 Move grammar override logic into TextEditorRegistry 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-26 15:00:20 -07:00
Max Brunsfeld
455d3213ed Return token objects from tokensForScreenRow 
Include the text of each token alongside its array of scopes.

Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-26 12:39:41 -07:00
Max Brunsfeld
4eb2f6631a 👕 Fix lint errors 2016-07-15 13:32:23 -07:00
Max Brunsfeld
b1f5583c4e Remove stray usages of atom.config in text-editor-spec 2016-07-12 11:31:03 -07:00
Max Brunsfeld
58ec44f8ec Move handling of nonWordCharacters setting into TextEditorRegistry 2016-07-12 11:30:41 -07:00
Max Brunsfeld
7a50aa9f9f Move handling of auto indent settings to TextEditorRegistry 2016-07-11 17:37:51 -07:00
Max Brunsfeld
cdc9bdea61 Use setter methods instead of config settings in TextEditor test 2016-07-11 17:03:44 -07:00
Max Brunsfeld
25035d8fce Remove some config usages from text editor spec 2016-07-11 13:52:05 -07:00
Antonio Scandurra
811ab26f61 Return an update promise in TextEditor.prototype.update() 2016-07-08 09:42:08 +02:00
Antonio Scandurra
b46ae1e681 Allow autoHeight to be updated in TextEditor.prototype.update 2016-06-30 15:30:05 +02:00
Antonio Scandurra
8cb0fbcc5c Allow autoHeight to be set from the editor 2016-06-30 15:27:47 +02:00
Antonio Scandurra
7325381fd6 🎨 2016-06-30 15:08:51 +02:00
Antonio Scandurra
ccf73189ee Allow scrollPastEnd to be updated in TextEditor.prototype.update 2016-06-30 15:07:20 +02:00
Antonio Scandurra
c769b169aa Allow scrollPastEnd to be set from the editor 2016-06-30 15:05:21 +02:00
Antonio Scandurra
7beafa2da6 Introduce TextEditor.prototype.update 
This allows TextEditor objects to be used within an etch component
easily.
 2016-06-30 12:42:15 +02:00
Nathan Sobo
8a3d5f8534 Use preferred line length as a *maximum* for soft wrapping 
...if the softWrapAtPreferredLineLength config setting is enabled.
 2016-06-16 08:42:30 -06:00
Antonio Scandurra
d06da3f470 Reset display layer when editor.atomicSoftTabs changes 2016-05-05 09:10:36 +02:00
Antonio Scandurra
ca041384fe Merge pull request #11414 from atom/ns-switch-to-display-layers 
Use display layers facility of text-buffer; delete all the code they replace
 2016-05-04 20:46:15 +02:00
Damien Guard
ee3425d543 Merge pull request #11323 from clickthisnick/master 
Update Grammar In Spec Files
 2016-05-04 11:22:37 -07:00
Antonio Scandurra
36bcb542a8 Don't move down a line if it's the last buffer row 2016-05-03 12:58:59 +02:00
Antonio Scandurra
1c694df03b Don't show indent guides for mini editors 2016-05-01 11:42:28 +02:00
Antonio Scandurra
ce4b2fa810 Merge branch 'master' into ns-switch-to-display-layers 
# Conflicts:
#	src/display-buffer.coffee
#	src/text-editor.coffee
#	src/tokenized-buffer.coffee
 2016-04-27 18:16:03 +02:00
joshaber
aa9e8ab620 Update the spec. 2016-04-26 14:56:00 -04:00
Antonio Scandurra
4f6687324e Include bufferRange in decorationsStateForScreenRowRange 2016-04-26 12:09:38 +02:00
Antonio Scandurra
00ebe6bbbc Merge branch 'master' into ns-switch-to-display-layers 
# Conflicts:
#	src/text-editor.coffee
 2016-04-26 10:19:39 +02:00
joshaber
956e037681 But without the space. 2016-04-25 14:20:54 -04:00
joshaber
d494f065df Update the spec. 2016-04-25 14:12:42 -04:00
Antonio Scandurra
754cbc2a67 Merge branch 'master' into ns-switch-to-display-layers 
# Conflicts:
#	spec/tokenized-buffer-spec.coffee
 2016-04-20 10:55:56 +02:00
Damien Guard
99e716f9ed Fix specs failures on Windows including paths 2016-04-15 11:25:05 -07:00
Antonio Scandurra
bef7539e34 Refactor DisplayBuffer to DecorationManager 
This commit moves all the remaining concerns not related to decorations
out of `DisplayBuffer` and into `TextEditor`. This means the
`DisplayBuffer` is now free to be renamed to `DecorationManager`.
 2016-04-05 18:43:08 +02:00
Antonio Scandurra
e6cfb8d587 Use a zero-width nbsp as our fold character 2016-04-05 11:34:14 +02:00
Antonio Scandurra
fd960e9a37 Merge branch 'master' into ns-use-display-layers 2016-04-04 15:25:50 +02:00
Nick Smith
6f6b14dbf1 Update text-editor-spec.coffee 
Grammar Update
 2016-03-30 22:56:34 -04:00
Machiste Quintana
3b222dbee8 Don't merge selections if at start or end of line 2016-03-28 23:26:28 -07:00
Machiste Quintana
e932e3db05 Merge branch 'master' into mq-move-selected-columns 2016-03-28 22:16:31 -07:00
Antonio Scandurra
c609f6c967 Destroy DisplayLayer upon DisplayBuffer destruction 2016-03-25 10:53:02 +01:00
Antonio Scandurra
0a634a5870 💚 Fix more tests using tokenizedLineForScreenRow 2016-03-25 10:49:32 +01:00
Antonio Scandurra
27aad42644 Handle tab length retokenization in DisplayLayer 
We still want to keep the tab length in TokenizedBuffer, because we need
it to understand if a certain buffer row is foldable or not (due to the
indent level)
 2016-03-25 10:33:12 +01:00
Antonio Scandurra
e6cb5c8e89 🐛 Guard against unexisting screen rows 2016-03-24 15:57:24 +01:00
Antonio Scandurra
87489d4b0b Fix TextEditor cutToEndOfLine() test 
…which was failing due to the different soft-wrapping rules.
 2016-03-24 14:15:06 +01:00
Antonio Scandurra
4136e27d44 Fix TextEditor backspace() and delete() specs 2016-03-24 13:58:58 +01:00
Antonio Scandurra
3d9835bbbd 💚 WIP: Continue fixing TextEditor specs 2016-03-22 16:05:38 +01:00
Antonio Scandurra
326f2c6a9e Add TextEditor.prototype.tokensForScreenRow for testing purposes 2016-03-22 14:49:42 +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