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.

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

Fixes overwriting built-in language id HTML #15

Merged
merged 1 commit into from
May 9, 2017
Merged

Fixes overwriting built-in language id HTML #15

merged 1 commit into from
May 9, 2017

Conversation

Silvenga
Copy link
Contributor

@Silvenga Silvenga commented May 3, 2017

This pull does the following:

Notes:

  • File associations can be overridden with the files.associations setting

@wholroyd
Copy link
Owner

wholroyd commented May 5, 2017

The syntaxes/jinja-yaml.json change is in master now from another PR. The removal of the HTML/YAML overrides with the usage of files.association option I think is a great idea. If you can pull master and update the branch, I'll merge it.

@wholroyd wholroyd self-assigned this May 5, 2017
@wholroyd wholroyd added this to the v0.0.8 milestone May 5, 2017
@Silvenga
Fixed overwriting built-in language id HTML, resolves wholroyd#8.
7929a6a 
- Removed non-referenced files.
- Inherit grammars from base HTML and YAML types.
@Silvenga
Copy link
Contributor Author

Silvenga commented May 5, 2017 •
edited
Loading

Rebased onto upstream master @wholroyd.

@wholroyd wholroyd merged commit d4754c0 into wholroyd:master May 9, 2017
@wholroyd wholroyd mentioned this pull request May 9, 2017
Closed
@wholroyd
Copy link
Owner

wholroyd commented May 9, 2017

Published 0.0.8 to the marketplace with these changes. :)

@Silvenga Silvenga mentioned this pull request May 18, 2017
Closed
@Silvenga Silvenga mentioned this pull request Jul 11, 2017
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@wholroyd wholroyd

Labels
enhancement
Projects
None yet
Milestone
v0.0.8
Development

Successfully merging this pull request may close these issues.

No more HTML support after installing Jinja extension!
2 participants
@Silvenga @wholroyd