github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 23:08:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
35,138 Commits 140 Branches 571 Tags
137acb2f904d4e67701353150ea2de3d454db666
Commit Graph

35138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Brunsfeld
137acb2f90 Fix highlighting when parent nodes extend beyond their first and last children 2018-07-20 10:16:19 -07:00
Max Brunsfeld
a283ca365f Fix a ruby folding issue 2018-07-19 17:15:04 -07:00
Max Brunsfeld
9136909f0b ⬆️ language-html 2018-07-19 16:03:29 -07:00
Max Brunsfeld
94425ebc44 ⬆️ language-ruby 2018-07-19 15:56:38 -07:00
Max Brunsfeld
c9a4bb4245 Fix logic for updating foldable range cache 2018-07-18 17:09:47 -07:00
Max Brunsfeld
84b2ba742d ⬆️ tree-sitter, language packages 2018-07-18 16:21:43 -07:00
Ash Wilson
643ffd6bb6 Merge pull request #17701 from atom/aw/github-up-dev 
GitHub update on atom dev
 2018-07-17 10:51:28 -04:00
Ash Wilson
cde0503e57 ⬆️ github 2018-07-17 08:36:28 -04:00
Max Brunsfeld
8f7a55971e ⬆️ language-html 2018-07-16 17:31:04 -07:00
Max Brunsfeld
b028876606 ⬆️ language-javascript 2018-07-16 16:19:53 -07:00
Max Brunsfeld
65201b72d8 Merge pull request #17551 from atom/tree-sitter-injections 
Add Tree-sitter grammar injections
 2018-07-16 15:15:24 -07:00
Max Brunsfeld
83f0a0bad2 ⬆️ language-html, language-javascript 2018-07-16 15:14:32 -07:00
Max Brunsfeld
8fa9a45a54 Incorporated injected languages in scope descriptors 2018-07-16 14:17:39 -07:00
Max Brunsfeld
ebd546f572 Fix handling of folds inside highlighted tokens 2018-07-16 14:17:39 -07:00
Ash Wilson
ba33f14c27 Now with React downgraded 2018-07-16 16:09:50 -04:00
Ash Wilson
15eb30188a ⬆️ github 2018-07-16 15:32:35 -04:00
Max Brunsfeld
2a0e49d684 Silence complaint from standard 🙄 2018-07-13 16:31:30 -07:00
Max Brunsfeld
a2f831f533 Merge branch 'master' into tree-sitter-injections 2018-07-13 16:10:19 -07:00
Max Brunsfeld
7a196589f8 Return containing tags from seek in the correct order 2018-07-13 16:07:14 -07:00
David Wilson
aec38c955b ⬆️ electron@2.0.5 2018-07-13 13:26:26 -07:00
Max Brunsfeld
bf69fd92bb Move helper functions to the bottom of the file 2018-07-13 13:05:27 -07:00
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
David Wilson
8c3e36d56f Merge pull request #17680 from atom/dw-consistent-app-name 
Use a consistent app naming strategy across non-stable channels
 2018-07-12 14:46:34 -07:00
David Wilson
97b4bca76f ⬆️ github@0.17.3 2018-07-12 14:02:58 -07:00
David Wilson
6797296b75 atom.sh should look for 'Atom Dev.app' on dev channel 2018-07-12 11:36:30 -07:00
David Wilson
de93396af7 👕 Make the linter happy 2018-07-12 11:06:26 -07:00
David Wilson
bf9fac27cf Use a consistent app naming strategy across non-stable channels 2018-07-12 10:14:15 -07:00
David Wilson
32a6acae38 Merge pull request #17679 from atom/dw-use-node-8-in-ci 
Use Node 8.9.3 in Atom CI builds
 2018-07-12 09:35:08 -07:00
David Wilson
8fadbae23d Merge pull request #17677 from atom/leave-vsts-locked 
Don't delete the package-lock.json in /script/vsts
 2018-07-12 07:09:18 -07:00
David Wilson
441fb4d62d Use Node 8.9.3 in Atom CI builds 2018-07-12 06:58:23 -07:00
Lee Dohm
f759bed882 Don't delete the package-lock.json in /script/vsts 2018-07-11 19:54:29 -07:00
Lee Dohm
d2735b8a4f Merge pull request #17673 from atom/spell-check-0-74-0 
⬆️ spell-check@0.74.0
 2018-07-11 15:13:16 -07:00
Lee Dohm
6d39c5ae7e ⬆️ spell-check@0.74.0 2018-07-11 13:38:45 -07:00
Lee Dohm
0b0a6647db Revert "⬆️ spell-check@0.74.0" 
This reverts commit af08a77566.
 2018-07-11 13:31:39 -07:00
Lee Dohm
af08a77566 ⬆️ spell-check@0.74.0 2018-07-11 12:47:49 -07:00
David Wilson
8209eaa635 Update RFC 002 to Implemented 2018-07-11 10:41:22 -07:00
David Wilson
972b11c5d0 Merge pull request #17538 from atom/dw-nightly-releases 
Implement RFC 002: Atom Nightly Releases
 2018-07-11 10:28:26 -07:00
David Wilson
27d3de614f ⬆️ about@1.10.0 2018-07-11 09:30:12 -07:00
David Wilson
3109958dc1 Revert "Try possible fix for broken GitHub package tests" 
This reverts commit 3046f689be.
 2018-07-11 06:11:43 -07:00
Max Brunsfeld
6239720d45 👕 Fix lint errors 2018-07-10 13:17:47 -07:00
Lee Dohm
3938846f5e Merge pull request #17569 from fedelibre/doc-open-position 
Doc: explain how to open a file at a certain line and column
 2018-07-10 13:12:45 -07:00
Lee Dohm
5a6b3c6e99 Merge pull request #17651 from cacheflow/tooltip-should-fade-on-keybaord-event-17431 
Tooltip should fade on keybaord event 17431
 2018-07-10 13:11:52 -07:00
David Wilson
3046f689be Try possible fix for broken GitHub package tests 2018-07-10 12:55:55 -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