Unvendor tree-sitter-elisp

Author: wetneb

CHANGELOG.md

@@ -3,7 +3,7 @@
 ### Parsing
 
 Added support for protocol buffer files. Updated Ada, Clojure, CMake, Dart,
-Devicetree, Elm, Gleam, HCL, Newick, QML, R, Racket, SQL, Scheme, and
+Devicetree, Elisp, Elm, Gleam, HCL, Newick, QML, R, Racket, SQL, Scheme, and
 Solidity parsers.
 
 Improved handling of variable names `$foo` in shell scripts.

Cargo.lock

@@ -86,6 +86,7 @@ tree-sitter-cpp = "0.23.4"
 tree-sitter-css = "0.23.1"
 tree-sitter-dart-orchard = "0.2.1"
 tree-sitter-devicetree = "0.14.1"
+tree-sitter-elisp = "1.6.1"
 tree-sitter-elixir = "0.3.4"
 tree-sitter-elm = "5.8.0"
 tree-sitter-erlang = "0.13.0"

Cargo.toml

@@ -72,11 +72,6 @@ fn main() {
             src_dir: "vendored_parsers/tree-sitter-commonlisp-src",
             extra_files: vec![],
         },
-        TreeSitterParser {
-            name: "tree-sitter-elisp",
-            src_dir: "vendored_parsers/tree-sitter-elisp-src",
-            extra_files: vec![],
-        },
         TreeSitterParser {
             name: "tree-sitter-elvish",
             src_dir: "vendored_parsers/tree-sitter-elvish-src",

build.rs

@@ -70,7 +70,6 @@ pub(crate) struct TreeSitterConfig {
 
 extern "C" {
     fn tree_sitter_commonlisp() -> ts::Language;
-    fn tree_sitter_elisp() -> ts::Language;
     fn tree_sitter_elvish() -> ts::Language;
     fn tree_sitter_hare() -> ts::Language;
     fn tree_sitter_hack() -> ts::Language;
@@ -343,7 +342,9 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         EmacsLisp => {
-            let language = unsafe { tree_sitter_elisp() };
+            let language_fn = tree_sitter_elisp::LANGUAGE;
+            let language = tree_sitter::Language::new(language_fn);
+
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: [].into_iter().collect(),

src/parse/tree_sitter_parser.rs

@@ -0,0 +1,74 @@
+;; Source: https://github.com/Wilfred/tree-sitter-elisp/blob/main/queries/highlights.scm
+
+;; Special forms
+[
+  "and"
+  "catch"
+  "cond"
+  "condition-case"
+  "defconst"
+  "defvar"
+  "function"
+  "if"
+  "interactive"
+  "lambda"
+  "let"
+  "let*"
+  "or"
+  "prog1"
+  "prog2"
+  "progn"
+  "quote"
+  "save-current-buffer"
+  "save-excursion"
+  "save-restriction"
+  "setq"
+  "setq-default"
+  "unwind-protect"
+  "while"
+] @keyword
+
+;; Function definitions
+[
+ "defun"
+ "defsubst"
+ ] @keyword
+(function_definition name: (symbol) @function)
+(function_definition parameters: (list (symbol) @variable.parameter))
+(function_definition docstring: (string) @comment)
+
+;; Highlight macro definitions the same way as function definitions.
+"defmacro" @keyword
+(macro_definition name: (symbol) @function)
+(macro_definition parameters: (list (symbol) @variable.parameter))
+(macro_definition docstring: (string) @comment)
+
+(comment) @comment
+
+(integer) @number
+(float) @number
+(char) @number
+
+(string) @string
+
+[
+  "("
+  ")"
+  "#["
+  "["
+  "]"
+] @punctuation.bracket
+
+[
+  "`"
+  "#'"
+  "'"
+  ","
+  ",@"
+] @operator
+
+;; Highlight nil and t as constants, unlike other symbols
+[
+  "nil"
+  "t"
+] @constant.builtin