maybe

getgrit · Jul 10, 2024 · c3eed3b · c3eed3b
1 parent ff3e05e
commit c3eed3b
Showing 1 changed file with 40 additions and 12 deletions.
diff --git a/resources/edit_grammars.mjs b/resources/edit_grammars.mjs
@@ -200,8 +200,8 @@ async function buildLanguage(language) {
     console.log(`[${language}] ` + message, ...args);
   log(`Starting`);
   const tsLangDir = path.join(
-    resourceDir,
-    `language-submodules/tree-sitter-${language}`
+    LANGUAGE_METAVARIABLES_DIR,
+    `tree-sitter-${language}`
   );
 
   if (language == "toml") {
@@ -241,13 +241,25 @@ async function buildLanguage(language) {
     ]);
 
     await fs.rename(
-      `tree-sitter-markdown/tree-sitter-markdown/tree-sitter-markdown.wasm`,
-      `../../crates/wasm-bindings/wasm_parsers/tree-sitter-markdown-block.wasm`
+      path.join(
+        LANGUAGE_METAVARIABLES_DIR,
+        `tree-sitter-markdown/tree-sitter-markdown/tree-sitter-markdown.wasm`
+      ),
+      path.join(
+        resourceDir,
+        `../crates/wasm-bindings/wasm_parsers/tree-sitter-markdown-block.wasm`
+      )
     );
 
     await fs.rename(
-      `tree-sitter-markdown/tree-sitter-markdown-inline/tree-sitter-markdown_inline.wasm`,
-      `../../crates/wasm-bindings/wasm_parsers/tree-sitter-markdown_inline.wasm`
+      path.join(
+        LANGUAGE_METAVARIABLES_DIR,
+        `tree-sitter-markdown/tree-sitter-markdown-inline/tree-sitter-markdown_inline.wasm`
+      ),
+      path.join(
+        resourceDir,
+        `../crates/wasm-bindings/wasm_parsers/tree-sitter-markdown_inline.wasm`
+      )
     );
   } else if (language === "typescript") {
     // typescript is special
@@ -311,7 +323,11 @@ async function buildLanguage(language) {
     //HCL's mv grammar goes into `make_grammar.js`, not `grammar.js`
     await fs.copyFile(
       `${METAVARIABLE_GRAMMARS_DIR}/${language}-metavariable-grammar.js`,
-      path.join(resourceDir, `tree-sitter-${language}/make_grammar.js`)
+      path.join(
+        resourceDir,
+        `language-metavariables`,
+        `tree-sitter-${language}/make_grammar.js`
+      )
     );
     await buildSimpleLanguage(log, language);
   } else if (language === "sql") {
@@ -333,7 +349,7 @@ async function buildLanguage(language) {
         `${METAVARIABLE_GRAMMARS_DIR}/${language}-common-metavariable-grammar.js`,
         path.join(
           resourceDir,
-          `tree-sitter-${language}/common/define-grammar.js`
+          `language-metavariables/tree-sitter-${language}/common/grammar.js`
         )
       ),
       // copyMvGrammar('php_only', 'php/php_only'),
@@ -354,12 +370,24 @@ async function buildLanguage(language) {
 
     log(`Copying wasm parser`);
     await fs.rename(
-      `tree-sitter-php/php_only/tree-sitter-php_only.wasm`,
-      `../../crates/wasm-bindings/wasm_parsers/tree-sitter-php_only.wasm`
+      path.join(
+        LANGUAGE_METAVARIABLES_DIR,
+        `tree-sitter-php/php_only/tree-sitter-php_only.wasm`
+      ),
+      path.join(
+        resourceDir,
+        `../crates/wasm-bindings/wasm_parsers/tree-sitter-php_only.wasm`
+      )
     );
     await fs.rename(
-      `tree-sitter-php/php/tree-sitter-php.wasm`,
-      `../../crates/wasm-bindings/wasm_parsers/tree-sitter-php.wasm`
+      path.join(
+        LANGUAGE_METAVARIABLES_DIR,
+        `tree-sitter-php/php/tree-sitter-php.wasm`
+      ),
+      path.join(
+        resourceDir,
+        `../crates/wasm-bindings/wasm_parsers/tree-sitter-php.wasm`
+      )
     );
   } else {
     await buildSimpleLanguage(log, language);