github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-26 07:19:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
35,415 Commits 140 Branches 571 Tags
a2c3344be6bf0701b6930e4a3a2f672ae11877fa
Commit Graph

17008 Commits

Author SHA1 Message Date
David Wilson
cbcad274a7 Merge pull request #17892 from atom/dw-improve-repo-local-packages 
Improve repo-local packages implementation
 2018-08-21 15:26:18 -07:00
Ash Wilson
4e150179a9 Merge pull request #17736 from atom/aw/custom-line-number-gutter 
Multiple, custom line number gutters
 2018-08-21 18:17:31 -04:00
David Wilson
2d65535147 Don't normalize undefined devResourcePath on Windows 2018-08-21 14:20:42 -07:00
David Wilson
ba12a1e2fc Simplify dev resource path detection 2018-08-21 11:57:18 -07:00
David Wilson
ad4553cbba Merge pull request #17686 from atom/dw-repo-local-core-packages 
Enable repo-local core packages in the 'packages' folder
 2018-08-21 10:08:39 -07:00
Ash Wilson
ddb1dec987 Merge remote-tracking branch 'origin/master' into aw/custom-line-number-gutter 2018-08-21 11:39:47 -04:00
David Wilson
8cd788e00f 👕 2018-08-21 06:50:37 -07:00
David Wilson
7b50f72ac2 Call getDevResourcePath 2018-08-21 06:43:28 -07:00
David Wilson
94f972e0bf Teach --dev to detect Atom repo in process.cwd() 2018-08-21 06:40:25 -07:00
David Wilson
b84592ba10 Allow nightly releases to auto-update 
This change removes a bad version check which prevented nightly releases 
to be considered for auto-update checks.  The fix is to only skip 
auto-updates when using a build with a version containing `-dev`.

Fixes #17885
 2018-08-20 15:40:14 -07:00
Max Brunsfeld
fd6f9d39bd Make tree-sitter scope descriptors match HTML classes, not syntax tree 2018-08-20 10:40:55 -07:00
Max Brunsfeld
760b38c54b Support a single scope name field on Tree-sitter grammars 
* Remove the `legacyScopeName` field
* Remove the legacy scope name concept from the Config class
* Handle tree-sitter grammars and textmate grammars having the same 
scope names
 2018-08-20 09:58:37 -07:00
David Wilson
f922b7bd91 Merge pull request #17779 from atom/fb-mdt-esc-shouldnt-destroy 
Don't take destructive action on esc
 2018-08-15 06:41:36 -07:00
Joseph Lyons
0a361de70e Added word "want" in sentence 2018-08-11 01:09:33 -04:00
Max Brunsfeld
9072e58ea7 Merge pull request #17816 from atom/mb-tree-sitter-grammar-regex-tweaks 
Support two different content-matching regexes for tree-sitter grammars
 2018-08-10 13:33:24 -07:00
Max Brunsfeld
6d54578daa Use setTimeout instead of setImmediate in MenuManager 
This should fix the flaky test failures that have been occurring on windows VSTS builds
 2018-08-10 12:33:00 -07:00
Max Brunsfeld
87784989ad Merge pull request #17750 from atom/mb-reduce-test-noise 
Fix errors causing tests to fail when run from the UI
 2018-08-10 12:22:54 -07:00
Max Brunsfeld
858071d54e 👕 2018-08-09 17:48:08 -07:00
Max Brunsfeld
6f41353e9f Support two different content-matching regexes for tree-sitter grammars 
* firstLineRegex is only tested against the first line of the file, and
  if it matches, it allows the grammar to be used for the file.
* contentRegex is only tested if the grammar matched the file name
  or the grammar's firstLineRegex matched. It is used to break ties
  between grammars like C and C++, Flow and JS
 2018-08-09 17:19:32 -07:00
