update completion

Author: xuhuanzy

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

@@ -111,6 +111,9 @@ pub fn dispatch_type(
         LuaType::ConstTplRef(tpl) => {
             add_const_tpl_ref_completion(builder, &tpl.get_tpl_id(), infer_guard);
         }
+        LuaType::TplRef(tpl) => {
+            add_tpl_ref_completion(builder, &tpl.get_tpl_id(), infer_guard);
+        }
         LuaType::Call(special_call) => {
             add_special_call_completion(builder, &special_call);
         }
@@ -185,7 +188,11 @@ fn add_union_member_completion(
     union_typ: &LuaUnionType,
     infer_guard: &InferGuardRef,
 ) -> Option<()> {
-    for union_sub_typ in union_typ.into_vec() {
+    // 如果存在 strtplref, 那么将其移动到最后面
+    let mut union_types = union_typ.into_vec();
+    union_types.sort_by_key(|typ| matches!(typ, LuaType::StrTplRef(_)));
+
+    for union_sub_typ in union_types {
         let name = match union_sub_typ {
             LuaType::DocStringConst(s) => to_enum_label(builder, s.as_str()),
             LuaType::DocIntegerConst(i) => i.to_string(),
@@ -841,3 +848,13 @@ pub fn get_function_remove_nil(db: &DbIndex, typ: &LuaType) -> Option<LuaType> {
         _ => None,
     }
 }
+
+fn add_tpl_ref_completion(
+    builder: &mut CompletionBuilder,
+    tpl_id: &GenericTplId,
+    infer_guard: &InferGuardRef,
+) -> Option<()> {
+    let extend_type = get_tpl_ref_extend_type(builder, tpl_id)?;
+    dispatch_type(builder, extend_type, infer_guard);
+    Some(())
+}

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

@@ -2118,4 +2118,44 @@ mod tests {
         ));
         Ok(())
     }
+
+    #[gtest]
+    fn test_generic_extends_completion() -> Result<()> {
+        let mut ws = ProviderVirtualWorkspace::new();
+        ws.def_file(
+            "std.lua",
+            r#"
+                ---@alias std.type
+                ---| "nil"
+                ---| "number"
+            "#,
+        );
+        ws.def(
+            r#"
+                ---@generic TP: std.type | table
+                ---@param tp `TP`|TP
+                function is_type(tp)
+                end
+            "#,
+        );
+        check!(ws.check_completion_with_kind(
+            r#"
+                is_type(<??>)
+            "#,
+            vec![
+                VirtualCompletionItem {
+                    label: "\"nil\"".to_string(),
+                    kind: CompletionItemKind::ENUM_MEMBER,
+                    ..Default::default()
+                },
+                VirtualCompletionItem {
+                    label: "\"number\"".to_string(),
+                    kind: CompletionItemKind::ENUM_MEMBER,
+                    ..Default::default()
+                },
+            ],
+            CompletionTriggerKind::TRIGGER_CHARACTER,
+        ));
+        Ok(())
+    }
 }