Merge changes from master

book/src/generated/lang-support.md

@@ -42,6 +42,7 @@
 | edoc | ✓ | | | |
 | eex | ✓ | | | |
 | ejs | ✓ | | | |
+| elisp | ✓ | | | |
 | elixir | ✓ | ✓ | ✓ | `elixir-ls` |
 | elm | ✓ | ✓ | | `elm-language-server` |
 | elvish | ✓ | | | `elvish` |

languages.toml

@@ -3671,3 +3671,17 @@ grammar = "typescript"
 "{" = "}"
 "(" = ")"
 '"' = '"'
+
+[[language]]
+name = "elisp"
+scope = "source.elisp"
+file-types = ["el"]
+comment-tokens = [";"]
+
+[language.auto-pairs]
+'(' = ')'
+'"' = '"'
+
+[[grammar]]
+name = "elisp"
+source = { git = "https://github.com/Wilfred/tree-sitter-elisp", rev = "e5524fdccf8c22fc726474a910e4ade976dfc7bb" }

runtime/queries/elisp/highlights.scm

@@ -0,0 +1,72 @@
+;; 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) @constant.numeric.integer
+(float) @constant.numeric.float
+(char) @constant.character
+
+(string) @string
+
+[
+ "("
+ ")"
+ "#["
+ "["
+ "]"
+] @punctuation.bracket
+
+[
+ "`"
+ "#'"
+ "'"
+ ","
+ ",@"
+] @operator
+
+;; Highlight nil and t as constants, unlike other symbols
+[
+ "nil"
+ "t"
+] @constant.builtin

runtime/queries/elisp/tags.scm

@@ -0,0 +1,5 @@
+;; defun/defsubst
+(function_definition name: (symbol) @name) @definition.function
+
+;; Treat macros as function definitions for the sake of TAGS.
+(macro_definition name: (symbol) @name) @definition.function