aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorStefan Kangas2022-12-16 08:45:06 +0100
committerStefan Kangas2022-12-16 08:45:06 +0100
commit03892d4f7c1253bc1affeedd227eb0a1520de90e (patch)
treee4b8c00a4ed4e16da3b06c18a34605cf9d19fd68 /admin
parentb52d0147e9ef7900f4fc07e8c2bf816b1a4ae145 (diff)
parent033071692c7cd1cd550d25170d4b3168668567ac (diff)
downloademacs-03892d4f7c1253bc1affeedd227eb0a1520de90e.tar.gz
emacs-03892d4f7c1253bc1affeedd227eb0a1520de90e.zip
Merge from origin/emacs-29
033071692c7 ; Fix typos f4a513344d9 Add lambda_expression-rule to java-ts-mode (bug#60091) 546aed35434 eglot: Add support for new language server csharp-ls cb761eb7ac4 Use the new tree-sitter commands 037407ad95a Add "function" feature to python-ts-mode (bug#59977) fee2efe1b03 Add go-ts-mode and go-mod-ts-mode (Bug#60025) e8f7ab67ad1 Add basic support for hideshow in python-ts-mode (bug#60044) cac070b23e4 Add "this" keyword to java-ts-mode (bug#60086) c8d75046a2f When completing relative project file names, use relative... 3b618d0e3ed Avoid segfaults due to invalid selected-window's buffer # Conflicts: # lisp/progmodes/sh-script.el
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/notes/tree-sitter/build-module/batch.sh1
-rwxr-xr-xadmin/notes/tree-sitter/build-module/build.sh5
2 files changed, 6 insertions, 0 deletions
diff --git a/admin/notes/tree-sitter/build-module/batch.sh b/admin/notes/tree-sitter/build-module/batch.sh
index e7ef45cf57d..c50b9df37ed 100755
--- a/admin/notes/tree-sitter/build-module/batch.sh
+++ b/admin/notes/tree-sitter/build-module/batch.sh
@@ -9,6 +9,7 @@ languages=(
9 'c-sharp' 9 'c-sharp'
10 'dockerfile' 10 'dockerfile'
11 'go' 11 'go'
12 'go-mod'
12 'html' 13 'html'
13 'javascript' 14 'javascript'
14 'json' 15 'json'
diff --git a/admin/notes/tree-sitter/build-module/build.sh b/admin/notes/tree-sitter/build-module/build.sh
index 4195ea58c3c..b6c83ea9b99 100755
--- a/admin/notes/tree-sitter/build-module/build.sh
+++ b/admin/notes/tree-sitter/build-module/build.sh
@@ -26,6 +26,11 @@ case "${lang}" in
26 "cmake") 26 "cmake")
27 org="uyha" 27 org="uyha"
28 ;; 28 ;;
29 "go-mod")
30 # The parser is called "gomod".
31 lang="gomod"
32 org="camdencheek"
33 ;;
29 "typescript") 34 "typescript")
30 sourcedir="tree-sitter-typescript/typescript/src" 35 sourcedir="tree-sitter-typescript/typescript/src"
31 grammardir="tree-sitter-typescript/typescript" 36 grammardir="tree-sitter-typescript/typescript"