Skip to content

Commit

Permalink
Implement HLSL syntax highlighting
Browse files Browse the repository at this point in the history
And use HLSL grammar to highlight CG blocks in ShaderLab shaders.
  • Loading branch information
Tim Jones committed Feb 7, 2017
1 parent bcff7c6 commit 67560d3
Show file tree
Hide file tree
Showing 8 changed files with 820 additions and 219 deletions.
23 changes: 23 additions & 0 deletions extensions/hlsl/language-configuration.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"comments": {
"lineComment": "//",
"blockComment": [ "/*", "*/" ]
},
"brackets": [
["{", "}"],
["[", "]"],
["(", ")"]
],
"autoClosingPairs": [
["{", "}"],
["[", "]"],
["(", ")"],
["\"", "\""]
],
"surroundingPairs": [
["{", "}"],
["[", "]"],
["(", ")"],
["\"", "\""]
]
}
19 changes: 19 additions & 0 deletions extensions/hlsl/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "hlsl",
"version": "0.1.0",
"publisher": "vscode",
"engines": { "vscode": "*" },
"contributes": {
"languages": [{
"id": "hlsl",
"extensions": [".hlsl",".hlsli",".fx",".fxh",".vsh",".psh",".cginc",".compute"],
"aliases": ["HLSL", "hlsl"],
"configuration": "./language-configuration.json"
}],
"grammars": [{
"language": "hlsl",
"path": "./syntaxes/hlsl.json",
"scopeName":"source.hlsl"
}]
}
}
217 changes: 217 additions & 0 deletions extensions/hlsl/syntaxes/hlsl.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
{
"scopeName": "source.hlsl",
"name": "HLSL",
"fileTypes": [
"hlsl",
"hlsli",
"fx",
"fxh",
"vsh",
"psh",
"cginc",
"compute"
],
"patterns": [
{
"name": "comment.line.block.hlsl",
"begin": "/\\*",
"end": "\\*/"
},
{
"name": "comment.line.double-slash.hlsl",
"begin": "//",
"end": "$"
},
{
"name": "constant.numeric.hlsl",
"match": "\\b([0-9]+\\.?[0-9]*)\\b"
},
{
"name": "constant.numeric.hlsl",
"match": "\\b(\\.[0-9]+)\\b"
},
{
"name": "constant.numeric.hex.hlsl",
"match": "\\b(0x[0-9A-F]+)\\b"
},
{
"name": "constant.language.hlsl",
"match": "\\b(false|true)\\b"
},
{
"name": "keyword.preprocessor.hlsl",
"match": "^\\s*#\\s*(define|elif|else|endif|ifdef|ifndef|if|undef|include|line|error|pragma)"
},
{
"name": "keyword.control.hlsl",
"match": "\\b(break|case|continue|default|discard|do|else|for|if|return|switch|while)\\b"
},
{
"name": "keyword.control.fx.hlsl",
"match": "\\b(compile)\\b"
},
{
"name": "keyword.typealias.hlsl",
"match": "\\b(typedef)\\b"
},
{
"name": "storage.type.basic.hlsl",
"match": "\\b(bool([1-4](x[1-4])?)?|double([1-4](x[1-4])?)?|dword|float([1-4](x[1-4])?)?|half([1-4](x[1-4])?)?|int([1-4](x[1-4])?)?|matrix|min10float([1-4](x[1-4])?)?|min12int([1-4](x[1-4])?)?|min16float([1-4](x[1-4])?)?|min16int([1-4](x[1-4])?)?|min16uint([1-4](x[1-4])?)?|unsigned|uint([1-4](x[1-4])?)?|vector|void)\\b"
},
{
"name": "support.function.hlsl",
"match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)(?=[\\s]*\\()"
},
{
"name": "support.variable.semantic.hlsl",
"match": "(?<=\\:\\s|\\:)(?i:BINORMAL[0-9]*|BLENDINDICES[0-9]*|BLENDWEIGHT[0-9]*|COLOR[0-9]*|NORMAL[0-9]*|POSITIONT|POSITION|PSIZE[0-9]*|TANGENT[0-9]*|TEXCOORD[0-9]*|FOG|TESSFACTOR[0-9]*|VFACE|VPOS|DEPTH[0-9]*)\\b"
},
{
"name": "support.variable.semantic.sm4.hlsl",
"match": "(?<=\\:\\s|\\:)(?i:SV_ClipDistance[0-9]*|SV_CullDistance[0-9]*|SV_Coverage|SV_Depth|SV_DepthGreaterEqual[0-9]*|SV_DepthLessEqual[0-9]*|SV_InstanceID|SV_IsFrontFace|SV_Position|SV_RenderTargetArrayIndex|SV_SampleIndex|SV_StencilRef|SV_Target[0-7]?|SV_VertexID|SV_ViewportArrayIndex)\\b"
},
{
"name": "support.variable.semantic.sm5.hlsl",
"match": "(?<=\\:\\s|\\:)(?i:SV_DispatchThreadID|SV_DomainLocation|SV_GroupID|SV_GroupIndex|SV_GroupThreadID|SV_GSInstanceID|SV_InsideTessFactor|SV_OutputControlPointID|SV_TessFactor)\\b"
},
{
"name": "support.variable.semantic.sm5_1.hlsl",
"match": "(?<=\\:\\s|\\:)(?i:SV_InnerCoverage|SV_StencilRef)\\b"
},
{
"name": "storage.modifier.hlsl",
"match": "\\b(column_major|const|export|extern|globallycoherent|groupshared|inline|inout|in|out|precise|row_major|shared|static|uniform|volatile)\\b"
},
{
"name": "storage.modifier.float.hlsl",
"match": "\\b(snorm|unorm)\\b"
},
{
"name": "storage.modifier.postfix.hlsl",
"match": "\\b(packoffset|register)\\b"
},
{
"name": "storage.modifier.interpolation.hlsl",
"match": "\\b(centroid|linear|nointerpolation|noperspective|sample)\\b"
},
{
"name": "storage.modifier.geometryshader.hlsl",
"match": "\\b(lineadj|line|point|triangle|triangleadj)\\b"
},
{
"name": "support.type.other.hlsl",
"match": "\\b(string)\\b"
},
{
"name": "support.type.object.hlsl",
"match": "\\b(AppendStructuredBuffer|Buffer|ByteAddressBuffer|ConstantBuffer|ConsumeStructuredBuffer|InputPatch|OutputPatch)\\b"
},
{
"name": "support.type.object.rasterizerordered.hlsl",
"match": "\\b(RasterizerOrderedBuffer|RasterizerOrderedByteAddressBuffer|RasterizerOrderedStructuredBuffer|RasterizerOrderedTexture1D|RasterizerOrderedTexture1DArray|RasterizerOrderedTexture2D|RasterizerOrderedTexture2DArray|RasterizerOrderedTexture3D)\\b"
},
{
"name": "support.type.object.rw.hlsl",
"match": "\\b(RWBuffer|RWByteAddressBuffer|RWStructuredBuffer|RWTexture1D|RWTexture1DArray|RWTexture2D|RWTexture2DArray|RWTexture3D)\\b"
},
{
"name": "support.type.object.geometryshader.hlsl",
"match": "\\b(LineStream|PointStream|TriangleStream)\\b"
},
{
"name": "support.type.sampler.legacy.hlsl",
"match": "\\b(sampler|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler_state)\\b"
},
{
"name": "support.type.sampler.hlsl",
"match": "\\b(SamplerState|SamplerComparisonState)\\b"
},
{
"name": "support.type.texture.legacy.hlsl",
"match": "\\b(texture2D|textureCUBE)\\b"
},
{
"name": "support.type.texture.hlsl",
"match": "\\b(Texture1D|Texture1DArray|Texture2D|Texture2DArray|Texture2DMS|Texture2DMSArray|Texture3D|TextureCube|TextureCubeArray)\\b"
},
{
"name": "storage.type.structured.hlsl",
"match": "\\b(cbuffer|class|interface|namespace|struct|tbuffer)\\b"
},
{
"name": "support.constant.property-value.fx.hlsl",
"match": "\\b(FALSE|TRUE|NULL)\\b"
},
{
"name": "support.type.fx.hlsl",
"match": "\\b(BlendState|DepthStencilState|RasterizerState)\\b"
},
{
"name": "storage.type.fx.technique.hlsl",
"match": "\\b(technique|Technique|technique10|technique11|pass)\\b"
},
{
"name": "meta.object-literal.key.fx.blendstate.hlsl",
"match": "\\b(AlphaToCoverageEnable|BlendEnable|SrcBlend|DestBlend|BlendOp|SrcBlendAlpha|DestBlendAlpha|BlendOpAlpha|RenderTargetWriteMask)\\b"
},
{
"name": "meta.object-literal.key.fx.depthstencilstate.hlsl",
"match": "\\b(DepthEnable|DepthWriteMask|DepthFunc|StencilEnable|StencilReadMask|StencilWriteMask|FrontFaceStencilFail|FrontFaceStencilZFail|FrontFaceStencilPass|FrontFaceStencilFunc|BackFaceStencilFail|BackFaceStencilZFail|BackFaceStencilPass|BackFaceStencilFunc)\\b"
},
{
"name": "meta.object-literal.key.fx.rasterizerstate.hlsl",
"match": "\\b(FillMode|CullMode|FrontCounterClockwise|DepthBias|DepthBiasClamp|SlopeScaleDepthBias|ZClipEnable|ScissorEnable|MultiSampleEnable|AntiAliasedLineEnable)\\b"
},
{
"name": "meta.object-literal.key.fx.samplerstate.hlsl",
"match": "\\b(Filter|AddressU|AddressV|AddressW|MipLODBias|MaxAnisotropy|ComparisonFunc|BorderColor|MinLOD|MaxLOD)\\b"
},
{
"name": "support.constant.property-value.fx.blend.hlsl",
"match": "\\b(?i:ZERO|ONE|SRC_COLOR|INV_SRC_COLOR|SRC_ALPHA|INV_SRC_ALPHA|DEST_ALPHA|INV_DEST_ALPHA|DEST_COLOR|INV_DEST_COLOR|SRC_ALPHA_SAT|BLEND_FACTOR|INV_BLEND_FACTOR|SRC1_COLOR|INV_SRC1_COLOR|SRC1_ALPHA|INV_SRC1_ALPHA)\\b"
},
{
"name": "support.constant.property-value.fx.blendop.hlsl",
"match": "\\b(?i:ADD|SUBTRACT|REV_SUBTRACT|MIN|MAX)\\b"
},
{
"name": "support.constant.property-value.fx.depthwritemask.hlsl",
"match": "\\b(?i:ALL)\\b"
},
{
"name": "support.constant.property-value.fx.comparisonfunc.hlsl",
"match": "\\b(?i:NEVER|LESS|EQUAL|LESS_EQUAL|GREATER|NOT_EQUAL|GREATER_EQUAL|ALWAYS)\\b"
},
{
"name": "support.constant.property-value.fx.stencilop.hlsl",
"match": "\\b(?i:KEEP|REPLACE|INCR_SAT|DECR_SAT|INVERT|INCR|DECR)\\b"
},
{
"name": "support.constant.property-value.fx.fillmode.hlsl",
"match": "\\b(?i:WIREFRAME|SOLID)\\b"
},
{
"name": "support.constant.property-value.fx.cullmode.hlsl",
"match": "\\b(?i:NONE|FRONT|BACK)\\b"
},
{
"name": "support.constant.property-value.fx.filter.hlsl",
"match": "\\b(?i:MIN_MAG_MIP_POINT|MIN_MAG_POINT_MIP_LINEAR|MIN_POINT_MAG_LINEAR_MIP_POINT|MIN_POINT_MAG_MIP_LINEAR|MIN_LINEAR_MAG_MIP_POINT|MIN_LINEAR_MAG_POINT_MIP_LINEAR|MIN_MAG_LINEAR_MIP_POINT|MIN_MAG_MIP_LINEAR|ANISOTROPIC|COMPARISON_MIN_MAG_MIP_POINT|COMPARISON_MIN_MAG_POINT_MIP_LINEAR|COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT|COMPARISON_MIN_POINT_MAG_MIP_LINEAR|COMPARISON_MIN_LINEAR_MAG_MIP_POINT|COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR|COMPARISON_MIN_MAG_LINEAR_MIP_POINT|COMPARISON_MIN_MAG_MIP_LINEAR|COMPARISON_ANISOTROPIC|TEXT_1BIT)\\b"
},
{
"name": "support.constant.property-value.fx.textureaddressmode.hlsl",
"match": "\\b(?i:WRAP|MIRROR|CLAMP|BORDER|MIRROR_ONCE)\\b"
},
{
"name": "string.quoted.double.hlsl",
"begin": "\"",
"end": "\"",
"patterns": [
{
"name": "constant.character.escape.hlsl",
"match": "\\\\."
}
]
}
]
}
13 changes: 13 additions & 0 deletions extensions/hlsl/test/colorize-fixtures/test.hlsl
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
struct VS_OUTPUT
{
float4 Position : SV_Position;
};

VS_OUTPUT main(in float4 vPosition : POSITION)
{
VS_OUTPUT Output;

Output.Position = vPosition;

return Output;
}
Loading

0 comments on commit 67560d3

Please sign in to comment.