Skip to content

fix: add missing 'origin' to built-in template entries #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moluopro merged 3 commits into from
Aug 7, 2026
Merged

fix: add missing 'origin' to built-in template entries #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec7fcca
fix: add missing 'origin' to built-in template entries
feSHt377 Aug 7, 2026
57d9a06
fix: name TypeScript template origin
moluopro Aug 7, 2026
3e5e8be
test: cover TypeScript template origin metadata
moluopro Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/script/typescript_language.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ constexpr const char *TS_CONTROL_FLOW_WORDS[] = {
"finally", "for", "if", "return", "switch", "throw", "try", "while", "yield"
};

// Mirrors ScriptLanguage::TemplateLocation::TEMPLATE_BUILT_IN, which godot-cpp
// does not expose as a GDExtension enum.
constexpr int SCRIPT_TEMPLATE_ORIGIN_BUILT_IN = 0;

bool contains_word(const String &p_word, const char *const *p_words, size_t p_count) {
const String word = p_word.strip_edges();
for (size_t i = 0; i < p_count; i++) {
Expand Down Expand Up @@ -148,6 +152,7 @@ Dictionary make_template_entry(const String &p_inherit, const String &p_name, co
entry["description"] = p_description;
entry["content"] = p_content;
entry["id"] = p_id;
entry["origin"] = SCRIPT_TEMPLATE_ORIGIN_BUILT_IN;
return entry;
}

Expand Down
12 changes: 12 additions & 0 deletions test/test_repository_integrity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,6 +1103,18 @@ def test_typescript_language_editor_surface_is_not_stubbed(self):
self.assertNotIn("script->_get_global_name()", global_class_body)
self.assertNotIn("script->get_base_class_name()", global_class_body)

def test_typescript_builtin_template_entries_include_godot_required_fields(self):
source = (ROOT / "src/script/typescript_language.cpp").read_text(encoding="utf-8")
match = re.search(r"Dictionary make_template_entry\(.*?\n\}", source, re.DOTALL)
self.assertIsNotNone(match)
body = match.group(0)

for key in ("inherit", "name", "description", "content", "id", "origin"):
self.assertIn(f'entry["{key}"]', body)
self.assertIn("SCRIPT_TEMPLATE_ORIGIN_BUILT_IN", source)
self.assertIn('entry["origin"] = SCRIPT_TEMPLATE_ORIGIN_BUILT_IN;', body)
self.assertNotIn('entry["origin"] = 0;', body)

def test_typescript_metadata_parser_resolves_project_imports_like_compiler(self):
source = (ROOT / "src/script/typescript_script.cpp").read_text(encoding="utf-8")

Expand Down