templater: migrate core methods to table lookup, add typo hints

cli/Cargo.toml

@@ -63,6 +63,7 @@ rpassword = { workspace = true }
 scm-record = { workspace = true }
 serde = { workspace = true }
 slab = { workspace = true }
+strsim = { workspace = true }
 tempfile = { workspace = true }
 textwrap = { workspace = true }
 thiserror = { workspace = true }

cli/src/cli_util.rs

@@ -86,7 +86,7 @@ use crate::git_util::{
     is_colocated_git_workspace, print_failed_git_export, print_git_import_stats,
 };
 use crate::merge_tools::{ConflictResolveError, DiffEditError, DiffGenerateError};
-use crate::template_parser::{TemplateAliasesMap, TemplateParseError};
+use crate::template_parser::{TemplateAliasesMap, TemplateParseError, TemplateParseErrorKind};
 use crate::templater::Template;
 use crate::ui::{ColorChoice, Ui};
 use crate::{commit_templater, text_util};
@@ -405,9 +405,10 @@ impl From<RevsetEvaluationError> for CommandError {
 
 impl From<RevsetParseError> for CommandError {
     fn from(err: RevsetParseError) -> Self {
-        let message = iter::successors(Some(&err), |e| e.origin()).join("\n");
-        // Only for the top-level error as we can't attach hint to inner errors
-        let hint = match err.kind() {
+        let err_chain = iter::successors(Some(&err), |e| e.origin());
+        let message = err_chain.clone().join("\n");
+        // Only for the bottom error, which is usually the root cause
+        let hint = match err_chain.last().unwrap().kind() {
             RevsetParseErrorKind::NotPrefixOperator {
                 op: _,
                 similar_op,
@@ -452,8 +453,18 @@ impl From<RevsetResolutionError> for CommandError {
 
 impl From<TemplateParseError> for CommandError {
     fn from(err: TemplateParseError) -> Self {
-        let message = iter::successors(Some(&err), |e| e.origin()).join("\n");
-        user_error(format!("Failed to parse template: {message}"))
+        let err_chain = iter::successors(Some(&err), |e| e.origin());
+        let message = err_chain.clone().join("\n");
+        // Only for the bottom error, which is usually the root cause
+        let hint = match err_chain.last().unwrap().kind() {
+            TemplateParseErrorKind::NoSuchKeyword { candidates, .. }
+            | TemplateParseErrorKind::NoSuchFunction { candidates, .. }
+            | TemplateParseErrorKind::NoSuchMethod { candidates, .. } => {
+                format_similarity_hint(candidates)
+            }
+            _ => None,
+        };
+        user_error_with_hint_opt(format!("Failed to parse template: {message}"), hint)
     }
 }
 

cli/src/commit_templater.rs

@@ -30,8 +30,8 @@ use once_cell::unsync::OnceCell;
 
 use crate::formatter::Formatter;
 use crate::template_builder::{
-    self, BuildContext, CoreTemplatePropertyKind, IntoTemplateProperty, TemplateBuildMethodFnMap,
-    TemplateLanguage,
+    self, BuildContext, CoreTemplateBuildFnTable, CoreTemplatePropertyKind, IntoTemplateProperty,
+    TemplateBuildMethodFnMap, TemplateLanguage,
 };
 use crate::template_parser::{self, FunctionCallNode, TemplateAliasesMap, TemplateParseResult};
 use crate::templater::{
@@ -67,7 +67,8 @@ impl<'repo> TemplateLanguage<'repo> for CommitTemplateLanguage<'repo> {
     ) -> TemplateParseResult<Self::Property> {
         match property {
             CommitTemplatePropertyKind::Core(property) => {
-                template_builder::build_core_method(self, build_ctx, property, function)
+                let table = &self.build_fn_table.core;
+                table.build_method(self, build_ctx, property, function)
             }
             CommitTemplatePropertyKind::Commit(property) => {
                 let table = &self.build_fn_table.commit_methods;
@@ -228,7 +229,7 @@ type CommitTemplateBuildMethodFnMap<'repo, T> =
 
 /// Symbol table of methods available in the commit template.
 struct CommitTemplateBuildFnTable<'repo> {
-    // TODO: add core methods/functions table
+    core: CoreTemplateBuildFnTable<'repo, CommitTemplateLanguage<'repo>>,
     commit_methods: CommitTemplateBuildMethodFnMap<'repo, Commit>,
     ref_name_methods: CommitTemplateBuildMethodFnMap<'repo, RefName>,
     commit_or_change_id_methods: CommitTemplateBuildMethodFnMap<'repo, CommitOrChangeId>,
@@ -239,6 +240,7 @@ impl CommitTemplateBuildFnTable<'_> {
     /// Creates new symbol table containing the builtin methods.
     fn builtin() -> Self {
         CommitTemplateBuildFnTable {
+            core: CoreTemplateBuildFnTable::builtin(),
             commit_methods: builtin_commit_methods(),
             ref_name_methods: builtin_ref_name_methods(),
             commit_or_change_id_methods: builtin_commit_or_change_id_methods(),
@@ -802,4 +804,5 @@ pub fn parse<'repo>(
     };
     let node = template_parser::parse(template_text, aliases_map)?;
     template_builder::build(&language, &node)
+        .map_err(|err| err.extend_alias_candidates(aliases_map))
 }

cli/src/operation_templater.rs

@@ -21,8 +21,8 @@ use jj_lib::operation::Operation;
 
 use crate::formatter::Formatter;
 use crate::template_builder::{
-    self, BuildContext, CoreTemplatePropertyKind, IntoTemplateProperty, TemplateBuildMethodFnMap,
-    TemplateLanguage,
+    self, BuildContext, CoreTemplateBuildFnTable, CoreTemplatePropertyKind, IntoTemplateProperty,
+    TemplateBuildMethodFnMap, TemplateLanguage,
 };
 use crate::template_parser::{self, FunctionCallNode, TemplateAliasesMap, TemplateParseResult};
 use crate::templater::{
@@ -55,7 +55,8 @@ impl TemplateLanguage<'static> for OperationTemplateLanguage {
     ) -> TemplateParseResult<Self::Property> {
         match property {
             OperationTemplatePropertyKind::Core(property) => {
-                template_builder::build_core_method(self, build_ctx, property, function)
+                let table = &self.build_fn_table.core;
+                table.build_method(self, build_ctx, property, function)
             }
             OperationTemplatePropertyKind::Operation(property) => {
                 let table = &self.build_fn_table.operation_methods;
@@ -134,7 +135,7 @@ type OperationTemplateBuildMethodFnMap<T> =
 
 /// Symbol table of methods available in the operation template.
 struct OperationTemplateBuildFnTable {
-    // TODO: add core methods/functions table
+    core: CoreTemplateBuildFnTable<'static, OperationTemplateLanguage>,
     operation_methods: OperationTemplateBuildMethodFnMap<Operation>,
     operation_id_methods: OperationTemplateBuildMethodFnMap<OperationId>,
 }
@@ -143,6 +144,7 @@ impl OperationTemplateBuildFnTable {
     /// Creates new symbol table containing the builtin methods.
     fn builtin() -> Self {
         OperationTemplateBuildFnTable {
+            core: CoreTemplateBuildFnTable::builtin(),
             operation_methods: builtin_operation_methods(),
             operation_id_methods: builtin_operation_id_methods(),
         }
@@ -253,4 +255,5 @@ pub fn parse(
     };
     let node = template_parser::parse(template_text, aliases_map)?;
     template_builder::build(&language, &node)
+        .map_err(|err| err.extend_alias_candidates(aliases_map))
 }