tests pass

getgrit · Mar 25, 2024 · c1f6eb4 · c1f6eb4
1 parent 68319eb
commit c1f6eb4
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 16 deletions.
diff --git a/crates/cli_bin/tests/snapshots/apply__output_jsonl.snap b/crates/cli_bin/tests/snapshots/apply__output_jsonl.snap
diff --git a/crates/core/src/snapshots/marzano_core__test__clone_activites.snap b/crates/core/src/snapshots/marzano_core__test__clone_activites.snap
diff --git a/resources/language-metavariables/tree-sitter-typescript/build/Makefile b/resources/language-metavariables/tree-sitter-typescript/build/Makefile
@@ -327,7 +327,7 @@ endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
 cmd_regen_makefile = cd $(srcdir); /Users/itamarlevy-or/.nvm/versions/node/v18.5.0/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/itamarlevy-or/Library/Caches/node-gyp/18.5.0" "-Dnode_gyp_dir=/Users/itamarlevy-or/.nvm/versions/node/v18.5.0/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=/Users/itamarlevy-or/Library/Caches/node-gyp/18.5.0/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/itamarlevy-or/dev/gritql/resources/language-metavariables/tree-sitter-typescript" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/Users/itamarlevy-or/dev/gritql/resources/language-metavariables/tree-sitter-typescript/build/config.gypi -I/Users/itamarlevy-or/.nvm/versions/node/v18.5.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/itamarlevy-or/Library/Caches/node-gyp/18.5.0/include/node/common.gypi "--toplevel-dir=." binding.gyp
-Makefile: $(srcdir)/binding.gyp $(srcdir)/../../../../../Library/Caches/node-gyp/18.5.0/include/node/common.gypi $(srcdir)/build/config.gypi $(srcdir)/../../../../../.nvm/versions/node/v18.5.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
+Makefile: $(srcdir)/../../../../../.nvm/versions/node/v18.5.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../../Library/Caches/node-gyp/18.5.0/include/node/common.gypi $(srcdir)/build/config.gypi
 	$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included

diff --git a/...ge-metavariables/tree-sitter-typescript/build/Release/tree_sitter_typescript_binding.node b/...ge-metavariables/tree-sitter-typescript/build/Release/tree_sitter_typescript_binding.node
diff --git a/...guage-metavariables/tree-sitter-typescript/build/tree_sitter_typescript_binding.target.mk b/...guage-metavariables/tree-sitter-typescript/build/tree_sitter_typescript_binding.target.mk
@@ -135,26 +135,26 @@ $(OBJS): GYP_OBJCXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_
 
 # Suffix rules, putting all outputs into $(obj).
 
-$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD
-	@$(call do_cmd,cxx,1)
-
 $(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.c FORCE_DO_CMD
 	@$(call do_cmd,cc,1)
 
-# Try building from generated source, too.
-
-$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD
 	@$(call do_cmd,cxx,1)
 
+# Try building from generated source, too.
+
 $(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD
 	@$(call do_cmd,cc,1)
 
-$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cc FORCE_DO_CMD
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD
 	@$(call do_cmd,cxx,1)
 
 $(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.c FORCE_DO_CMD
 	@$(call do_cmd,cc,1)
 
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cc FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+
 # End of this set of suffix rules
 ### Rules for final target.
 LDFLAGS_Debug := \

diff --git a/...e-metavariables/tree-sitter-typescript/node_modules/tree-sitter-javascript/build/Makefile b/...e-metavariables/tree-sitter-typescript/node_modules/tree-sitter-javascript/build/Makefile
diff --git a/...ipt/node_modules/tree-sitter-javascript/build/Release/tree_sitter_javascript_binding.node b/...ipt/node_modules/tree-sitter-javascript/build/Release/tree_sitter_javascript_binding.node
diff --git a/resources/metavariable-grammars/typescript-metavariable-define-grammar.js b/resources/metavariable-grammars/typescript-metavariable-define-grammar.js
@@ -150,6 +150,9 @@ module.exports = function defineGrammar(dialect) {
           optional($._initializer),
         ),
 
+      // TODO use the below version of the rule as it is up to date with the upstream typescript grammar
+      // unfortunatly using it breaks the react class componenets to functional componenets pattern
+
       // public_field_definition: ($) => seq(
       //   repeat(field('decorator', $.decorator)),
       //   optional(choice(
@@ -441,6 +444,9 @@ module.exports = function defineGrammar(dialect) {
           '}',
         ),
 
+      // TODO use the below version of the rule as it is up to date with the upstream typescript grammar
+      // unfortunatly using it breaks the react class componenets to functional componenets pattern
+
       // class_body: ($) => seq(
       //   '{',
       //   repeat(choice(