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

Use source.js.regexp provided by the Javascript grammar #1

Merged
merged 1 commit into from
Mar 4, 2019

Conversation

lildude
Copy link
Member

@lildude lildude commented Mar 1, 2019

I've been working on improving the grammar compiler for Linguist and I noticed it reporting this problem:

- [ ] repository `vendor/grammars/babel-sublime` (from https://github.com/github-linguist/babel-sublime) (1 errors)
    - [ ] Missing include in grammar: `source.js.jsx` (in `JavaScript (Babel).tmLanguage`) attempts to include `source.regexp.js` but the scope cannot be found

This is caused by the babel grammar never including the Regular Expressions (JavaScriptNext).YAML-tmLanguage and Regular Expressions (JavaScriptNext).tmLanguage files in babel@cc420f2 when it started out.

Rather than including them and taking our fork too much further away from upstream, I'm switching this to use source.js.regexp as provided by the Javascript grammar we use on Linguist. Quite a few other grammars in Linguist use this, so adding another shouldn't be the end of the world. It does however mean that this becomes another grammar that'll start reporting problems if/when we replace the Javascript grammar as I attempted in github-linguist/linguist#3044 (comment)

@lildude lildude merged commit dedf347 into master Mar 4, 2019
@lildude lildude deleted the lildude/use-javascripts-regex branch March 4, 2019 17:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants