c1f90a1 · helix · git.iko.soy

git.iko.soy/helix

add tree-sitter sources to languages.toml

Here we add syntax to the languages.toml languge [[grammar]] name = "<name>" source = { .. } Which can be used to specify a tree-sitter grammar separately of the language that defines it, and we make this distinction for two reasons: * In later commits, we will separate this code from helix-core and bring it to a new helix-loader crate. Using separate schemas for language and grammar configurations allows for a nice divide between the types needed to be declared in helix-loader and in helix-core/syntax * Two different languages may use the same grammar. This is currently the case with llvm-mir-yaml and yaml. We could accomplish a config that works for this with just `[[languages]]`, but it gets a bit dicey with languages depending on one another. If you enable llvm-mir-yaml and disable yaml, does helix still need to fetch and build tree-sitter-yaml? It could be a matter of interpretation.

commitc1f90a127b972c8b41b0d24dcacb3bdd480be9c5 authorMichael Davis <mcarsondavis@gmail.com> dateSun 13 Feb 2022, 12:11 (5 years ago) parentfbb9830

3 files changed+275−28

compare with master

unifiedsplit

helix-core/src/indent.rs+1 helix-core/src/syntax.rs+28−1 languages.toml+246−27

helix-core/src/indent.rs+1

@@ -444,6 +444,7 @@ where

444444 debugger: None,

445445 auto_pairs: None,

446446 }],

447+ grammar: vec![],

447448 });

448449

449450 // set runtime path so we can find the queries

helix-core/src/syntax.rs+28−1

@@ -54,6 +54,7 @@ where

5454#[serde(deny_unknown_fields)]

5555pub struct Configuration {

5656 pub language: Vec<LanguageConfiguration>,

57+ pub grammar: Vec<GrammarConfiguration>,

5758}

5859

5960// largely based on tree-sitter/cli/src/loader.rs

@@ -239,6 +240,29 @@ pub struct IndentQuery {

239240 pub outdent: HashSet<String>,

240241}

241242

243+#[derive(Debug, Serialize, Deserialize)]

244+pub struct GrammarConfiguration {

245+ #[serde(rename = "name")]

246+ pub grammar_id: String, // c-sharp, rust

247+ pub source: GrammarSource,

248+ pub path: Option<String>,

249+}

250+

251+#[derive(Debug, Serialize, Deserialize)]

252+#[serde(rename_all = "lowercase")]

253+#[serde(untagged)]

254+pub enum GrammarSource {

255+ Local {

256+ path: String,

257+ },

258+ Git {

259+ #[serde(rename = "git")]

260+ remote: String,

261+ #[serde(rename = "rev")]

262+ revision: String,

263+ },

264+}

265+

242266#[derive(Debug)]

