mirror of
https://github.com/nvim-treesitter/nvim-treesitter.git
synced 2026-07-02 03:26:52 -04:00
1ae9b0e455
Problem: Sharing highlight queries with upstream tree-sitter and
Helix is difficult.
Solution: Where reasonable, use capture names in tree-sitter's standard
list or Helix's Atom-style hierarchy.
Specifically:
* tree-sitter "standard capture names"
(3f44b89685/highlight/src/lib.rs (L20-L72)):
- `@parameter` -> `@variable.parameter`
- `@field` -> `@variable.member`
- `@namespace` -> `@module`
- `@float` -> `@number.float`
- `@symbol` -> `@string.special.symbol`
- `@string.regex` -> `@string.regexp`
- `@text.*` -> `@markup.*` (`strong`, `italic`, `link`, `strikethrough`; with exceptions; see below)
- `@text.title` -> `@markup.heading`
- `@text.literal` -> `@markup.raw`
- `@text.reference` -> `@markup.link`
- `@text.uri` -> `@markup.link.url` (in markup links)
- `@string.special` -> `@markup.link.label` (non-url links)
- `@punctuation.special` -> `@markup.list` (markdown lists only; move subitems from `@text.todo`)
* Helix captures
(https://docs.helix-editor.com/master/themes.html#syntax-highlighting):
- `@method` -> `@function.method`
- `@method.call` -> `@function.method.call`
- `@text.{todo,warning,note,danger}` -> `@comment.{error,warning,hint,info,todo}`
- `@text.diff.{add,delete,}` -> `@diff.{plus,minus,delta}`
- `@text.uri` -> `@string.special.url` (outside markup)
- `@preproc` -> `@keyword.directive`
- `@define` -> `@keyword.directive`(`.define`?)
- `@storageclass` -> `@keyword.storage`
- `@conditional` -> `@keyword.conditional`
- `@debug` -> `@keyword.debug`
- `@exception` -> `@keyword.exception`
- `@include` -> `@keyword.import`
- `@repeat` -> `@keyword.repeat`
* cleanup
- remove some redundant `@conceal` (but still allow it for conceal-only patterns)
- remove obsolete `@error` (syntax linting is out of scope for this repo)
- sort, cleanup capture list in `CONTRIBUTING.md`
118 lines
2.6 KiB
Text
118 lines
2.6 KiB
Text
def Xform "cube" (
|
|
assetInfo = {
|
|
# <- @keyword
|
|
asset[] payloadAssetDependencies = [@fizz.usd@, @buzz.usd@]
|
|
# <- @type
|
|
# ^ @keyword
|
|
# ^ @string.special.url
|
|
# ^ @string.special.url
|
|
}
|
|
)
|
|
{
|
|
}
|
|
|
|
def "root" (
|
|
add references = @foo.usda@</Model> (offset = 1; scale = 2.0)
|
|
# <- @string.special.url
|
|
# ^ @string.special
|
|
# ^ @keyword
|
|
# ^ @number
|
|
# ^ @punctuation.delimiter
|
|
# ^ @keyword
|
|
# ^ @number.float
|
|
)
|
|
{
|
|
}
|
|
|
|
def "World"
|
|
{
|
|
over "points" (
|
|
clips = {
|
|
# <- @keyword
|
|
dictionary default = {
|
|
# <- @type
|
|
# ^ @variable
|
|
double2[] times = [(101, 101), (102, 102)]
|
|
# <- @type
|
|
# ^ @keyword
|
|
# ^ @number
|
|
}
|
|
}
|
|
)
|
|
{
|
|
}
|
|
}
|
|
|
|
def Xform "torch_2" (
|
|
payload = @./torch.usda@
|
|
kind = "model"
|
|
)
|
|
{
|
|
// Pre-published light list
|
|
# <- @comment
|
|
rel lightList = [ <light> ] # inline comment
|
|
# ^ @comment
|
|
token lightList:cacheBehavior = "consumeAndContinue"
|
|
|
|
double3 xformOp:translate = (1, 0, 0.5)
|
|
uniform token[] xformOpOrder = ["xformOp:translate"]
|
|
}
|
|
|
|
def "foo" (
|
|
"some comment"
|
|
# <- @comment.documentation
|
|
)
|
|
{
|
|
}
|
|
|
|
def "foo" (
|
|
# inline comment
|
|
"actual in-description comment"
|
|
# <- @comment.documentation
|
|
)
|
|
{
|
|
}
|
|
|
|
def "foo" (
|
|
add references = @foo.usda@
|
|
# <- @function.call
|
|
append references = @foo.usda@
|
|
# <- @function.call
|
|
delete references = @foo.usda@
|
|
# <- @function.call
|
|
reorder references = [@foo.usda@]
|
|
# <- @function.call
|
|
|
|
references = [@foo.usda@] # explicit
|
|
)
|
|
{
|
|
}
|
|
|
|
over "Parent" (
|
|
prepend references = [</InternalRef>, @./ref.usda@</RefParent>]
|
|
# <- @function.call
|
|
# ^ @keyword
|
|
# ^ @string.special
|
|
# ^ @string.special.url
|
|
# ^ @string.special
|
|
)
|
|
{
|
|
}
|
|
|
|
def "foo"
|
|
{
|
|
float value.timeSamples = {
|
|
# <- @type
|
|
# ^ @variable
|
|
# ^ @property
|
|
-414: 14.4
|
|
# <- @number
|
|
# ^ @number.float
|
|
10: 201.0,
|
|
# <- @number
|
|
# ^ @number.float
|
|
10.123: 201.0123,
|
|
# <- @number.float
|
|
# ^ @number.float
|
|
}
|
|
}
|