stash

jvalkeal · Sep 22, 2024 · d5db6fa · d5db6fa
1 parent 367e6d2
commit d5db6fa
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/.github/actions/update-ts-languages/action.yml b/.github/actions/update-ts-languages/action.yml
@@ -6,5 +6,5 @@ runs:
     - name: Update TS Languages
       shell: bash
       run: |
-        ./scripts/generate-ts.sh -jz
-        ./scripts/generate-languages.sh -jz
+        ./src/scripts/generate-ts.sh -jz
+        ./src/scripts/generate-ts-languages.sh -jz
diff --git a/_templates/init/tslanguage/gradle-build.txt → src/hygen/init/tslanguage/gradle-build.txt b/_templates/init/tslanguage/gradle-build.txt → src/hygen/init/tslanguage/gradle-build.txt
diff --git a/...s/init/tslanguage/main-language-class.txt → ...n/init/tslanguage/main-language-class.txt b/...s/init/tslanguage/main-language-class.txt → ...n/init/tslanguage/main-language-class.txt
diff --git a/...s/init/tslanguage/test-language-class.txt → ...n/init/tslanguage/test-language-class.txt b/...s/init/tslanguage/test-language-class.txt → ...n/init/tslanguage/test-language-class.txt
diff --git a/.../init/tslanguage/treesitter-factories.txt → .../init/tslanguage/treesitter-factories.txt b/.../init/tslanguage/treesitter-factories.txt → .../init/tslanguage/treesitter-factories.txt
diff --git a/scripts/generate-languages.sh → src/scripts/generate-ts-languages.sh b/scripts/generate-languages.sh → src/scripts/generate-ts-languages.sh
@@ -1,15 +1,17 @@
 #!/bin/bash
 
 find_basedir() {
-  local basedir=$(cd -P -- "$(dirname -- "$0")" && cd .. && pwd -P)
+  local basedir=$(cd -P -- "$(dirname -- "$0")" && cd .. && cd ..  && pwd -P)
   echo "${basedir}"
 }
 
+PROJECTBASEDIR=$(find_basedir)
+
 dojextract='false'
 dozig='false'
 
 print_usage() {
-  echo "Usage: generate-languages.sh [-j] [-z]"
+  echo "Usage: generate-ts-languages.sh [-j] [-z]"
 }
 
 while getopts 'jz' flag; do
@@ -52,8 +54,6 @@ tree-sitter-grammars,tree-sitter-yaml,v0.6.1,yaml
 # tree-sitter-grammars,tree-sitter-xml,v0.6.4,xml
 # tree-sitter-grammars,tree-sitter-lua,v0.1.0,lua
 
-export PROJECTBASEDIR=$(find_basedir)
-
 for VALUE in $VALUES;
   do
     GHOWNER=$(echo $VALUE | cut -f1 -d,)
@@ -62,11 +62,12 @@ for VALUE in $VALUES;
     LANGUAGEID=$(echo $VALUE | cut -f4 -d,)
     LANGUAGENAME="${LANGUAGEID^}"
     REPOPATH=$TMPDIR/$GHOWNER/$GHREPO
-    TARGETMODULEPATH=spring-shell-treesitter-languages/spring-shell-treesitter-language-$LANGUAGEID
+    TARGETMODULEPATH=$PROJECTBASEDIR/spring-shell-treesitter-languages/spring-shell-treesitter-language-$LANGUAGEID
     git clone --depth 1 -b $TAG https://github.com/$GHOWNER/$GHREPO.git $REPOPATH
 
     if [ "$dojextract" == "true" ]; then
-      npx hygen init tslanguage --language $LANGUAGEID
+      (cd $PROJECTBASEDIR; HYGEN_TMPLS=$PROJECTBASEDIR/src/hygen npx hygen init tslanguage --language $LANGUAGEID)
+      # npx hygen init tslanguage --language $LANGUAGEID
       mkdir -p $TARGETMODULEPATH/src/ts
       cp $REPOPATH/bindings/c/tree-sitter-$LANGUAGEID.h $TARGETMODULEPATH/src/ts/
       mkdir -p $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/queries/$LANGUAGEID

diff --git a/scripts/generate-ts.sh → src/scripts/generate-ts.sh b/scripts/generate-ts.sh → src/scripts/generate-ts.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 
 find_basedir() {
-  local basedir=$(cd -P -- "$(dirname -- "$0")" && cd .. && pwd -P)
+  local basedir=$(cd -P -- "$(dirname -- "$0")" && cd .. && cd ..  && pwd -P)
   echo "${basedir}"
 }
 
+PROJECTBASEDIR=$(find_basedir)
+
 dojextract='false'
 dozig='false'
 
@@ -28,7 +30,7 @@ GHOWNER=tree-sitter
 GHREPO=tree-sitter
 TAG=v0.23.0
 REPOPATH=$TMPDIR/$GHOWNER/$GHREPO
-TARGETMODULEPATH=spring-shell-treesitter
+TARGETMODULEPATH=$PROJECTBASEDIR/spring-shell-treesitter
 
 git clone --depth 1 -b $TAG https://github.com/$GHOWNER/$GHREPO.git $REPOPATH
 mkdir -p $TARGETMODULEPATH/src/ts