Merge branch 'main' into display-list

.github/workflows/code-quality.yaml

@@ -17,8 +17,14 @@ jobs:
           submodules: recursive
       - name: Install Protoc
         run: sudo apt-get install -y protobuf-compiler
-      - run: rustup component add clippy
-      - uses: actions-rs/clippy-check@v1
+      - name: install Rust
+        uses: actions-rs/toolchain@v1
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --workspace --features test_ci --exclude grit-wasm-bindings -- -D warnings
+          # If you update this, also update build.mjs
+          toolchain: nightly-2023-11-16
+          override: true
+      - run: rustup component add clippy rustfmt
+      - name: lint
+        run: cargo clippy --features test_ci --exclude grit-wasm-bindings --workspace --locked -- -D warnings
+      - name: format
+        run: cargo fmt --all -- --check

crates/language/src/lib.rs

@@ -58,6 +58,7 @@ macro_rules! use_marzano_delegate {
 
 pub mod csharp;
 pub mod css;
+pub mod elixir;
 pub mod foreign_language;
 pub mod go;
 pub mod grit_parser;
@@ -77,7 +78,6 @@ mod php_like;
 pub mod php_only;
 pub mod python;
 pub mod ruby;
-pub mod elixir;
 pub mod rust;
 pub mod solidity;
 pub mod sourcemap;

crates/language/src/target_language.rs

@@ -1,6 +1,7 @@
 use crate::{
     csharp::CSharp,
     css::Css,
+    elixir::Elixir,
     go::Go,
     grit_parser::MarzanoGritParser,
     hcl::Hcl,
@@ -17,7 +18,6 @@ use crate::{
     php_only::PhpOnly,
     python::Python,
     ruby::Ruby,
-    elixir::Elixir,
     rust::Rust,
     solidity::Solidity,
     sql::Sql,

crates/wasm-bindings/src/match_pattern.rs

@@ -475,7 +475,7 @@ fn pattern_language_to_path(lang: &PatternLanguage) -> anyhow::Result<String> {
         PatternLanguage::Go => Ok("/tree-sitter-go.wasm"),
         PatternLanguage::Rust => Ok("/tree-sitter-rust.wasm"),
         PatternLanguage::Ruby => Ok("/tree-sitter-ruby.wasm"),
-        PatternLanguage::Elixir=> Ok("/tree-sitter-elixir.wasm"),
+        PatternLanguage::Elixir => Ok("/tree-sitter-elixir.wasm"),
         PatternLanguage::Solidity => Ok("/tree-sitter-solidity.wasm"),
         PatternLanguage::Hcl => Ok("/tree-sitter-hcl.wasm"),
         PatternLanguage::Yaml => Ok("/tree-sitter-yaml.wasm"),