243267pub struct TextObjectQuery {

244268 pub query: Query,

@@ -2055,7 +2079,10 @@ mod test {

20552079 .map(String::from)

20562080 .collect();

20572081

2058− let loader = Loader::new(Configuration { language: vec![] });

2082+ let loader = Loader::new(Configuration {

2083+ language: vec![],

2084+ grammar: vec![],

2085+ });

20592086

20602087 let language = get_language(&crate::RUNTIME_DIR, "Rust").unwrap();

20612088 let config = HighlightConfiguration::new(

languages.toml+246−27

@@ -45,6 +45,10 @@ request = "attach"

4545completion = [ { name = "lldb connect url", default = "connect://localhost:3333" }, { name = "file", completion = "filename" }, "pid" ]

4646args = { attachCommands = [ "platform select remote-gdb-server", "platform connect {0}", "file {1}", "attach {2}" ] }

4747

48+[[grammar]]

49+name = "rust"

50+source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "a360da0a29a19c281d08295a35ecd0544d2da211" }

51+

4852[[language]]

4953name = "toml"

5054scope = "source.toml"

@@ -52,9 +56,12 @@ injection-regex = "toml"

5256file-types = ["toml"]

5357roots = []

5458comment-token = "#"

55−

5659indent = { tab-width = 2, unit = " " }

5760

61+[[grammar]]

62+name = "toml"

63+source = { git = "https://github.com/ikatyang/tree-sitter-toml", rev = "7cff70bbcbbc62001b465603ca1ea88edd668704" }

64+

5865[[language]]

5966name = "protobuf"

6067scope = "source.proto"

@@ -62,9 +69,12 @@ injection-regex = "protobuf"

6269file-types = ["proto"]

6370roots = []

6471comment-token = "//"

65−

6672indent = { tab-width = 2, unit = " " }

6773

74+[[grammar]]

75+name = "protobuf"

76+source = { git = "https://github.com/yusdacra/tree-sitter-protobuf", rev = "19c211a01434d9f03efff99f85e19f967591b175" }

77+

6878[[language]]

6979name = "elixir"

7080scope = "source.elixir"

@@ -73,10 +83,13 @@ file-types = ["ex", "exs"]

7383shebangs = ["elixir"]

7484roots = []

7585comment-token = "#"

76−

7786language-server = { command = "elixir-ls" }

7887indent = { tab-width = 2, unit = " " }

7988

89+[[grammar]]

90+name = "elixir"

91+source = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "f5d7bda543da788bd507b05bd722627dde66c9ec" }

92+

8093[[language]]

8194name = "fish"

8295scope = "source.fish"

@@ -85,9 +98,12 @@ file-types = ["fish"]

8598shebangs = ["fish"]

8699roots = []

87100comment-token = "#"

88−

89101indent = { tab-width = 4, unit = " " }

90102

103+[[grammar]]

104+name = "fish"

105+source = { git = "https://github.com/ram02z/tree-sitter-fish", rev = "04e54ab6585dfd4fee6ddfe5849af56f101b6d4f" }

106+

91107[[language]]

92108name = "mint"

93109scope = "source.mint"

@@ -96,7 +112,6 @@ file-types = ["mint"]

96112shebangs = []

97113roots = []

98114comment-token = "//"

99−

100115language-server = { command = "mint", args = ["ls"] }

101116indent = { tab-width = 2, unit = " " }

102117

@@ -106,9 +121,12 @@ scope = "source.json"

106121injection-regex = "json"

107122file-types = ["json"]

108123roots = []

109−

110124indent = { tab-width = 2, unit = " " }

111125

126+[[grammar]]

127+name = "json"

128+source = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "65bceef69c3b0f24c0b19ce67d79f57c96e90fcb" }

129+

112130[[language]]

113131name = "c"

114132scope = "source.c"

@@ -116,7 +134,6 @@ injection-regex = "c"

116134file-types = ["c"] # TODO: ["h"]

117135roots = []

118136comment-token = "//"

119−

120137language-server = { command = "clangd" }

121138indent = { tab-width = 2, unit = " " }

122139

@@ -143,6 +160,10 @@ request = "attach"

143160completion = [ { name = "lldb connect url", default = "connect://localhost:3333" }, { name = "file", completion = "filename" }, "pid" ]

144161args = { console = "internalConsole", attachCommands = [ "platform select remote-gdb-server", "platform connect {0}", "file {1}", "attach {2}" ] }

145162

163+[[grammar]]

164+name = "c"

165+source = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "f05e279aedde06a25801c3f2b2cc8ac17fac52ae" }

166+

146167[[language]]

147168name = "cpp"

148169scope = "source.cpp"

@@ -150,7 +171,6 @@ injection-regex = "cpp"

150171file-types = ["cc", "hh", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino"]

151172roots = []

152173comment-token = "//"

153−

154174language-server = { command = "clangd" }

155175indent = { tab-width = 2, unit = " " }

156176

@@ -177,6 +197,10 @@ request = "attach"

177197completion = [ { name = "lldb connect url", default = "connect://localhost:3333" }, { name = "file", completion = "filename" }, "pid" ]

178198args = { console = "internalConsole", attachCommands = [ "platform select remote-gdb-server", "platform connect {0}", "file {1}", "attach {2}" ] }

179199

200+[[grammar]]

201+name = "cpp"

202+source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "e8dcc9d2b404c542fd236ea5f7208f90be8a6e89" }

203+

180204[[language]]

181205name = "c-sharp"

182206scope = "source.csharp"

@@ -184,9 +208,12 @@ injection-regex = "c-?sharp"

184208file-types = ["cs"]

185209roots = []

186210comment-token = "//"

187−

188211indent = { tab-width = 4, unit = "\t" }

189212

213+[[grammar]]

214+name = "c-sharp"

215+source = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "53a65a908167d6556e1fcdb67f1ee62aac101dda" }

216+

190217[[language]]

191218name = "go"

192219scope = "source.go"

@@ -195,7 +222,6 @@ file-types = ["go"]

195222roots = ["Gopkg.toml", "go.mod"]

196223auto-format = true

197224comment-token = "//"

198−

199225language-server = { command = "gopls" }

200226# TODO: gopls needs utf-8 offsets?

201227indent = { tab-width = 4, unit = "\t" }

@@ -231,6 +257,10 @@ request = "attach"

231257completion = [ "pid" ]

232258args = { mode = "local", processId = "{0}" }

233259

260+[[grammar]]

261+name = "go"

262+source = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "0fa917a7022d1cd2e9b779a6a8fc5dc7fad69c75" }

263+

234264[[language]]

235265name = "javascript"

236266scope = "source.js"

@@ -240,7 +270,6 @@ shebangs = ["node"]

240270roots = []

241271comment-token = "//"

242272# TODO: highlights-jsx, highlights-params

243−

244273language-server = { command = "typescript-language-server", args = ["--stdio"], language-id = "javascript" }

245274indent = { tab-width = 2, unit = " " }

246275

@@ -256,6 +285,10 @@ request = "launch"

256285completion = [ { name = "main", completion = "filename", default = "index.js" } ]

257286args = { program = "{0}" }

258287

288+[[grammar]]

289+name = "javascript"

290+source = { git = "https://github.com/tree-sitter/tree-sitter-javascript", rev = "4a95461c4761c624f2263725aca79eeaefd36cad" }

291+

259292[[language]]

260293name = "typescript"

261294scope = "source.ts"

@@ -264,10 +297,14 @@ file-types = ["ts"]

264297shebangs = []

265298roots = []

266299# TODO: highlights-jsx, highlights-params

267−

268300language-server = { command = "typescript-language-server", args = ["--stdio"], language-id = "typescript"}

269301indent = { tab-width = 2, unit = " " }

270302

303+[[grammar]]

304+name = "typescript"

305+source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "3e897ea5925f037cfae2e551f8e6b12eec2a201a" }

306+path = "typescript"

307+

271308[[language]]

272309name = "tsx"

273310scope = "source.tsx"

@@ -275,28 +312,38 @@ injection-regex = "^(tsx)$" # |typescript

275312file-types = ["tsx"]

276313roots = []

277314# TODO: highlights-jsx, highlights-params

278−

279315language-server = { command = "typescript-language-server", args = ["--stdio"], language-id = "typescriptreact" }

280316indent = { tab-width = 2, unit = " " }

281317

318+[[grammar]]

319+name = "tsx"

320+source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "3e897ea5925f037cfae2e551f8e6b12eec2a201a" }

321+path = "tsx"

322+

282323[[language]]

283324name = "css"

284325scope = "source.css"

285326injection-regex = "css"

286327file-types = ["css", "scss"]

287328roots = []

288−

289329indent = { tab-width = 2, unit = " " }

290330

331+[[grammar]]

332+name = "css"

333+source = { git = "https://github.com/tree-sitter/tree-sitter-css", rev = "94e10230939e702b4fa3fa2cb5c3bc7173b95d07" }

334+

291335[[language]]

292336name = "html"

293337scope = "text.html.basic"

294338injection-regex = "html"

295339file-types = ["html"]

296340roots = []

297−

298341indent = { tab-width = 2, unit = " " }

299342

343+[[grammar]]

344+name = "html"

345+source = { git = "https://github.com/tree-sitter/tree-sitter-html", rev = "d93af487cc75120c89257195e6be46c999c6ba18" }

346+

300347[[language]]

301348name = "python"

302349scope = "source.python"

@@ -305,11 +352,14 @@ file-types = ["py"]

305352shebangs = ["python"]

306353roots = []

307354comment-token = "#"

308−

309355language-server = { command = "pylsp" }

310356# TODO: pyls needs utf-8 offsets

311357indent = { tab-width = 4, unit = " " }

312358

359+[[grammar]]

360+name = "python"

361+source = { git = "https://github.com/tree-sitter/tree-sitter-python", rev = "d6210ceab11e8d812d4ab59c07c81458ec6e5184" }

362+

313363[[language]]

314364name = "nix"

315365scope = "source.nix"

@@ -318,10 +368,13 @@ file-types = ["nix"]

318368shebangs = []

319369roots = []

320370comment-token = "#"

321−

322371language-server = { command = "rnix-lsp" }

323372indent = { tab-width = 2, unit = " " }

324373

374+[[grammar]]

375+name = "nix"

376+source = { git = "https://github.com/cstrahan/tree-sitter-nix", rev = "50f38ceab667f9d482640edfee803d74f4edeba5" }

377+

325378[[language]]

326379name = "ruby"

327380scope = "source.ruby"

@@ -330,10 +383,13 @@ file-types = ["rb"]

330383shebangs = ["ruby"]

331384roots = []

332385comment-token = "#"

333−

334386language-server = { command = "solargraph", args = ["stdio"] }

335387indent = { tab-width = 2, unit = " " }

336388

389+[[grammar]]

390+name = "ruby"

391+source = { git = "https://github.com/tree-sitter/tree-sitter-ruby", rev = "dfff673b41df7fadcbb609c6338f38da3cdd018e" }

392+

337393[[language]]

338394name = "bash"

339395scope = "source.bash"

@@ -342,10 +398,13 @@ file-types = ["sh", "bash", "zsh", ".bash_login", ".bash_logout", ".bash_profile

342398shebangs = ["sh", "bash", "dash"]

343399roots = []

344400comment-token = "#"

345−

346401language-server = { command = "bash-language-server", args = ["start"] }

347402indent = { tab-width = 2, unit = " " }

348403

404+[[grammar]]

405+name = "bash"

406+source = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "a8eb5cb57c66f74c63ab950de081207cccf52017" }

407+

349408[[language]]

350409name = "php"

351410scope = "source.php"

@@ -353,18 +412,24 @@ injection-regex = "php"

353412file-types = ["php"]

354413shebangs = ["php"]

355414roots = []

356−

357415indent = { tab-width = 4, unit = " " }

358416

417+[[grammar]]

418+name = "php"

419+source = { git = "https://github.com/tree-sitter/tree-sitter-php", rev = "57f855461aeeca73bd4218754fb26b5ac143f98f" }

420+

359421[[language]]

360422name = "twig"

361423scope = "source.twig"

362424injection-regex = "twig"

363425file-types = ["twig"]

364426roots = []

365−

366427indent = { tab-width = 2, unit = " " }

367428

429+[[grammar]]

430+name = "twig"

431+source = { git = "https://github.com/eirabben/tree-sitter-twig", rev = "b7444181fb38e603e25ea8fcdac55f9492e49c27" }

432+

368433[[language]]

369434name = "latex"

370435scope = "source.tex"

@@ -372,9 +437,12 @@ injection-regex = "tex"

372437file-types = ["tex"]

373438roots = []

374439comment-token = "%"

375−

376440indent = { tab-width = 4, unit = "\t" }

377441

442+[[grammar]]

443+name = "latex"

444+source = { git = "https://github.com/latex-lsp/tree-sitter-latex", rev = "7f720661de5316c0f8fee956526d4002fa1086d8" }

445+

378446[[language]]

379447name = "lean"

380448scope = "source.lean"

@@ -383,9 +451,12 @@ file-types = ["lean"]

383451roots = [ "lakefile.lean" ]

384452comment-token = "--"

385453language-server = { command = "lean", args = [ "--server" ] }

386−

387454indent = { tab-width = 2, unit = " " }

388455

456+[[grammar]]

457+name = "lean"

458+source = { git = "https://github.com/Julian/tree-sitter-lean", rev = "d98426109258b266e1e92358c5f11716d2e8f638" }

459+

389460[[language]]

390461name = "julia"

391462scope = "source.julia"

@@ -410,6 +481,10 @@ language-server = { command = "julia", args = [

410481 ] }

411482indent = { tab-width = 2, unit = " " }

412483

484+[[grammar]]

485+name = "julia"

486+source = { git = "https://github.com/tree-sitter/tree-sitter-julia", rev = "12ea597262125fc22fd2e91aa953ac69b19c26ca" }

