fix(validation): fix false-positive unresolved generic symbol validat…

…ion for formal parameters (PLC-lang#1066) * fix(validation): fix false-positive unresolved generic symbol validation for formal parameters * remove unreferenced snapshots
Zeugwerk · Feb 2, 2024 · 6111391 · 6111391
1 parent 7e2e61a
commit 6111391
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 0 deletions.
diff --git a/src/validation/statement.rs b/src/validation/statement.rs
@@ -1189,6 +1189,10 @@ fn validate_type_nature<T: AnnotationMap>(
     {
         if let DataTypeInformation::Generic { generic_symbol, nature, .. } = type_hint.get_type_information()
         {
+            // we might be validating an identifier of a formal parameter assignment (FOO(x := 0))
+            if let AstStatement::Identifier(_) = statement.get_stmt() {
+                return;
+            }
             validator.push_diagnostic(
                 Diagnostic::error(format!("Could not resolve generic type {generic_symbol} with {nature}"))
                     .with_error_code("E064")

diff --git a/src/validation/tests/generic_validation_tests.rs b/src/validation/tests/generic_validation_tests.rs
@@ -1599,3 +1599,33 @@ fn any_date_multiple_parameters() {
     let diagnostics = parse_and_validate_buffered(src);
     assert_snapshot!(&diagnostics);
 }
+
+#[test]
+fn generic_call_with_formal_parameter() {
+    let src = "
+    FUNCTION FOO < T: ANY_NUM >: T
+    VAR_INPUT
+        x: T;
+    END_VAR
+    END_FUNCTION
+
+    FUNCTION FOO__DINT: DINT
+    VAR_INPUT
+        x: DINT;
+    END_VAR
+        FOO__DINT := x + 0;
+    END_FUNCTION
+
+    FUNCTION main: DINT
+    VAR
+        myLocalNumber: DINT := 2;
+    END_VAR
+        myLocalNumber := FOO(x := myLocalNumber); // okay
+        myLocalNumber := FOO(y := 0); // unresolved reference
+        myLocalNumber := FOO(x := 'INVALID TYPE NATURE'); // invalid type nature
+    END_FUNCTION
+";
+
+    let diagnostics = parse_and_validate_buffered(src);
+    insta::assert_snapshot!(diagnostics);
+}
diff --git a/...sty__validation__tests__generic_validation_tests__generic_call_with_formal_parameter.snap b/...sty__validation__tests__generic_validation_tests__generic_call_with_formal_parameter.snap
@@ -0,0 +1,29 @@
+---
+source: src/validation/tests/generic_validation_tests.rs
+expression: diagnostics
+---
+error: Invalid call parameters
+   ┌─ <internal>:20:30
+   │
+20 │         myLocalNumber := FOO(y := 0); // unresolved reference
+   │                              ^^^^^^ Invalid call parameters
+
+error: Could not resolve reference to y
+   ┌─ <internal>:20:30
+   │
+20 │         myLocalNumber := FOO(y := 0); // unresolved reference
+   │                              ^ Could not resolve reference to y
+
+error: Invalid type nature for generic argument. __STRING_19 is no ANY_NUMBER
+   ┌─ <internal>:21:35
+   │
+21 │         myLocalNumber := FOO(x := 'INVALID TYPE NATURE'); // invalid type nature
+   │                                   ^^^^^^^^^^^^^^^^^^^^^ Invalid type nature for generic argument. __STRING_19 is no ANY_NUMBER
+
+error: Invalid assignment: cannot assign 'STRING' to 'USINT'
+   ┌─ <internal>:21:30
+   │
+21 │         myLocalNumber := FOO(x := 'INVALID TYPE NATURE'); // invalid type nature
+   │                              ^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid assignment: cannot assign 'STRING' to 'USINT'
+
+