Some adjustments to the experiential details

Author: xuhuanzy

crates/emmylua_ls/src/handlers/completion/providers/table_field_provider.rs

@@ -98,7 +98,7 @@ fn add_field_key_completion(
     };
     let typ = member_info.typ;
 
-    let (label, insert_text) = {
+    let (label, insert_text, insert_text_format) = {
         let is_nullable = if typ.is_nullable() { "?" } else { "" };
         if in_env(builder, &name, &typ).is_some() {
             (
@@ -107,7 +107,8 @@ fn add_field_key_completion(
                     name = name,
                     nullable = is_nullable,
                 ),
-                format!("{name} = {name},", name = name,),
+                format!("{name} = ${{1:{name}}},", name = name),
+                Some(InsertTextFormat::SNIPPET),
             )
         } else {
             // 函数类型不补空格, 留空格让用户触发字符补全
@@ -120,6 +121,7 @@ fn add_field_key_completion(
                     space = space
                 ),
                 format!("{name} ={space}", name = name, space = space),
+                None,
             )
         }
     };
@@ -146,6 +148,7 @@ fn add_field_key_completion(
         data,
         deprecated,
         insert_text: Some(insert_text),
+        insert_text_format,
         ..Default::default()
     };
 

crates/emmylua_ls/src/handlers/definition/goto_function.rs

@@ -70,11 +70,20 @@ fn get_call_function(
     if let Some(func) = func {
         let call_expr_args_count = call_expr.get_args_count();
         if let Some(mut call_expr_args_count) = call_expr_args_count {
-            let func_params_count = func.get_params().len();
+            let mut func_params_count = func.get_params().len();
             if !func.is_colon_define() && call_expr.is_colon_call() {
                 // 不是冒号定义的函数, 但是是冒号调用
                 call_expr_args_count += 1;
             }
+            // 如果参数有可空参数, 则需要减去
+            for (_, param_type) in func.get_params().iter() {
+                if let Some(param_type) = param_type {
+                    if param_type.is_optional() {
+                        func_params_count -= 1;
+                    }
+                }
+            }
+
             if call_expr_args_count == func_params_count {
                 return Some(func);
             }

crates/emmylua_ls/src/handlers/inlay_hint/build_inlay_hint.rs

@@ -334,7 +334,7 @@ fn build_local_name_hint(
 
     // 目前没时间完善结合 ast 的类型过滤, 所以只允许一些类型显示
     match typ {
-        LuaType::Def(_) | LuaType::Ref(_) => {}
+        LuaType::Ref(_) => {}
         _ => {
             return Some(());
         }

crates/emmylua_ls/src/handlers/test/definition_test.rs

@@ -173,4 +173,43 @@ mod tests {
             }
         }
     }
+
+    #[test]
+    fn test_goto_return_field_2() {
+        let mut ws = ProviderVirtualWorkspace::new_with_init_std_lib();
+        ws.def_file(
+            "test.lua",
+            r#"
+            ---@export
+            ---@class Export
+            local export = {}
+            ---@generic T
+            ---@param name `T`|T
+            ---@param tbl? table
+            ---@return T
+            local function new(name, tbl)
+            end
+
+            export.new = new
+            return export
+            "#,
+        );
+        let result = ws
+            .check_definition(
+                r#"
+            local new = require("test").new
+            new<??>("A")
+            "#,
+            )
+            .unwrap();
+        match result {
+            GotoDefinitionResponse::Array(locations) => {
+                assert_eq!(locations.len(), 1);
+                assert_eq!(locations[0].range.start.line, 8);
+            }
+            _ => {
+                panic!("expect scalar");
+            }
+        }
+    }
 }

crates/emmylua_ls/src/handlers/test/inlay_hint_test.rs

@@ -108,7 +108,7 @@ mod tests {
             "#,
             )
             .unwrap();
-        assert!(result.len() == 4);
+        assert!(result.len() == 3);
     }
 
     #[test]
@@ -123,7 +123,7 @@ mod tests {
             "#,
             )
             .unwrap();
-        assert!(result.len() == 1);
+        assert!(result.len() == 0);
     }
 
     #[test]
@@ -148,9 +148,9 @@ mod tests {
             "#,
             )
             .unwrap();
-        assert!(result.len() == 2);
+        assert!(result.len() == 1);
 
-        let location = match &result.get(1).unwrap().label {
+        let location = match &result.get(0).unwrap().label {
             InlayHintLabel::LabelParts(parts) => parts.first().unwrap().location.as_ref().unwrap(),
             InlayHintLabel::String(_) => panic!(),
         };