487+

413488[[language]]

414489name = "java"

415490scope = "source.java"

@@ -418,6 +493,10 @@ file-types = ["java"]

418493roots = ["pom.xml"]

419494indent = { tab-width = 4, unit = " " }

420495

496+[[grammar]]

497+name = "java"

498+source = { git = "https://github.com/tree-sitter/tree-sitter-java", rev = "bd6186c24d5eb13b4623efac9d944dcc095c0dad" }

499+

421500[[language]]

422501name = "ledger"

423502scope = "source.ledger"

@@ -427,6 +506,10 @@ roots = []

427506comment-token = ";"

428507indent = { tab-width = 4, unit = " " }

429508

509+[[grammar]]

510+name = "ledger"

511+source = { git = "https://github.com/cbarrete/tree-sitter-ledger", rev = "0cdeb0e51411a3ba5493662952c3039de08939ca" }

512+

430513[[language]]

431514name = "ocaml"

432515scope = "source.ocaml"

@@ -437,6 +520,11 @@ roots = []

437520comment-token = "(**)"

438521indent = { tab-width = 2, unit = " " }

439522

523+[[grammar]]

524+name = "ocaml"

525+source = { git = "https://github.com/tree-sitter/tree-sitter-ocaml", rev = "23d419ba45789c5a47d31448061557716b02750a" }

526+path = "ocaml"

527+

440528[[language]]

441529name = "ocaml-interface"

442530scope = "source.ocaml.interface"

@@ -446,6 +534,11 @@ roots = []

446534comment-token = "(**)"

447535indent = { tab-width = 2, unit = " "}

448536

537+[[grammar]]

538+name = "ocaml-interface"

539+source = { git = "https://github.com/tree-sitter/tree-sitter-ocaml", rev = "23d419ba45789c5a47d31448061557716b02750a" }

540+path = "interface"

541+

449542[[language]]

450543name = "lua"

451544scope = "source.lua"

@@ -455,6 +548,10 @@ roots = []

455548comment-token = "--"

456549indent = { tab-width = 2, unit = " " }

457550

551+[[grammar]]

552+name = "lua"

553+source = { git = "https://github.com/nvim-treesitter/tree-sitter-lua", rev = "6f5d40190ec8a0aa8c8410699353d820f4f7d7a6" }

554+

458555[[language]]

459556name = "svelte"

460557scope = "source.svelte"

@@ -464,6 +561,9 @@ roots = []

464561indent = { tab-width = 2, unit = " " }

465562language-server = { command = "svelteserver", args = ["--stdio"] }

466563

564+[[grammar]]

565+name = "svelte"

566+source = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "349a5984513b4a4a9e143a6e746120c6ff6cf6ed" }

467567

468568[[language]]

469569name = "vue"

@@ -473,6 +573,10 @@ file-types = ["vue"]

473573roots = []

474574indent = { tab-width = 2, unit = " " }

475575

576+[[grammar]]

577+name = "vue"

578+source = { git = "https://github.com/ikatyang/tree-sitter-vue", rev = "91fe2754796cd8fba5f229505a23fa08f3546c06" }

579+

476580[[language]]

477581name = "yaml"

478582scope = "source.yaml"

@@ -482,6 +586,10 @@ comment-token = "#"

482586indent = { tab-width = 2, unit = " " }

483587injection-regex = "yml|yaml"

484588

589+[[grammar]]

590+name = "yaml"

591+source = { git = "https://github.com/ikatyang/tree-sitter-yaml", rev = "0e36bed171768908f331ff7dff9d956bae016efb" }

592+

485593[[language]]

486594name = "haskell"

487595scope = "source.haskell"

@@ -492,6 +600,10 @@ comment-token = "--"

492600language-server = { command = "haskell-language-server-wrapper", args = ["--lsp"] }

493601indent = { tab-width = 2, unit = " " }

494602

603+[[grammar]]

604+name = "haskell"

605+source = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "b6ec26f181dd059eedd506fa5fbeae1b8e5556c8" }

606+

495607[[language]]

496608name = "zig"

497609scope = "source.zig"

@@ -500,10 +612,13 @@ file-types = ["zig"]

500612roots = ["build.zig"]

501613auto-format = true

502614comment-token = "//"

503−

504615language-server = { command = "zls" }

505616indent = { tab-width = 4, unit = " " }

506617

618+[[grammar]]

619+name = "zig"

620+source = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "93331b8bd8b4ebee2b575490b2758f16ad4e9f30" }

621+

507622[[language]]

508623name = "prolog"

509624scope = "source.prolog"

@@ -511,7 +626,6 @@ roots = []

511626file-types = ["pl", "prolog"]

512627shebangs = ["swipl"]

513628comment-token = "%"

514−

515629language-server = { command = "swipl", args = [

516630 "-g", "use_module(library(lsp_server))",

517631 "-g", "lsp_server:main",

@@ -526,6 +640,10 @@ comment-token = ";"

526640injection-regex = "tsq"

527641indent = { tab-width = 2, unit = " " }

528642

643+[[grammar]]

644+name = "tsq"

645+source = { git = "https://github.com/tree-sitter/tree-sitter-tsq", rev = "b665659d3238e6036e22ed0e24935e60efb39415" }

646+

529647[[language]]

530648name = "cmake"

531649scope = "source.cmake"

@@ -536,6 +654,10 @@ indent = { tab-width = 2, unit = " " }

536654language-server = { command = "cmake-language-server" }

537655injection-regex = "cmake"

538656

657+[[grammar]]

658+name = "cmake"

659+source = { git = "https://github.com/uyha/tree-sitter-cmake", rev = "f6616f1e417ee8b62daf251aa1daa5d73781c596" }

660+

539661[[language]]

540662name = "make"

541663scope = "source.make"

@@ -544,6 +666,10 @@ roots =[]

544666comment-token = "#"

545667indent = { tab-width = 4, unit = "\t" }

546668

669+[[grammar]]

670+name = "make"

671+source = { git = "https://github.com/alemuller/tree-sitter-make", rev = "a4b9187417d6be349ee5fd4b6e77b4172c6827dd" }

672+

547673[[language]]

548674name = "glsl"

549675scope = "source.glsl"

@@ -553,6 +679,10 @@ comment-token = "//"

553679indent = { tab-width = 4, unit = " " }

554680injection-regex = "glsl"

555681

682+[[grammar]]

683+name = "glsl"

684+source = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "88408ffc5e27abcffced7010fc77396ae3636d7e" }

685+

556686[[language]]

557687name = "perl"

558688scope = "source.perl"

@@ -562,6 +692,10 @@ roots = []

562692comment-token = "#"

563693indent = { tab-width = 2, unit = " " }

564694

695+[[grammar]]

696+name = "perl"

697+source = { git = "https://github.com/ganezdragon/tree-sitter-perl", rev = "0ac2c6da562c7a2c26ed7e8691d4a590f7e8b90a" }

698+

565699[[language]]

566700name = "racket"

567701scope = "source.rkt"

@@ -578,6 +712,10 @@ roots = []

578712file-types = []

579713injection-regex = "comment"

580714

715+[[grammar]]

716+name = "comment"

717+source = { git = "https://github.com/stsewd/tree-sitter-comment", rev = "5dd3c62f1bbe378b220fe16b317b85247898639e" }

718+

581719[[language]]

582720name = "wgsl"

583721scope = "source.wgsl"

@@ -586,6 +724,10 @@ roots = []

586724comment-token = "//"

587725indent = { tab-width = 4, unit = " " }

588726

727+[[grammar]]

728+name = "wgsl"

729+source = { git = "https://github.com/szebniok/tree-sitter-wgsl", rev = "f00ff52251edbd58f4d39c9c3204383253032c11" }

730+

589731[[language]]

590732name = "llvm"

591733scope = "source.llvm"

@@ -595,6 +737,10 @@ comment-token = ";"

595737indent = { tab-width = 2, unit = " " }

596738injection-regex = "llvm"

597739

740+[[grammar]]

741+name = "llvm"

742+source = { git = "https://github.com/benwilliamgraham/tree-sitter-llvm", rev = "3b213925b9c4f42c1acfe2e10bfbb438d9c6834d" }

743+

598744[[language]]

599745name = "llvm-mir"

600746scope = "source.llvm_mir"

@@ -604,9 +750,15 @@ comment-token = ";"

604750indent = { tab-width = 2, unit = " " }

605751injection-regex = "mir"

606752

753+[[grammar]]

754+name = "llvm-mir"

755+source = { git = "https://github.com/Flakebi/tree-sitter-llvm-mir", rev = "06fabca19454b2dc00c1b211a7cb7ad0bc2585f1" }

756+

607757[[language]]

608758name = "llvm-mir-yaml"

609−tree-sitter-library = "yaml"

759+# TODO allow languages to point to their grammar like so:

760+#

761+# grammar = "yaml"

610762scope = "source.yaml"

611763roots = []

612764file-types = ["mir"]

@@ -622,15 +774,22 @@ comment-token = "//"

622774indent = { tab-width = 2, unit = " " }

623775injection-regex = "tablegen"

624776

777+[[grammar]]

778+name = "tablegen"

779+source = { git = "https://github.com/Flakebi/tree-sitter-tablegen", rev = "568dd8a937347175fd58db83d4c4cdaeb6069bd2" }

780+

625781[[language]]

626782name = "markdown"

627783scope = "source.md"

628784injection-regex = "md|markdown"

629785file-types = ["md"]

630786roots = []

631−

632787indent = { tab-width = 2, unit = " " }

633788

789+[[grammar]]

790+name = "markdown"

791+source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "ad8c32917a16dfbb387d1da567bf0c3fb6fffde2" }

792+

634793[[language]]

635794name = "dart"

636795scope = "source.dart"

@@ -641,6 +800,10 @@ comment-token = "//"

641800language-server = { command = "dart", args = ["language-server", "--client-id=helix"] }

642801indent = { tab-width = 2, unit = " " }

643802

803+[[grammar]]

804+name = "dart"

805+source = { git = "https://github.com/UserNobody14/tree-sitter-dart", rev = "6a25376685d1d47968c2cef06d4db8d84a70025e" }

806+

644807[[language]]

645808name = "scala"

646809scope = "source.scala"

@@ -650,6 +813,10 @@ comment-token = "//"

650813indent = { tab-width = 2, unit = " " }

651814language-server = { command = "metals" }

652815

816+[[grammar]]

817+name = "scala"

818+source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "0a3dd53a7fc4b352a538397d054380aaa28be54c" }

819+

653820[[language]]

654821name = "dockerfile"

655822scope = "source.dockerfile"

@@ -660,6 +827,10 @@ comment-token = "#"

660827indent = { tab-width = 2, unit = " " }

661828language-server = { command = "docker-langserver", args = ["--stdio"] }

662829

830+[[grammar]]

831+name = "dockerfile"

832+source = { git = "https://github.com/camdencheek/tree-sitter-dockerfile", rev = "7af32bc04a66ab196f5b9f92ac471f29372ae2ce" }

833+

663834[[language]]

664835name = "git-commit"

665836scope = "git.commitmsg"

@@ -668,6 +839,10 @@ file-types = ["COMMIT_EDITMSG"]

668839comment-token = "#"

669840indent = { tab-width = 2, unit = " " }

670841

842+[[grammar]]

843+name = "git-commit"

844+source = { git = "https://github.com/the-mikedavis/tree-sitter-git-commit", rev = "066e395e1107df17183cf3ae4230f1a1406cc972" }

845+

671846[[language]]

672847name = "git-diff"

673848scope = "source.diff"

@@ -677,6 +852,10 @@ injection-regex = "diff"

677852comment-token = "#"

678853indent = { tab-width = 2, unit = " " }

679854

855+[[grammar]]

856+name = "git-diff"

857+source = { git = "https://github.com/the-mikedavis/tree-sitter-git-diff", rev = "c12e6ecb54485f764250556ffd7ccb18f8e2942b" }

858+

680859[[language]]

681860name = "git-rebase"

682861scope = "source.gitrebase"

@@ -686,6 +865,10 @@ injection-regex = "git-rebase"

686865comment-token = "#"

687866indent = { tab-width = 2, unit = " " }

688867

868+[[grammar]]

869+name = "git-rebase"

