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`
51 lines
1.4 KiB
Python
51 lines
1.4 KiB
Python
match command.split():
|
|
# ^ @keyword.conditional
|
|
case ["quit"]:
|
|
# ^ @keyword.conditional
|
|
print("Goodbye!")
|
|
quit_game()
|
|
case ["look"]:
|
|
# ^ @keyword.conditional
|
|
current_room.describe()
|
|
case ["get", obj]:
|
|
# ^ @keyword.conditional
|
|
character.get(obj, current_room)
|
|
case ["go", direction]:
|
|
# ^ @keyword.conditional
|
|
current_room = current_room.neighbor(direction)
|
|
# The rest of your commands go here
|
|
|
|
match command.split():
|
|
# ^ @keyword.conditional
|
|
case ["drop", *objects]:
|
|
# ^ @keyword.conditional
|
|
for obj in objects:
|
|
character.drop(obj, current_room)
|
|
|
|
match command.split():
|
|
# ^ @keyword.conditional
|
|
case ["quit"]: ... # Code omitted for brevity
|
|
case ["go", direction]: pass
|
|
case ["drop", *objects]: pass
|
|
case _:
|
|
print(f"Sorry, I couldn't understand {command!r}")
|
|
# ^^ @@function.macro
|
|
|
|
match command.split():
|
|
# ^ @keyword.conditional
|
|
case ["north"] | ["go", "north"]:
|
|
# ^ @keyword.conditional
|
|
current_room = current_room.neighbor("north")
|
|
case ["get", obj] | ["pick", "up", obj] | ["pick", obj, "up"]:
|
|
# ^ @keyword.conditional
|
|
pass
|
|
|
|
match = 2
|
|
# ^ @variable
|
|
match, a = 2, 3
|
|
# ^ @variable
|
|
match: int = secret
|
|
# ^ @variable
|
|
x, match: str = 2, "hey, what's up?"
|
|
# <- @variable
|
|
# ^ @variable
|