cel-expr · copybara-service · Feb 26, 2025 · Feb 26, 2025
diff --git a/checker/src/main/java/dev/cel/checker/ExprChecker.java b/checker/src/main/java/dev/cel/checker/ExprChecker.java
@@ -778,13 +778,14 @@ private TypeProvider.FieldType getFieldType(
    } else {
      // Proto message was added as a variable to the environment but the descriptor was not
      // provided
-      env.reportError(
-          exprId,
-          position,
-          "Message type resolution failure while referencing field '%s'. Ensure that the descriptor"
-              + " for type '%s' was added to the environment",
-          fieldName,
-          typeName);
+      String errorMessage =
+          String.format("Message type resolution failure while referencing field '%s'.", fieldName);
+      if (type.kind().equals(CelKind.STRUCT)) {
+        errorMessage +=
+            String.format(
+                " Ensure that the descriptor for type '%s' was added to the environment", typeName);
+      }
+      env.reportError(exprId, position, errorMessage, fieldName, typeName);
    }
    return ERROR;
  }

diff --git a/checker/src/test/java/dev/cel/checker/ExprCheckerTest.java b/checker/src/test/java/dev/cel/checker/ExprCheckerTest.java
@@ -211,6 +211,22 @@ public void messageFieldSelect() throws Exception {
    runTest();
  }

+  @Test
+  public void messageCreationError() throws Exception {
+    declareVariable("x", CelProtoTypes.INT64);
+    source = "x{foo: 1}";
+    runTest();
+
+    declareVariable("y", CelProtoTypes.create(CelProtoTypes.INT64));
+    source = "y{foo: 1}";
+    runTest();
+
+    declareVariable(
+        "z", CelProtoTypes.create(CelProtoTypes.createMessage("msg_without_descriptor")));
+    source = "z{foo: 1}";
+    runTest();
+  }
+
  @Test
  public void messageFieldSelectError() throws Exception {
    declareVariable("x", createMessage("cel.expr.conformance.proto3.TestAllTypes"));
@@ -396,6 +412,18 @@ public void flexibleTypeAdaption() throws Exception {
    runTest();
  }

+  @Test
+  public void userFunctionOverlappingOverloadsError() throws Exception {
+    declareFunction(
+        "func",
+        memberOverload(
+            "overlapping_overload_1", ImmutableList.of(CelProtoTypes.INT64), CelProtoTypes.INT64),
+        memberOverload(
+            "overlapping_overload_2", ImmutableList.of(CelProtoTypes.INT64), CelProtoTypes.INT64));
+    source = "func(1)";
+    runTest();
+  }
+
  // Json Types
  // ==========


diff --git a/checker/src/test/resources/messageCreationError.baseline b/checker/src/test/resources/messageCreationError.baseline
@@ -0,0 +1,41 @@
+Source: x{foo: 1}
+declare x {
+  value int
+}
+=====>
+ERROR: test_location:1:2: 'int' is not a type
+ | x{foo: 1}
+ | .^
+ERROR: test_location:1:6: Message type resolution failure while referencing field 'foo'.
+ | x{foo: 1}
+ | .....^
+
+Source: y{foo: 1}
+declare x {
+  value int
+}
+declare y {
+  value type(int)
+}
+=====>
+ERROR: test_location:1:2: 'int' is not a message type
+ | y{foo: 1}
+ | .^
+ERROR: test_location:1:6: Message type resolution failure while referencing field 'foo'.
+ | y{foo: 1}
+ | .....^
+
+Source: z{foo: 1}
+declare x {
+  value int
+}
+declare y {
+  value type(int)
+}
+declare z {
+  value type(msg_without_descriptor)
+}
+=====>
+ERROR: test_location:1:6: Message type resolution failure while referencing field 'foo'. Ensure that the descriptor for type 'msg_without_descriptor' was added to the environment
+ | z{foo: 1}
+ | .....^
diff --git a/checker/src/test/resources/userFunctionOverlappingOverloadsError.baseline b/checker/src/test/resources/userFunctionOverlappingOverloadsError.baseline
@@ -0,0 +1,9 @@
+Source: func(1)
+declare func {
+  function overlapping_overload_1 int.() -> int
+  function overlapping_overload_2 int.() -> int
+}
+=====>
+ERROR: test_location:1:1: overlapping overload for name 'func' (type '(int) -> int' cannot be distinguished from '(int) -> int')
+ | func(1)
+ | ^