Merge pull request #1249 from onflow/bastian/fix-regression-in-restri…

…cted-type-conversion
onflow · Nov 17, 2021 · 81c63bf · 81c63bf
2 parents 91c67f5 + 53ddeff
commit 81c63bf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/runtime/sema/checker.go b/runtime/sema/checker.go
@@ -1141,6 +1141,10 @@ func (checker *Checker) convertRestrictedType(t *ast.RestrictedType) Type {
 					Range: ast.NewRangeFromPositioned(restriction),
 				})
 			}
+
+			// NOTE: ignore this invalid type
+			// and do not add it to the restrictions result
+			continue
 		}
 
 		restrictions = append(restrictions, restrictionInterfaceType)

diff --git a/runtime/tests/checker/restriction_test.go b/runtime/tests/checker/restriction_test.go
@@ -1124,3 +1124,17 @@ func TestCheckRestrictedConformance(t *testing.T) {
 
 	require.NoError(t, err)
 }
+
+func TestCheckInvalidRestriction(t *testing.T) {
+
+	t.Parallel()
+
+	_, err := ParseAndCheck(t, `
+      let x: {h} = nil
+    `)
+
+	errs := ExpectCheckerErrors(t, err, 2)
+
+	require.IsType(t, &sema.NotDeclaredError{}, errs[0])
+	require.IsType(t, &sema.AmbiguousRestrictedTypeError{}, errs[1])
+}