Commit Graph

35358 Commits

Author SHA1 Message Date
David Wilson
f0e07a3a7f Merge pull request #17674 from atom/rfc-003-consolidate-core-packages
RFC 003: Consolidate Core Atom Packages
2018-07-19 15:36:34 -07:00
David Wilson
3e4acb677f Set RFC 003 status to Accepted 2018-07-19 15:35:20 -07:00
David Wilson
c40af11733 Add current decision to question about using git subtree in migrations 2018-07-19 15:34:58 -07:00
Ash Wilson
82088a34a2 updates 2018-07-19 15:00:29 -04:00
Ash Wilson
ff5b09d510 Merge branch 'master' of github.com:atom/atom into aw/apm-up 2018-07-19 14:54:05 -04:00
David Wilson
e549841d83 Merge pull request #17716 from atom/dw-fix-atom-sh
Use correct executable name for Atom Dev.app in atom.sh on macOS
2018-07-19 11:51:17 -07:00
David Wilson
9c9cb12081 Use correct executable name for Atom Dev.app in atom.sh 2018-07-19 10:53:43 -07:00
Ash Wilson
cbd8a2d251 Merge branch 'master' of github.com:atom/atom into aw/apm-up 2018-07-19 13:31:17 -04: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
David Wilson
0006249c88 📝 More updates from feedback 2018-07-18 14:36:02 -07:00
Ash Wilson
ab47adbd38 Merge branch 'master' of github.com:atom/atom into aw/apm-up 2018-07-18 14:34:27 -04: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
Ryan Holinshead
a280019847 Add spec to test that updateClassList does not blow away the managed class names (editor, is-focused, mini) when the element class names are changed.
Released under CC0
2018-07-16 14:58:39 -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
David Wilson
e83871fe1b Update RFC 003 based on feedback and prototype findings 2018-07-16 13:49:30 -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
Ash Wilson
c6a1ffedf0 Merge branch 'master' of github.com:atom/atom into aw/apm-up 2018-07-16 10:12:23 -04:00
Ash Wilson
e3e8bbb7d4 package-locks ahoy 2018-07-16 09:55:51 -04:00
Ash Wilson
b369a971e1 Don't clean package-lock.json files any more 2018-07-16 09:47:58 -04:00
Ash Wilson
6dabeffd25 Include tarball URLs in package.json for now 2018-07-16 09:11:12 -04:00
Ash Wilson
d9a3018bfa ⬆️ apm 2018-07-16 09:10:22 -04:00
Ryan Holinshead
79de674508 Currently, the updateClassList function on the TextEditorComponent does not properly re-add its managed classes (editor, is-focused, mini) to the element when the element has been re-rendered with changed classes passed in. This fixes the issue by always adding the newClassList classes to the element and relying on the element.classList.add to determine if the classes already exist (and should be ignored)
Released under CC0
2018-07-13 16:45:04 -07: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
Ash Wilson
74c548482e ⬆️ apm 2018-07-12 14:25:08 -04: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
Jason Rudolph
f4ed544646 Fix markdown 2018-07-12 11:12:10 -04: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