feat: go field identifier (#7)

getgrit · Mar 11, 2024 · 0961ecc · 0961ecc
1 parent a11db02
commit 0961ecc
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 1,427 deletions.
diff --git a/crates/core/src/test.rs b/crates/core/src/test.rs
@@ -12560,3 +12560,26 @@ fn go_import_metavariable() {
     })
     .unwrap();
 }
+
+#[test]
+fn go_field_identifier() {
+    run_test_match(TestArg {
+        pattern: r#"
+            |language go
+            |
+            |`ReadFile`
+            |"#
+        .trim_margin()
+        .unwrap(),
+        source: r#"
+            |import (
+            |   "io/ioutil"
+            |)
+            |
+            |file := ioutil.ReadFile("file.txt")
+            |"#
+        .trim_margin()
+        .unwrap(),
+    })
+    .unwrap();
+}
diff --git a/crates/language/src/go.rs b/crates/language/src/go.rs
@@ -49,7 +49,7 @@ impl Language for Go {
         "Go"
     }
     fn snippet_context_strings(&self) -> &[(&'static str, &'static str)] {
-        &[("", ""), ("", ";")]
+        &[("", ""), ("", ";"), ("GO_OBJECT.", ";")]
     }
 
     fn node_types(&self) -> &[Vec<Field>] {

diff --git a/crates/wasm-bindings/wasm_parsers/tree-sitter-go.wasm b/crates/wasm-bindings/wasm_parsers/tree-sitter-go.wasm
diff --git a/resources/edit_grammars.mjs b/resources/edit_grammars.mjs
@@ -108,14 +108,16 @@ const copyNodeTypes = async (lang, dest) =>
 const copyWasmParser = async (lang, prefix) =>
   fs.rename(
     `${prefix ?? 'tree-sitter-'}${lang}/tree-sitter-${lang}.wasm`,
-    `../../wasm-bindings/wasm_parsers/tree-sitter-${lang}.wasm`,
+    `../../crates/wasm-bindings/wasm_parsers/tree-sitter-${lang}.wasm`,
   );
 
 async function rsyncGrammars(language) {
   //If a language is given, only sync that language
   //Otherwise, rm -rf the entire language-metavariables dir and sync it from scratch
   const treeSitterLang = language ? `tree-sitter-${language}` : '.';
-  const mvDir = language ? `${LANGUAGE_METAVARIABLES}/${treeSitterLang}` : LANGUAGE_METAVARIABLES;
+  const mvDir = language
+    ? `${LANGUAGE_METAVARIABLES}/${treeSitterLang}`
+    : LANGUAGE_METAVARIABLES;
 
   if (languagesWithoutMetaVariables.includes(language)) {
     return;
@@ -134,7 +136,9 @@ async function rsyncGrammars(language) {
     'tree-sitter-*/corpus',
   ];
   await execPromise(
-    `rsync -r -l ${submodulesDir} language-metavariables --exclude={${blobsToExclude.join(',')}}`,
+    `rsync -r -l ${submodulesDir} language-metavariables --exclude={${blobsToExclude.join(
+      ','
+    )}}`
   );
 }
 
@@ -158,7 +162,8 @@ async function buildLanguage(language) {
     throw `Unsupported language ${language}`;
   }
 
-  const log = (message, ...args) => console.log(`[${language}] ` + message, ...args);
+  const log = (message, ...args) =>
+    console.log(`[${language}] ` + message, ...args);
   log(`Starting`);
   const tsLangDir = `tree-sitter-${language}`;
   //Force cargo.toml to use the correct version of tree-sitter
@@ -189,12 +194,12 @@ async function buildLanguage(language) {
 
     await fs.rename(
       `tree-sitter-markdown/tree-sitter-markdown/tree-sitter-markdown.wasm`,
-      `../../wasm-bindings/wasm_parsers/tree-sitter-markdown-block.wasm`,
+      `../../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`,
-      `../../wasm-bindings/wasm_parsers/tree-sitter-markdown_inline.wasm`,
+      `../../crates/wasm-bindings/wasm_parsers/tree-sitter-markdown_inline.wasm`,
     );
   } else if (language === 'typescript') {
     // typescript is special
@@ -243,7 +248,10 @@ async function buildLanguage(language) {
     //SQL's wasm build hangs so we skip it
     await treeSitterGenerate(language, false);
     await copyNodeTypes(language);
-    await fs.copyFile(`${METAVARIABLE_GRAMMARS}/c_build.rs`, `${tsLangDir}/bindings/rust/build.rs`);
+    await fs.copyFile(
+      `${METAVARIABLE_GRAMMARS}/c_build.rs`,
+      `${tsLangDir}/bindings/rust/build.rs`,
+    );
   } else {
     await buildSimpleLanguage(log, language);
   }

diff --git a/resources/language-metavariables/tree-sitter-go/bindings/rust/build.rs b/resources/language-metavariables/tree-sitter-go/bindings/rust/build.rs
@@ -3,7 +3,7 @@ fn main() {
     let mut c_config = cc::Build::new();
     c_config.include(src_dir);
     c_config
-        .flag_if_supported("-Wno-unused-parameter")
+        .flag_if_supported("-w")
         .flag_if_supported("-Wno-unused-but-set-variable")
         .flag_if_supported("-Wno-trigraphs");
     let parser_path = src_dir.join("parser.c");

diff --git a/resources/language-metavariables/tree-sitter-go/grammar.js b/resources/language-metavariables/tree-sitter-go/grammar.js
@@ -64,7 +64,7 @@ module.exports = grammar({
   inline: $ => [
     $._type,
     $._type_identifier,
-    $._field_identifier,
+    $.field_identifier,
     $._package_identifier,
     $._top_level_declaration,
     $._string_literal,
@@ -211,7 +211,7 @@ module.exports = grammar({
     method_declaration: $ => prec.right(1, seq(
       'func',
       field('receiver', $.parameter_list),
-      field('name', $._field_identifier),
+      field('name', $.field_identifier),
       field('parameters', $.parameter_list),
       field('result', optional(choice($.parameter_list, $._simple_type))),
       field('body', optional($.block))
@@ -269,7 +269,7 @@ module.exports = grammar({
       field('type', $._type)
     ),
 
-    field_name_list: $ => commaSep1(field('names', $._field_identifier)),
+    field_name_list: $ => commaSep1(field('names', $.field_identifier)),
 
     expression_list: $ => commaSep1(field('expressions', $._expression)),
 
@@ -346,7 +346,7 @@ module.exports = grammar({
     field_declaration: $ => seq(
       choice(
         seq(
-          commaSep1(field('name', $._field_identifier)),
+          commaSep1(field('name', $.field_identifier)),
           field('type', $._type)
         ),
         seq(
@@ -398,7 +398,7 @@ module.exports = grammar({
     )),
 
     method_spec: $ => seq(
-      field('name', $._field_identifier),
+      field('name', $.field_identifier),
       field('parameters', $.parameter_list),
       field('result', optional(choice($.parameter_list, $._simple_type)))
     ),
@@ -765,7 +765,7 @@ module.exports = grammar({
     selector_expression: $ => prec(PREC.primary, seq(
       field('operand', $._expression),
       '.',
-      field('field', $._field_identifier)
+      field('field', $.field_identifier)
     )),
 
     index_expression: $ => prec(PREC.primary, seq(
@@ -904,7 +904,7 @@ module.exports = grammar({
     identifier: $ => choice($._identifier, $.grit_metavariable),
 
     _type_identifier: $ => alias($.identifier, $.type_identifier),
-    _field_identifier: $ => alias($.identifier, $.field_identifier),
+    field_identifier: $ => alias($.identifier, $.field_identifier),
     _package_identifier: $ => alias($.identifier, $.package_identifier),
 
     _string_literal: $ => choice(

diff --git a/resources/language-metavariables/tree-sitter-go/src/grammar.json b/resources/language-metavariables/tree-sitter-go/src/grammar.json
@@ -666,7 +666,7 @@
             "name": "name",
             "content": {
               "type": "SYMBOL",
-              "name": "_field_identifier"
+              "name": "field_identifier"
             }
           },
           {
@@ -1118,7 +1118,7 @@
           "name": "names",
           "content": {
             "type": "SYMBOL",
-            "name": "_field_identifier"
+            "name": "field_identifier"
           }
         },
         {
@@ -1135,7 +1135,7 @@
                 "name": "names",
                 "content": {
                   "type": "SYMBOL",
-                  "name": "_field_identifier"
+                  "name": "field_identifier"
                 }
               }
             ]
@@ -1565,7 +1565,7 @@
                       "name": "name",
                       "content": {
                         "type": "SYMBOL",
-                        "name": "_field_identifier"
+                        "name": "field_identifier"
                       }
                     },
                     {
@@ -1582,7 +1582,7 @@
                             "name": "name",
                             "content": {
                               "type": "SYMBOL",
-                              "name": "_field_identifier"
+                              "name": "field_identifier"
                             }
                           }
                         ]
@@ -1917,7 +1917,7 @@
           "name": "name",
           "content": {
             "type": "SYMBOL",
-            "name": "_field_identifier"
+            "name": "field_identifier"
           }
         },
         {
@@ -3912,7 +3912,7 @@
             "name": "field",
             "content": {
               "type": "SYMBOL",
-              "name": "_field_identifier"
+              "name": "field_identifier"
             }
           }
         ]
@@ -4788,7 +4788,7 @@
       "named": true,
       "value": "type_identifier"
     },
-    "_field_identifier": {
+    "field_identifier": {
       "type": "ALIAS",
       "content": {
         "type": "SYMBOL",
@@ -7295,7 +7295,7 @@
   "inline": [
     "_type",
     "_type_identifier",
-    "_field_identifier",
+    "field_identifier",
     "_package_identifier",
     "_top_level_declaration",
     "_string_literal"