Commit Graph

35243 Commits

Author SHA1 Message Date
Ash Wilson
b3518acd12 Merge branch 'master' into aw/custom-line-number-gutter 2018-07-31 07:54:57 -04:00
David Wilson
9654502fc1 Merge pull request #17761 from atom/dw-fix-appveyor-x64-windows
Add missing x64 build artifacts to appveyor.yml
2018-07-30 14:03:33 -07:00
David Wilson
c1983fa067 Add missing x64 artifacts to appveyor.yml 2018-07-30 13:56:43 -07:00
Ash Wilson
1b3f99c3d7 Merge pull request #17432 from atom/aw/watcher-up
atom/watcher upgrade
2018-07-30 15:36:06 -04:00
Ashi Krishnan
bc8e70d7c1 Merge pull request #17738 from atom/regex-matchers-for-style-map
Allow scope mappings to be refined via match rules
2018-07-30 14:57:01 -04:00
Ash Wilson
23f20d21d7 Use the same version on Travis 2018-07-30 14:50:47 -04:00
Ash Wilson
6e2fb6296a Use npm 6.1.0 in script/ 2018-07-30 14:49:13 -04:00
Ashi Krishnan
639164034f Merge branch 'master' into regex-matchers-for-style-map 2018-07-30 12:46:08 -04:00
Ash Wilson
9beec5f175 Merge branch 'master' into aw/watcher-up 2018-07-30 09:26: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
e814f4966d Merge pull request #17675 from atom/aw/apm-up
apm upgrade
2018-07-30 09:06:26 -04:00
Ash Wilson
121673b903 ⬆️ apm 2018-07-30 08:12:04 -04:00
Hubot
7a0b31f693 1.31.0-dev 2018-07-27 16:05:39 -07:00
Jason Rudolph
24fe715037 Merge pull request #17752 from atom/jr/fix-failing-repo-tests
Fix repository tests that fail when run in fork of atom/atom
2018-07-27 16:05:47 -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
Jason Rudolph
c74971e40c Fix repository tests that fail when run in fork of atom/atom
Prior to this change, these tests assumed that the local repository is a
clone of atom/atom, and the tests (unintentionally) failed if the local
repository was a fork of atom/atom:

https://circleci.com/gh/marcomorain/atom-1/29

Instead of depending on the local clone of the atom repository for these
tests, this commit updates the tests to use one of the fixture
repositories. 😅
2018-07-27 09:40:38 -04:00
Max Brunsfeld
b9966ac3df ⬆️ autocomplete-plus 2018-07-26 16:29:15 -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
Benjamin Gray
1fc0f0d683 Merge pull request #16342 from davidrsfalcao/master
'cmd--': As default for 'window:decrease-font-size' on MacOs
2018-07-26 09:34:13 +10:00
Max Brunsfeld
cf621ad596 ⬆️ language-python 2018-07-25 12:00:05 -07:00
Jason Rudolph
c045556c73 Merge pull request #17743 from atom/find-and-replace-0.215.12
⬆️ find-and-replace@0.215.12
2018-07-25 11:51:20 -04:00
Jason Rudolph
79734bd058 ⬆️ find-and-replace@0.215.12 2018-07-25 10:37:30 -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
Jason Rudolph
84a241cb4e Add failing test to demonstrate the bug identified in #17535 2018-07-24 16:45:37 -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
f6d3b350c5 Bump tree-sitter version to prerelease. 2018-07-24 14:36:00 -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
Ashi Krishnan
f2e54a70f0 Lint. 2018-07-24 13:34:41 -04:00
Ashi Krishnan
97ae903cab It feels more natural for these rules to be applied top to bottom rather than bottom to top. 2018-07-24 13:04:34 -04:00
Ashi Krishnan
9fa320a954 Regex and exact match rules support in the scope map. 2018-07-24 12:49:41 -04:00
Ash Wilson
291bf4d835 Pass maxDigits to labelFn 2018-07-24 12:27:33 -04:00
Ash Wilson
fdf5d50196 Support custom onMouseDown and onMouseMove event handlers 2018-07-24 12:20:30 -04:00
Ash Wilson
c064c87188 Add a custom CSS class to the Gutter's root element 2018-07-24 10:52:50 -04:00
Ash Wilson
4dc062958d decorateMarker({type: 'line-number') only decorates the one true gutter 2018-07-24 10:44:34 -04:00
Ash Wilson
931629769c 👕 oh right standardjs 2018-07-24 10:31:17 -04:00
Ash Wilson
10c2e2932c Set gutter-name correctly on custom line number gutters 2018-07-24 10:26:47 -04:00
Ash Wilson
65dceec045 Initialize lineNumbersToREnder.screenRows 2018-07-24 10:26:31 -04:00
Ash Wilson
6880ac9ff6 Missed a "kind" 2018-07-24 10:03:03 -04:00
Ash Wilson
795c3b27aa Use type instead of kind 2018-07-24 09:53:14 -04:00
Ash Wilson
e61b180777 Respect a custom label generation function 2018-07-24 09:38:57 -04:00