diff options
| author | Yuri Rubinsky <chaosus89@gmail.com> | 2022-12-29 09:31:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-29 09:31:49 +0300 |
| commit | a75493091823020d858fabadbfa5994da0d658cb (patch) | |
| tree | 1047c5cbab602934307f9f45803c310c1946f1f8 /modules/gdscript | |
| parent | 7e1bd3f95a10acf60e07a8a6518cc80bfee6fbbf (diff) | |
| parent | f67aa3e46d1f100cc6788353bf6c50f2175250e9 (diff) | |
Merge pull request #70642 from vonagam/fix-constructor-call-type
Fixes https://github.com/godotengine/godot/issues/70605
Diffstat (limited to 'modules/gdscript')
3 files changed, 13 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index fc2e6e94f3..9f8d4e4f7e 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -4174,7 +4174,7 @@ bool GDScriptAnalyzer::get_function_signature(GDScriptParser::Node *p_source, bo r_default_arg_count++; } } - r_return_type = found_function->get_datatype(); + r_return_type = p_is_constructor ? p_base_type : found_function->get_datatype(); r_return_type.is_meta_type = false; r_return_type.is_coroutine = found_function->is_coroutine; diff --git a/modules/gdscript/tests/scripts/analyzer/errors/constructor_call_type.gd b/modules/gdscript/tests/scripts/analyzer/errors/constructor_call_type.gd new file mode 100644 index 0000000000..251be70088 --- /dev/null +++ b/modules/gdscript/tests/scripts/analyzer/errors/constructor_call_type.gd @@ -0,0 +1,10 @@ +class A: + func _init(): + pass + +class B extends A: pass +class C extends A: pass + +func test(): + var x := B.new() + print(x is C) diff --git a/modules/gdscript/tests/scripts/analyzer/errors/constructor_call_type.out b/modules/gdscript/tests/scripts/analyzer/errors/constructor_call_type.out new file mode 100644 index 0000000000..91d5125ec0 --- /dev/null +++ b/modules/gdscript/tests/scripts/analyzer/errors/constructor_call_type.out @@ -0,0 +1,2 @@ +GDTEST_ANALYZER_ERROR +Expression is of type "B" so it can't be of type "C". |