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

Add grammar for HLSL (High Level Shading Language) #3469

Merged
merged 2 commits into from Feb 22, 2017

Conversation

Projects
None yet
3 participants
@tgjones
Copy link
Contributor

tgjones commented Feb 11, 2017

Linguist already has a language defined for HLSL, but it doesn't have an associated grammar, so HLSL files are not highlighted on GitHub.

This PR adds a TextMate grammar for HLSL, to enable syntax highlighting on GitHub.

@tgjones

This comment has been minimized.

Copy link
Contributor

tgjones commented Feb 11, 2017

Looks like the Travis build failed because of this (unrelated to my changes, I had the same error locally before I changed anything):

Error updating vendor/grammars/TXL
Cloning into 'vendor/grammars/TXL'...
fatal: reference is not a tree: c1c98dfa86a8510532aee3df99181f9e0487fee8
Unable to checkout 'c1c98dfa86a8510532aee3df99181f9e0487fee8' in submodule path 'vendor/grammars/TXL'
@pchaigno
Copy link
Collaborator

pchaigno left a comment

I know what's the issue. I'll fix it tomorrow.
Everything else looks fine to me!

@pchaigno pchaigno self-assigned this Feb 11, 2017

@pchaigno

This comment has been minimized.

Copy link
Collaborator

pchaigno commented Feb 12, 2017

#3470 should fix the Travis build.

@brblck brblck merged commit fa5b6b0 into github:master Feb 22, 2017

2 checks passed

GitHub CLA @tgjones has accepted the GitHub Contributor License Agreement.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@tgjones tgjones deleted the tgjones:add-hlsl-grammar branch Feb 22, 2017

@tgjones tgjones referenced this pull request Feb 22, 2017

Merged

Add ShaderLab language #3490

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment