From 18194789407c23d4076e8f3f54ad493d93fac258 Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Wed, 2 Mar 2022 09:09:45 -0600 Subject: [PATCH] update tree-sitter-elixir news: - tree-sitter-elixir now powers Elixir syntax highlighting on github.com - GitHub now supports code-navigation for Elixir repos via tree-sitter-elixir changes: - modules now use the `@module` highlight, which was added upstream to tree-sitter - it seems appropriate to use `@namespace` to follow helix convention - added nullary range operator (e.g. `Enum.to_list(..) == []`), a new syntax for elixir 1.14 - a fix for stab clause nodes mis-highlighting when the right hand side of the stab clause contained multiple simple expressions --- languages.toml | 6 +++--- runtime/queries/elixir/highlights.scm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/languages.toml b/languages.toml index 9c1a43349..ce51e4fcb 100644 --- a/languages.toml +++ b/languages.toml @@ -78,8 +78,8 @@ source = { git = "https://github.com/yusdacra/tree-sitter-protobuf", rev = "19c2 [[language]] name = "elixir" scope = "source.elixir" -injection-regex = "elixir" -file-types = ["ex", "exs"] +injection-regex = "(elixir|ex)" +file-types = ["ex", "exs", "mix.lock"] shebangs = ["elixir"] roots = [] comment-token = "#" @@ -88,7 +88,7 @@ indent = { tab-width = 2, unit = " " } [[grammar]] name = "elixir" -source = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "f5d7bda543da788bd507b05bd722627dde66c9ec" } +source = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "60863fc6e27d60cf4b1917499ed2259f92c7800e" } [[language]] name = "fish" diff --git a/runtime/queries/elixir/highlights.scm b/runtime/queries/elixir/highlights.scm index 76fd2af9d..4cfc0c242 100644 --- a/runtime/queries/elixir/highlights.scm +++ b/runtime/queries/elixir/highlights.scm @@ -82,11 +82,11 @@ (integer) @constant.numeric.integer (float) @constant.numeric.float -(alias) @type +(alias) @namespace (call target: (dot - left: (atom) @type)) + left: (atom) @namespace)) (char) @constant.character