Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tree-sitter to v0.14.0 #19165

Merged
merged 2 commits into from Apr 16, 2019

Conversation

Projects
None yet
1 participant
@maxbrunsfeld
Copy link
Contributor

commented Apr 15, 2019

This re-does #19060, which I reverted because I thought it might be causing main process test failures in master.

@maxbrunsfeld

This comment has been minimized.

Copy link
Contributor Author

commented Apr 15, 2019

Rebuilding because I think these are spurious failures:

windows:

TextEditor
  indent guides
    it TextEditor indent guides shows indent guides when `editor.showIndentGuide` is set to true and the editor is not mini
      Expected [ { text : '  ', scopes : [ 'leading-whitespace' ] }, { text : 'var sort = function(items) {', scopes : [  ] } ] to equal [ { text : '  ', scopes : [ 'syntax--source syntax--js', 'leading-whitespace' ] }, { text : 'var', scopes : [ 'syntax--source syntax--js', 'syntax--storage syntax--type' ] }, { text : ' sort ', scopes : [ 'syntax--source syntax--js' ] } ].
        at jasmine.Spec.it (D:\a\1\s\spec\text-editor-spec.js:8009:56)
        at jasmine.Spec.args.(anonymous function) (file:///D:/a/1/s/out/app/spec/jasmine-test-runner.coffee:90:27)
        at <anonymous>
      Expected [ { text : '  ', scopes : [ 'leading-whitespace indent-guide' ] }, { text : 'var sort = function(items) {', scopes : [  ] } ] to equal [ { text : '  ', scopes : [ 'syntax--source syntax--js', 'leading-whitespace indent-guide' ] }, { text : 'var', scopes : [ 'syntax--source syntax--js', 'syntax--storage syntax--type' ] }, { text : ' sort ', scopes : [ 'syntax--source syntax--js' ] } ].
        at jasmine.Spec.it (D:\a\1\s\spec\text-editor-spec.js:8022:56)
        at jasmine.Spec.args.(anonymous function) (file:///D:/a/1/s/out/app/spec/jasmine-test-runner.coffee:90:27)
        at <anonymous>
      Expected [ { text : '  ', scopes : [ 'leading-whitespace' ] }, { text : 'var sort = function(items) {', scopes : [  ] } ] to equal [ { text : '  ', scopes : [ 'syntax--source syntax--js', 'leading-whitespace' ] }, { text : 'var', scopes : [ 'syntax--source syntax--js', 'syntax--storage syntax--type' ] }, { text : ' sort ', scopes : [ 'syntax--source syntax--js' ] } ].
        at jasmine.Spec.it (D:\a\1\s\spec\text-editor-spec.js:8038:56)
        at jasmine.Spec.args.(anonymous function) (file:///D:/a/1/s/out/app/spec/jasmine-test-runner.coffee:90:27)
        at <anonymous>

mac:

bracket matching
  matching bracket highlighting
    when the cursor is before an ending pair
      it bracket matching matching bracket highlighting when the cursor is before an ending pair highlights the starting pair and ending pair
        Expected 0 to be 2.
          at expectHighlights (/Users/vsts/agent/2.149.2/work/1/s/node_modules/bracket-matcher/spec/bracket-matcher-spec.js:48:34)
          at jasmine.Spec.it (/Users/vsts/agent/2.149.2/work/1/s/node_modules/bracket-matcher/spec/bracket-matcher-spec.js:78:9)
          at jasmine.Spec.args.(anonymous function) (/Users/vsts/agent/2.149.2/work/1/s/out/app/spec/jasmine-test-runner.coffee:90:27)
          at <anonymous>
        Expected 0 to be 2.
          at expectHighlights (/Users/vsts/agent/2.149.2/work/1/s/node_modules/bracket-matcher/spec/bracket-matcher-spec.js:49:40)
          at jasmine.Spec.it (/Users/vsts/agent/2.149.2/work/1/s/node_modules/bracket-matcher/spec/bracket-matcher-spec.js:78:9)
          at jasmine.Spec.args.(anonymous function) (/Users/vsts/agent/2.149.2/work/1/s/out/app/spec/jasmine-test-runner.coffee:90:27)
          at <anonymous>
        TypeError: Cannot read property 'marker' of undefined
          at expectHighlights (/Users/vsts/agent/2.149.2/work/1/s/node_modules/bracket-matcher/spec/bracket-matcher-spec.js:51:29)
          at jasmine.Spec.it (/Users/vsts/agent/2.149.2/work/1/s/node_modules/bracket-matcher/spec/bracket-matcher-spec.js:78:9)
          at jasmine.Spec.args.(anonymous function) (/Users/vsts/agent/2.149.2/work/1/s/out/app/spec/jasmine-test-runner.coffee:90:27)
          at <anonymous>
@maxbrunsfeld

This comment has been minimized.

Copy link
Contributor Author

commented Apr 15, 2019

Oh, the bracket matcher failures are legit. Fixing...

@maxbrunsfeld maxbrunsfeld merged commit ce2e211 into master Apr 16, 2019

2 checks passed

Atom Pull Requests #20190416.13 succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details

@maxbrunsfeld maxbrunsfeld deleted the mb-upgrade-tree-sitter-to-0-14-again branch Apr 16, 2019

@maxbrunsfeld

This comment has been minimized.

Copy link
Contributor Author

commented Apr 16, 2019

This still appears to cause the same strange Travis failures as the last time I tried to upgrade, which don't reproduce on the VSTS linux build.

maxbrunsfeld added a commit that referenced this pull request Apr 16, 2019

Revert "Merge pull request #19165 from atom/mb-upgrade-tree-sitter-to…
…-0-14-again"

This reverts commit ce2e211, reversing
changes made to 4ce0066.

maxbrunsfeld added a commit that referenced this pull request Apr 16, 2019

Revert "Revert "Merge pull request #19165 from atom/mb-upgrade-tree-s…
…itter-to-0-14-again""

This reverts commit e10adac.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.