Implement template for javascript and typescript language

Author: gschwind

.gitignore

@@ -21,6 +21,7 @@ __MACOSX
 # auto-generated sources
 /jsb.gen.h
 /jsb_project_preset.gen.cpp
-/weaver-editor/templates/templates.gen.h
+/weaver-editor/templates/templates.ts.gen.h
+/weaver-editor/templates/templates.js.gen.h
 
 .vscode

weaver-editor/templates/SCsub

@@ -42,11 +42,10 @@ else:
         src_suffix = ".ts",
     )
 
-language = "ts" if env["use_typescript"] else "js"
-print("generate templates for", language)
-
 # Template files 
 # the suffix should be `.ts`, but `editor/template_builders.py` hardcoded the delimiter with `.cs`
-templates_sources = Glob(f"*/*.{language}.cs")
+templates_ts_sources = Glob(f"*/*.ts.cs")
+env.Alias("editor_template_ts", [env.MakeGodotJSTemplateBuilder("templates.ts.gen.h", templates_ts_sources)])
 
-env.Alias("editor_template_ts", [env.MakeGodotJSTemplateBuilder("templates.gen.h", templates_sources)])
+templates_js_sources = Glob(f"*/*.js.cs")
+env.Alias("editor_template_js", [env.MakeGodotJSTemplateBuilder("templates.js.gen.h", templates_js_sources)])

weaver/jsb_script_language.cpp

@@ -12,10 +12,6 @@
 
 #include "modules/regex/regex.h"
 
-#ifdef TOOLS_ENABLED
-#include "../weaver-editor/templates/templates.gen.h"
-#endif
-
 int GodotJSScriptLanguageBase::prevent_environment_dispose_ = 0;
 std::shared_ptr<jsb::Environment> GodotJSScriptLanguageBase::environment_ = nullptr;
 
@@ -191,19 +187,6 @@ Ref<Script> GodotJSScriptLanguageBase::make_template(const String& p_template, c
     return spt;
 }
 
-Vector<ScriptLanguage::ScriptTemplate> GodotJSScriptLanguageBase::get_built_in_templates(ConstStringNameRefCompat p_object)
-{
-    Vector<ScriptTemplate> templates;
-#ifdef TOOLS_ENABLED
-    for (int i = 0; i < TEMPLATES_ARRAY_SIZE; i++) {
-        if (TEMPLATES[i].inherit == p_object) {
-            templates.append(TEMPLATES[i]);
-        }
-    }
-#endif
-    return templates;
-}
-
 #if GODOT_4_3_OR_NEWER
 void GodotJSScriptLanguageBase::reload_scripts(const Array& p_scripts, bool p_soft_reload)
 {

weaver/jsb_script_language.h

@@ -64,7 +64,7 @@ class GodotJSScriptLanguageBase : public ScriptLanguage
     virtual void thread_exit() override;
 
     virtual bool is_control_flow_keyword(ConstStringRefCompat p_keyword) const override;
-    virtual Vector<ScriptTemplate> get_built_in_templates(ConstStringNameRefCompat p_object) override;
+    virtual Vector<ScriptTemplate> get_built_in_templates(ConstStringNameRefCompat p_object) = 0;
 
     virtual void get_reserved_words(List<String>* p_words) const override;
     virtual void get_doc_comment_delimiters(List<String>* p_delimiters) const override;

weaver/jsb_script_language_js.cpp

@@ -13,7 +13,7 @@
 #include "modules/regex/regex.h"
 
 #ifdef TOOLS_ENABLED
-#include "../weaver-editor/templates/templates.gen.h"
+#include "../weaver-editor/templates/templates.js.gen.h"
 #endif
 
 GodotJavascriptLanguage * GodotJavascriptLanguage::singleton_ = nullptr;
@@ -44,3 +44,16 @@ String GodotJavascriptLanguage::get_type() const
     return jsb_typename(GodotJavaScript);
 }
 
+Vector<ScriptLanguage::ScriptTemplate> GodotJavascriptLanguage::get_built_in_templates(ConstStringNameRefCompat p_object)
+{
+    Vector<ScriptTemplate> templates;
+#ifdef TOOLS_ENABLED
+    for (int i = 0; i < TEMPLATES_ARRAY_SIZE; i++) {
+        if (TEMPLATES[i].inherit == p_object) {
+            templates.append(TEMPLATES[i]);
+        }
+    }
+#endif
+    return templates;
+}
+

weaver/jsb_script_language_js.h

@@ -15,6 +15,7 @@ class GodotJavascriptLanguage : public GodotJSScriptLanguageBase {
     virtual bool handles_global_class_type(const String& p_type) const override;
     virtual String get_name() const override;
     virtual String get_type() const override;
+    virtual Vector<ScriptTemplate> get_built_in_templates(ConstStringNameRefCompat p_object) override;
 
 };
 

weaver/jsb_script_language_ts.cpp

@@ -13,7 +13,7 @@
 #include "modules/regex/regex.h"
 
 #ifdef TOOLS_ENABLED
-#include "../weaver-editor/templates/templates.gen.h"
+#include "../weaver-editor/templates/templates.ts.gen.h"
 #endif
 
 GodotJSScriptLanguage * GodotJSScriptLanguage::singleton_ = nullptr;
@@ -43,3 +43,16 @@ String GodotJSScriptLanguage::get_type() const
     return jsb_typename(GodotJSScript);
 }
 
+Vector<ScriptLanguage::ScriptTemplate> GodotJSScriptLanguage::get_built_in_templates(ConstStringNameRefCompat p_object)
+{
+    Vector<ScriptTemplate> templates;
+#ifdef TOOLS_ENABLED
+    for (int i = 0; i < TEMPLATES_ARRAY_SIZE; i++) {
+        if (TEMPLATES[i].inherit == p_object) {
+            templates.append(TEMPLATES[i]);
+        }
+    }
+#endif
+    return templates;
+}
+

weaver/jsb_script_language_ts.h

@@ -15,6 +15,7 @@ class GodotJSScriptLanguage : public GodotJSScriptLanguageBase {
     virtual bool handles_global_class_type(const String& p_type) const override;
     virtual String get_name() const override;
     virtual String get_type() const override;
+    virtual Vector<ScriptTemplate> get_built_in_templates(ConstStringNameRefCompat p_object) override;
 
 };