Skip to content

Fix upstream issues with JS grammar #66

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Jan 9, 2019
Merged

Fix upstream issues with JS grammar #66

merged 2 commits into from
Jan 9, 2019

Conversation

@kevinsawicki
Copy link
Contributor

@kevinsawicki kevinsawicki commented Jan 8, 2019 •
edited
Loading

This pull request seeks to address two issues currently when trying to generate the TypeScript grammar using the latest JavaScript grammar:

Error: Unresolved conflict for symbol sequence:

  'new'  function  arguments  •  '*'  …

Error: Unresolved conflict for symbol sequence:

  'new'  'async'  '('  ','  •  ')'  …

Paired on this with @tclem and @maxbrunsfeld

Depends on tree-sitter/tree-sitter-javascript#95
Refs tree-sitter/tree-sitter-javascript#89

tclem
tclem approved these changes Jan 8, 2019
View reviewed changes
grammar.js
INC: 10,
NON_NULL: 10,
FUNCTION_CALL: 12,
FUNCTION_CALL: 11,
Copy link
Contributor

@tclem tclem Jan 8, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 matches this precedence change.

@maxbrunsfeld
Copy link
Contributor

maxbrunsfeld commented Jan 8, 2019 

C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppBuild.targets(349,5):
error MSB8013: This project doesn't contain the Configuration and Platform combination of Release|Win32.
[C:\projects\tree-sitter-typescript\node_modules\tree-sitter-cli\build\vendor\tree-sitter\compiler.vcxproj]

I've been seeing that windows build error lately on several Tree-sitter Repos. I don't fully understand it. Let's not let it block this PR.

@kevinsawicki kevinsawicki merged commit 1f0a60c into master Jan 9, 2019
@kevinsawicki kevinsawicki deleted the fix-upstream-js-issues branch January 9, 2019 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@maxbrunsfeld maxbrunsfeld maxbrunsfeld approved these changes

+1 more reviewer

@tclem tclem tclem approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@kevinsawicki @maxbrunsfeld @tclem