Commit Graph

35047 Commits

Author SHA1 Message Date
Max Brunsfeld
9484729969 Make select-larger-syntax-node command respect injected languages
Co-Authored-By: Ashi Krishnan <queerviolet@github.com>
2018-07-09 11:06:53 -07:00
Max Brunsfeld
d3497c5e67 ⬆️ tree-sitter 2018-07-06 17:29:39 -07:00
Max Brunsfeld
653a66619a Fix error when injection points are added before grammars are loaded 2018-07-06 15:31:33 -07:00
Max Brunsfeld
1c64fc85a8 Preload main modules of language-html and language-javascript 2018-07-06 14:56:46 -07:00
Max Brunsfeld
4de1a5c23d Merge branch 'master' into tree-sitter-injections 2018-07-06 14:03:56 -07:00
Max Brunsfeld
670371c376 Fix propogation of included ranges for injections within injections
Co-Authored-By: Ashi Krishnan <queerviolet@github.com>
2018-07-06 13:53:13 -07:00
David Wilson
aa547fe511 ⬆️ github@0.17.2 2018-07-06 12:29:16 -07:00
Max Brunsfeld
a9da395f60 Fix linter errors 2018-07-06 12:21:11 -07:00
Max Brunsfeld
577c565dc8 Fix language-javascript version 2018-07-06 12:20:56 -07:00
Max Brunsfeld
1ba18314f9 Remove grammar argument from populateInjections
Co-Authored-By: Ashi Krishnan <queerviolet@github.com>
2018-07-06 12:15:30 -07:00
Max Brunsfeld
c8830e5718 ⬆️ language-javascript, language-html 2018-07-06 12:00:22 -07:00
Max Brunsfeld
94999cc5e3 Revert "Allow for parsing injections in parallel"
This reverts commit a484ca9e65.
2018-07-06 11:54:18 -07:00
Max Brunsfeld
bb3cce9ab2 Merge pull request #17636 from atom/fb-mdt-reset-goal-column-on-home
Reset goal column on all cursor changes
2018-07-06 11:39:37 -07:00
Matthew Dapena-Tretter
f60f1692fd Reset goal column on all cursor changes
Previously, pressing the home key (move-to-first-character-of-line)
while on an empty line wouldn't clear the goal column. This is because
it was only cleared on cursor *change* and that didn't result in a
change. With this commit, it's *always* cleared. Operations that want
to preserve the goal column can reset it afterwards.
2018-07-05 20:13:59 -07:00
Max Brunsfeld
9886fa1cf1 ⬆️ text-buffer 2018-07-05 16:14:21 -07:00
Max Brunsfeld
ae1849609c Remove package lock files 2018-07-05 15:02:49 -07:00
Max Brunsfeld
56f82b16af ⬆️ tree-sitter 2018-07-05 15:01:20 -07:00
Ashi Krishnan
8f16cf1f19 injectionPoint content can return an array of nodes now 2018-07-05 17:46:13 -04:00
Jason Rudolph
eb2f365fd4 Merge pull request #17633 from atom/metrics-1.5.0
⬆️ metrics@1.5.0
2018-07-05 16:26:32 -04:00
Ashi Krishnan
0e15dc2ffe Merge branch 'tree-sitter-injections' of github.com:atom/atom into tree-sitter-injections 2018-07-05 13:09:28 -04:00
Ashi Krishnan
302ee1e2c1 WIP child ranges 2018-07-05 13:09:22 -04:00
Max Brunsfeld
4be923fe32 Merge branch 'master' into tree-sitter-injections 2018-07-05 09:55:31 -07:00
Jason Rudolph
735c87b748 ⬆️ metrics@1.5.0 2018-07-05 12:45:36 -04:00
Ashi Krishnan
aca13c1d6d merge 2018-07-05 12:14:26 -04:00
Jason Rudolph
55fc576003 Merge pull request #17620 from atom/electron-2.0.4
⬆️ electron@2.0.4
2018-07-03 17:19:00 -04:00
Jason Rudolph
c8be4e0bd4 ⬆️ :electron: 2.0.4 2018-07-03 16:15:11 -04:00
Tilde Ann Thurium
bebee2d253 Merge pull request #17619 from atom/tt-bump-metrics-1.4.3
⬆️ metrics 1.4.3
2018-07-03 12:57:02 -07:00
Tilde Ann Thurium
a62462f66b ⬆️ metrics 1.4.3 2018-07-03 11:23:16 -07:00
Jason Rudolph
c99469cba1 ⬆️ archive-view@0.65.1 2018-07-03 10:10:28 -04:00
Tilde Ann Thurium
664dc7b275 Merge pull request #17613 from atom/tt-18-jul-bump-metrics
⬆️ metrics to 1.4.1
2018-07-02 13:56:58 -07:00
Tilde Ann Thurium
3e2520ebfd ⬆️ metrics 2018-07-02 13:00:39 -07:00
Wliu
f99077c68a Merge pull request #17609 from atom/wl-jasmine-format
Update Jasmine stacktrace formatting
2018-07-01 18:41:49 -04:00
Wliu
06ea494f46 Update Jasmine stacktrace formatting 2018-07-01 17:18:16 -04:00
Max Brunsfeld
a484ca9e65 Allow for parsing injections in parallel 2018-06-29 16:26:51 -07:00
Max Brunsfeld
e16e68094f Update highlighting when an injectable tree-sitter grammar is loaded 2018-06-29 14:47:38 -07:00
Max Brunsfeld
ea9b7cee47 Merge pull request #17603 from atom/mb-clear-snapshot-cache
Clear electron-link's snapshot cache in script/clean
2018-06-29 13:48:43 -07:00
Max Brunsfeld
623af0ca90 Fix possible mismatch between .findMarkers and .descendantsOfType 2018-06-29 12:55:43 -07:00
Max Brunsfeld
60c59c795c Fix highlighting problem when seeking past the end of a syntax tree 2018-06-29 12:53:43 -07:00
Max Brunsfeld
e7c6a8f085 Clear electron-link's snapshot cache in script/clean 2018-06-29 12:31:09 -07:00
Max Brunsfeld
41c124cc13 Define highlight iter's position in terms of tree cursor position
Co-Authored-By: Ashi Krishnan <queerviolet@github.com>
2018-06-28 19:50:57 -07:00
Max Brunsfeld
cdb9529b68 Emit highlight change events when removing injections
Co-Authored-By: Ashi Krishnan <queerviolet@github.com>
2018-06-27 15:40:06 -07:00
Max Brunsfeld
6c85ff84a5 Start parsing right away when constructing a TreeSitterLanguageMode
Co-Authored-By: Ashi Krishnan <queerviolet@github.com>
2018-06-27 14:31:48 -07:00
Max Brunsfeld
613d4d65e9 Add text getter to SyntaxNode
Co-Authored-By: Ashi Krishnan <queerviolet@github.com>
2018-06-27 13:13:08 -07:00
Max Brunsfeld
4d3916f74e Add tests and docs for addInjectionPoint
Also, replace `addInjectionPattern` API with a single `injectionRegExp` 
field on the grammar.

Co-Authored-By: Ashi Krishnan <queerviolet@github.com>
2018-06-27 12:39:29 -07:00
Max Brunsfeld
930691c689 ⬆️ tree-sitter 2018-06-27 11:14:13 -07:00
Max Brunsfeld
890d955f70 Only update injections intersecting changed ranges 2018-06-26 20:54:18 -07:00
Max Brunsfeld
c05dcb0bb8 Fix syntax highlighting problems with injected languages
Co-Authored-By: Ashi Krishnan <queerviolet@github.com>
2018-06-26 15:30:03 -07:00
Max Brunsfeld
e60f0f9b60 Get first test for grammar injections passing
Co-Authored-By: Ashi Krishnan <queerviolet@github.com>
2018-06-26 13:46:33 -07:00
David Wilson
d82c3979ac Merge pull request #17521 from Aerijo/patch-1
Support activation hooks by grammar scope
2018-06-26 12:13:46 -07:00
David Wilson
2f827bfc23 ⬆️ metrics@1.3.1 2018-06-25 12:13:12 -07:00