Commit Graph

35063 Commits

Author SHA1 Message Date
Max Brunsfeld
be5020f05f Rework handling of edited ranges 2018-07-13 13:03:56 -07:00
Max Brunsfeld
6fe6efc38d Represent the full node range set as null
We already had conditional logic based on whether the node range set
was 'full'.
2018-07-13 11:28:32 -07:00
Max Brunsfeld
5b0ae5aa5c Remove concurrency limit on parsing 2018-07-12 17:57:22 -07:00
Max Brunsfeld
84e30d5d99 ⬆️ tree-sitter 2018-07-12 16:00:25 -07:00
Max Brunsfeld
6239720d45 👕 Fix lint errors 2018-07-10 13:17:47 -07:00
Max Brunsfeld
19f9a0f0f7 Merge branch 'master' into tree-sitter-injections 2018-07-10 12:10:32 -07:00
Max Brunsfeld
2c2b6f59a6 ⬆️ text-buffer 2018-07-10 12:07:33 -07:00
Max Brunsfeld
99a6237c2c Avoid repeated characterIndexForPosition calls in HighlightIterator.seek 2018-07-10 12:06:25 -07:00
Max Brunsfeld
a6c61f9ae3 Avoid O(injectionCount) linear searches in highlight iterator 2018-07-10 11:25:24 -07:00
Max Brunsfeld
0e9c082c25 ⬆️ language-c
Refs tree-sitter/tree-sitter-cpp#7
2018-07-10 09:47:48 -07:00
Max Brunsfeld
79071996a6 WIP - put back parse queue 2018-07-09 16:01:05 -07:00
Max Brunsfeld
10d8d515ba Only search for injection markers within a layer's included ranges 2018-07-09 16:00:23 -07:00
Ashi Krishnan
ca854cc267 Spec for injected language folding.
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@github.com>
2018-07-09 17:17:58 -04:00
Lee Dohm
b866cae126 ⬆️ image-view@0.63.0 2018-07-09 14:01:24 -07:00
Ashi Krishnan
d6669f4337 Folding works, though folding to a particular level doesn't respect nested grammars.
Co-Authored-By: Max <maxbrunsfeld@github.com>
2018-07-09 16:33:24 -04:00
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
David Wilson
a41a345de8 ⬆️ keybinding-resolver@0.38.2 2018-07-06 15:46:30 -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