David Wilson
298db7314c Merge remote-tracking branch 'origin/master' into dw-repo-local-core-packages 2018-08-08 11:07:05 -07:00
Max Brunsfeld
826844c7e0 Emit onDidTokenize event from TreeSitterLanguageMode 2018-08-07 21:03:03 -07:00
David Wilson
6753b929cb Don't depend on ATOM_DEV_RESOURCE_PATH for local core package path 2018-08-07 16:09:34 -07:00
David Wilson
86b8ead239 👕 2018-08-07 16:09:34 -07:00
David Wilson
77960f1d42 Enable repo-local core packages in the 'packages' folder 2018-08-07 15:57:43 -07:00
Max Brunsfeld
fce7360cdd Avoid stack overflows due to spread in Array.splice call 2018-08-06 15:32:18 -07:00
Max Brunsfeld
53218b921b Merge pull request #17774 from atom/fb-mdt-atomic-config-saves 
Write config file atomically
 2018-08-06 11:36:44 -07:00
Max Brunsfeld
058e2b82dc Allow comma-separated selectors as keys in Tree-sitter scope mappings 2018-08-04 17:17:43 -07:00
Matthew Dapena-Tretter
272566dfad Don't take destructive action on esc 2018-08-03 13:19:40 -07:00
Matthew Dapena-Tretter
f77391b158 Write config file atomically (write and replace) 2018-08-03 10:38:12 -07:00
Winston Liu
3e97867f3e 📝 correctly link function in docs 
[ci skip]
 2018-08-02 17:24:03 -05:00
Ash Wilson
b3518acd12 Merge branch 'master' into aw/custom-line-number-gutter 2018-07-31 07:54:57 -04:00
Ashi Krishnan
639164034f Merge branch 'master' into regex-matchers-for-style-map 2018-07-30 12:46:08 -04:00
Ash Wilson
a61f006a62 Merge branch 'master' into aw/custom-line-number-gutter 2018-07-30 09:07:20 -04:00
Ash Wilson
95658c3769 👕 2018-07-27 11:18:35 -04:00
Ash Wilson
65bcd888f3 Update LineNumberComponent correctly when "number" changes 2018-07-27 10:18:42 -04:00
Max Brunsfeld
5f0231b398 Listen for IPC messages lazily in application delegate 2018-07-26 10:39:36 -07:00
Max Brunsfeld
1e2e461e5e Avoid excessive numbers of IPC event listeners in ApplicationDelegate 2018-07-26 10:20:01 -07:00
Jason Rudolph
c52dc23242 Merge pull request #17744 from atom/fix-17535 
Teach Pane to always look for a pane item's onDidTerminatePendingState function
 2018-07-26 08:44:49 -04:00
Ash Wilson
0f771ea604 Only pass and respect width for the One True Gutter 2018-07-25 09:43:31 -04:00
Ash Wilson
3ec43b913f 👀 2018-07-25 09:18:52 -04:00
Ash Wilson
192cf3b3fd mousedown !== mousemove 2018-07-25 08:26:21 -04:00
Ash Wilson
2a1719f337 Pass bufferRow and screenRow as numbers 2018-07-25 08:21:55 -04:00
Max Brunsfeld
024feb1fff Merge pull request #17740 from atom/mb-tree-sitter-python-highlighting-fix 
Fix tree-sitter highlighting regression affecting python
 2018-07-24 16:51:24 -07:00
Max Brunsfeld
aefc3233e3 Highlight iterator - only ascend when at the last child 2018-07-24 14:28:03 -07:00
Jason Rudolph
4402dd6d29 Fix #17535 
Treat `onDidTerminatePendingState` and `onDidDestroy` as independent 
optional functions that a PaneItem can implement. A PaneItem is free to 
implement neither, just one of them, or both of them.
 2018-07-24 16:50:47 -04:00
Ashi Krishnan
f91a4bb295 Merge pull request #17721 from atom/get-range-for-syntax-node-with-selector 
Add TreeSitterLanguageMode::getSyntaxNodeContainingRange and TreeSitterLanguageMode::getSyntaxNodeAtPosition
 2018-07-24 16:00:54 -04:00
Ashi Krishnan
aaa52d4036 Trailing ws 2018-07-24 15:00:54 -04:00
Ashi Krishnan
f693df2314 Remove unnecessary function and equally unnecessary whitespace. 2018-07-24 14:35:02 -04:00
Ashi Krishnan
b61ade47fc Merge master. 2018-07-24 14:09:42 -04:00
Ashi Krishnan
8435d7edad Update tree-sitter-language-mode.js 
Don't use a default predicate for `getRangeForSyntaxNodeContainingRange`.
 2018-07-24 14:03:26 -04:00