Merge branch 'main' into 1285-core-schema-performance

Author: tpaulus

cedar-policy-core/src/parser/cst_to_ast.rs

@@ -490,8 +490,26 @@ impl ast::UnreservedId {
                         )
                         .into())
                     } else {
+                        fn suggest_method(
+                            name: &ast::UnreservedId,
+                            methods: &HashSet<ast::UnreservedId>,
+                        ) -> Option<String> {
+                            const SUGGEST_METHOD_MAX_DISTANCE: usize = 3;
+                            let method_names =
+                                methods.iter().map(ToString::to_string).collect::<Vec<_>>();
+                            let suggested_method = fuzzy_search_limited(
+                                &name.to_string(),
+                                method_names.as_slice(),
+                                Some(SUGGEST_METHOD_MAX_DISTANCE),
+                            );
+                            suggested_method.map(|m| format!("did you mean `{m}`?"))
+                        }
+                        let hint = suggest_method(&self, &EXTENSION_STYLES.methods);
                         Err(ToASTError::new(
-                            ToASTErrorKind::UnknownMethod(self.clone()),
+                            ToASTErrorKind::UnknownMethod {
+                                id: self.clone(),
+                                hint,
+                            },
                             loc.clone(),
                         )
                         .into())
@@ -4019,6 +4037,13 @@ mod tests {
                     .exactly_one_underline("[].bar()")
                     .build(),
             ),
+            (
+                "principal.addr.isipv4()",
+                ExpectedErrorMessageBuilder::error("`isipv4` is not a valid method")
+                    .exactly_one_underline("principal.addr.isipv4()")
+                    .help("did you mean `isIpv4`?")
+                    .build(),
+            ),
             (
                 "bar([])",
                 ExpectedErrorMessageBuilder::error("`bar` is not a valid function")

cedar-policy-core/src/parser/err.rs

@@ -297,8 +297,14 @@ pub enum ToASTErrorKind {
     #[error("attempted to call `{0}.{1}(...)`, but `{0}` does not have any methods")]
     NoMethods(ast::Name, ast::UnreservedId),
     /// Returned when a policy attempts to call a method that does not exist
-    #[error("`{0}` is not a valid method")]
-    UnknownMethod(ast::UnreservedId),
+    #[error("`{id}` is not a valid method")]
+    UnknownMethod {
+        /// The user-provided method id
+        id: ast::UnreservedId,
+        /// The hint to resolve the error
+        #[help]
+        hint: Option<String>,
+    },
     /// Returned when a policy attempts to call a function that does not exist
     #[error("`{id}` is not a valid function")]
     UnknownFunction {

cedar-policy/CHANGELOG.md

@@ -20,6 +20,8 @@ Cedar Language Version: TBD
 
 - The error associated with parsing a non-existent extension function additionally
   includes a suggestion based on available extension functions (#1280, resolving #332).
+- The error associated with parsing a non-existent extension method additionally
+  includes a suggestion based on available extension methods (#1289, resolving #246).
 - Extract action graph inversion from CoreSchema to ValidatorSchema instantiation to
   improve schema validation speeds. (#1290, as part of resolving #1285)