Commit Graph

8363 Commits

Author SHA1 Message Date
Max Brunsfeld
2fa3b65364 Merge branch 'master' into mb-tree-sitter-parsers 2018-01-03 15:20:10 -08:00
Nathan Sobo
5743c41e03 Merge pull request #16282 from atom/io-electron-1.7
Upgrade electron to 1.7.10
2018-01-03 16:19:20 -07:00
Max Brunsfeld
6998c2df8c Merge branch 'master' into mb-tree-sitter-parsers 2018-01-03 14:53:06 -08:00
Max Brunsfeld
733d6381cc Fix handling of {undo: 'skip'} in TextEditor.insertText
Signed-off-by: Nathan Sobo <nathan@github.com>
2018-01-03 13:00:53 -08:00
Max Brunsfeld
629cb206ec Fix handling of empty tokens in TreeSitterHighlightIterator 2018-01-03 09:34:12 -08:00
Max Brunsfeld
aed6248b7b Merge branch 'master' into mb-tree-sitter-parsers 2017-12-29 16:21:54 -08:00
Ford Hurley
065f4c48ec Avoid dependency on shared state
The test was passing only when run in isolation.
2017-12-27 16:37:55 -05:00
Max Brunsfeld
0b6e994ac6 Merge branch 'master' into mb-tree-sitter-parsers 2017-12-27 12:35:51 -08:00
Ford Hurley
3ad3852dd6 Add a test for generated TextEditor ids 2017-12-27 15:16:22 -05:00
Antonio Scandurra
69799d35b2 Delete Chrome 56 workarounds 2017-12-22 14:44:17 +01:00
Antonio Scandurra
011766768a Fix AtomEnvironment tests 2017-12-22 12:05:03 +01:00
Wliu
84f6203a30 Merge pull request #16322 from atom/wl-more-history-fixes
More history manager fixes in specs
2017-12-21 12:20:06 -05:00
Wliu
1d6549a8e3 Merge pull request #16328 from atom/wl-right-click-selections
Update auxiliary click logic for moving cursors
2017-12-21 12:18:41 -05:00
Max Brunsfeld
c844a253e0 Implement TreeSitterLanguageMode.scopeDescriptorForPosition 2017-12-15 17:15:39 -08:00
Max Brunsfeld
4adfba47cc Support legacyScopeName field on tree-sitter grammars
* Use the field for mapping scope names in GrammarRegistry.grammarForId
* Use the field for adapting legacy scoped settings to work with tree-sitter parsers

Signed-off-by: Nathan Sobo <nathan@github.com>
2017-12-15 16:57:36 -08:00
Max Brunsfeld
f4fa7f910e Merge branch 'master' into mb-tree-sitter-parsers 2017-12-15 09:45:21 -08:00
Max Brunsfeld
e09ee1c1fa Fix error in TreeSitterHighlightIterator.seek 2017-12-15 09:44:45 -08:00
Damien Guard
ca53cf9ec1 Remove the texteditor isModified/isReadOnly handling intended for unsavable edit buffers as causes issues with vim-mode-plus 2017-12-13 09:17:30 -08:00
Max Brunsfeld
43c6f4ccb0 Merge branch 'master' into mb-tree-sitter-parsers 2017-12-11 09:18:31 -08:00
Max Brunsfeld
e669152841 Merge pull request #16074 from UziTech/patch-4
Make notifications.clear public and emit event
2017-12-08 14:20:33 -08:00
Tony Brix
b89bfa26c3 more cleanup 2017-12-08 16:18:06 -06:00
Tony Brix
d28166b1e4 code cleanup 2017-12-08 16:15:51 -06:00
Max Brunsfeld
a7a53f4158 Allow multiple child types to be specified as fold start or end 2017-12-07 17:08:47 -08:00
Max Brunsfeld
ad492ef344 Merge branch 'master' into mb-tree-sitter-parsers 2017-12-07 17:07:18 -08:00
Max Brunsfeld
f712de65d0 Fix nesting level calculation for children of partially-folded nodes
Signed-off-by: Nathan Sobo <nathan@github.com>
2017-12-07 15:30:48 -08:00
Max Brunsfeld
136dc86584 Leave muli-character fold end tokens on their own line
Signed-off-by: Nathan Sobo <nathan@github.com>
2017-12-07 15:29:11 -08:00
GilTeixeira
be9e4696e6 Updated theme manager specs. 2017-12-07 18:58:52 +00:00
Max Brunsfeld
725d7db7ae Merge branch 'master' into mb-tree-sitter-parsers 2017-12-06 14:56:09 -08:00
Max Brunsfeld
3f775b5505 Fix folding of internal nodes when fold end isn't specified 2017-12-06 11:09:44 -08:00
Max Brunsfeld
f3715779e5 Support contentRegExp field on grammars, to match more than one line
Signed-off-by: Nathan Sobo <nathan@github.com>
2017-12-05 16:26:24 -08:00
Wliu
db392502e4 Always move the cursor on middle-click 2017-12-05 23:54:43 +01:00
Katrina Uychaco
b3cee41f28 Merge remote-tracking branch 'origin/master' into ku-add-readonly-editor-attribute 2017-12-05 14:02:39 -08:00
Max Brunsfeld
a475baf4b5 Rework fold API for tree-sitter grammars 2017-12-05 12:39:52 -08:00
Wliu
266a40d914 📝 2017-12-05 11:37:04 +01:00
Wliu
6852fe8ee5 🎨 2017-12-05 11:34:11 +01:00
Wliu
7b53a4f498 Don't require HistoryManager in spec-helper 2017-12-05 11:33:25 +01:00
Wliu
4f86d60f7b Update HistoryManager spec to mock the state store 2017-12-05 01:22:13 +01:00
Wliu
376919772b Spy on HistoryManager prototype
To prevent other instances of HistoryManager from messing up the project
history
2017-12-05 00:47:03 +01:00
Wliu
4ac6b720ff Merge pull request #16256 from atom/wl-more-reporter-work
Improve spec stack traces
2017-12-04 22:18:08 +01:00
Damien Guard
abc0d3c534 Remove stray console log 2017-12-04 13:13:03 -08:00
Damien Guard
70e773fa7b Ensure read-only text editors are not considered 'modified'. Also clear read-only flag on successful save. 2017-12-04 13:12:08 -08:00
Max Brunsfeld
8a1c7619f3 Add test for .select{Larger,Smaller}SyntaxNode 2017-12-04 12:07:05 -08:00
Max Brunsfeld
98e11673aa Tweak TreeSitterLanguageMode folding configuration 2017-12-04 11:40:44 -08:00
Max Brunsfeld
4e38b61a5e Optimize TreeSitterLanguageMode.isFoldableAtRow 2017-12-04 11:02:24 -08:00
Max Brunsfeld
6282cd639a Add tree-sitter highlighting test with nested scopes 2017-12-04 10:18:38 -08:00
Max Brunsfeld
6e2ac3548f Ensure that all opened editors' buffers are added to the project
Assigning a language mode happens when adding a buffer to the project,
so we need to guarantee this happens to all buffers used by visible editors.
2017-12-01 09:58:19 -08:00
Max Brunsfeld
49d8d94218 🎨 workspace-spec.js 2017-12-01 09:47:20 -08:00
Max Brunsfeld
7665c34496 Start on TreeSitterLanguageMode spec 2017-11-30 17:13:30 -08:00
Max Brunsfeld
273d708a48 Add preference for using Tree-sitter parsers 2017-11-30 14:21:53 -08:00
Max Brunsfeld
894ce56821 Don't use JS as an example in removeGrammar test 2017-11-30 09:39:30 -08:00