870+source = { git = "https://github.com/the-mikedavis/tree-sitter-git-rebase", rev = "332dc528f27044bc4427024dbb33e6941fc131f2" }

871+

689872[[language]]

690873name = "regex"

691874scope = "source.regex"

@@ -693,6 +876,10 @@ injection-regex = "regex"

693876file-types = ["regex"]

694877roots = []

695878

879+[[grammar]]

880+name = "regex"

881+source = { git = "https://github.com/tree-sitter/tree-sitter-regex", rev = "e1cfca3c79896ff79842f057ea13e529b66af636" }

882+

696883[[language]]

697884name = "git-config"

698885scope = "source.gitconfig"

@@ -703,6 +890,10 @@ injection-regex = "git-config"

703890comment-token = "#"

704891indent = { tab-width = 4, unit = "\t" }

705892

893+[[grammar]]

894+name = "git-config"

895+source = { git = "https://github.com/the-mikedavis/tree-sitter-git-config", rev = "0e4f0baf90b57e5aeb62dcdbf03062c6315d43ea" }

896+

706897[[language]]

707898name = "graphql"

708899scope = "source.graphql"

@@ -711,6 +902,10 @@ file-types = ["gql", "graphql"]

711902roots = []

712903indent = { tab-width = 2, unit = " " }

713904

905+[[grammar]]

906+name = "graphql"

907+source = { git = "https://github.com/bkegley/tree-sitter-graphql", rev = "5e66e961eee421786bdda8495ed1db045e06b5fe" }

908+

714909[[language]]

715910name = "elm"

716911scope = "source.elm"

@@ -722,6 +917,10 @@ comment-token = "--"

722917language-server = { command = "elm-language-server" }

723918indent = { tab-width = 4, unit = " " }

724919

920+[[grammar]]

921+name = "elm"

922+source = { git = "https://github.com/elm-tooling/tree-sitter-elm", rev = "bd50ccf66b42c55252ac8efc1086af4ac6bab8cd" }

923+

725924[[language]]

726925name = "iex"

727926scope = "source.iex"

@@ -729,6 +928,10 @@ injection-regex = "iex"

729928file-types = ["iex"]

730929roots = []

731930

931+[[grammar]]

932+name = "iex"

933+source = { git = "https://github.com/elixir-lang/tree-sitter-iex", rev = "39f20bb51f502e32058684e893c0c0b00bb2332c" }

934+

732935[[language]]

733936name = "rescript"

734937scope = "source.rescript"

@@ -740,6 +943,10 @@ comment-token = "//"

740943language-server = { command = "rescript-language-server", args = ["--stdio"] }

741944indent = { tab-width = 2, unit = " " }

742945

946+[[grammar]]

947+name = "rescript"

948+source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "789a171d9bcf73f6d76e67aca39ed14a75375b04" }

949+

743950[[language]]

744951name = "erlang"

745952scope = "source.erlang"

@@ -749,6 +956,10 @@ roots = ["rebar.config"]

749956comment-token = "%%"

750957indent = { tab-width = 4, unit = " " }

751958

959+[[grammar]]

960+name = "erlang"

961+source = { git = "https://github.com/the-mikedavis/tree-sitter-erlang", rev = "86985bde399c5f40b00bc75f7ab70a6c69a5f9c3" }

962+

752963[[language]]

753964name = "kotlin"

754965scope = "source.kotlin"

@@ -758,6 +969,10 @@ comment-token = "//"

758969indent = { tab-width = 4, unit = " " }

759970language-server = { command = "kotlin-language-server" }

760971

972+[[grammar]]

973+name = "kotlin"

974+source = { git = "https://github.com/fwcd/tree-sitter-kotlin", rev = "a4f71eb9b8c9b19ded3e0e9470be4b1b77c2b569" }

975+

761976[[language]]

762977name = "hcl"

763978scope = "source.hcl"

@@ -768,3 +983,7 @@ comment-token = "#"

768983indent = { tab-width = 2, unit = " " }

769984language-server = { command = "terraform-ls", args = ["serve"] }

770985auto-format = true

986+

987+[[grammar]]

988+name = "hcl"

989+source = { git = "https://github.com/MichaHoffmann/tree-sitter-hcl", rev = "3cb7fc28247efbcb2973b97e71c78838ad98a583" }