fix rebase error

Author: xuhuanzy

crates/emmylua_code_analysis/src/compilation/analyzer/unresolve/resolve_closure.rs

@@ -320,11 +320,10 @@ fn resolve_doc_function(
 fn get_owner_type_id(db: &DbIndex, info: &LuaMemberInfo) -> Option<LuaTypeDeclId> {
     match &info.property_owner_id {
         Some(LuaSemanticDeclId::Member(member_id)) => {
-            if let Some(member) = db.get_member_index().get_member(member_id) {
-                member.get_owner().get_type_id().cloned()
-            } else {
-                None
+            if let Some(owner) = db.get_member_index().get_current_owner(member_id) {
+                return owner.get_type_id().cloned();
             }
+            None
         }
         _ => None,
     }

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

@@ -504,6 +504,7 @@ fn add_enum_members_completion(
                     .clone(),
             )
         })
+        .sorted_by(|a, b| a.0.cmp(&b.0))
         .collect::<Vec<_>>();
 
     // 判断是否为字符串字面量触发

crates/emmylua_ls/src/handlers/hover/build_hover.rs

@@ -64,12 +64,13 @@ pub fn build_hover_content_for_completion<'a>(
 ) -> Option<HoverBuilder<'a>> {
     let typ = match property_id {
         LuaSemanticDeclId::LuaDecl(decl_id) => {
-            let decl = db.get_decl_index().get_decl(&decl_id)?;
-            Some(decl.get_type()?.clone())
+            // let decl = db.get_decl_index().get_decl(&decl_id)?;
+            Some(semantic_model.get_type(decl_id.into()).clone())
         }
         LuaSemanticDeclId::Member(member_id) => {
-            let member = db.get_member_index().get_member(&member_id)?;
-            Some(member.get_decl_type())
+            // let member = db.get_member_index().get_member(&member_id)?;
+            Some(semantic_model.get_type(member_id.into()).clone())
+            // Some(member.get_decl_type())
         }
         _ => None,
     };

crates/emmylua_ls/src/handlers/hover/hover_builder.rs

@@ -140,7 +140,12 @@ impl<'a> HoverBuilder<'a> {
                         .get_member_index()
                         .get_member(&id)
                     {
-                        if let LuaMemberOwner::Type(ty) = &member.get_owner() {
+                        if let Some(LuaMemberOwner::Type(ty)) = self
+                            .semantic_model
+                            .get_db()
+                            .get_member_index()
+                            .get_current_owner(&id)
+                        {
                             if is_std(self.semantic_model.get_db(), member.get_file_id()) {
                                 let std_desc = hover_std_description(
                                     ty.get_name(),

crates/emmylua_ls/src/handlers/semantic_token/build_semantic_tokens.rs

@@ -557,49 +557,30 @@ fn handle_name_node(
     }
 
     let semantic_decl =
-        semantic_model.find_decl(node.clone().into(), SemanticDeclLevel::default())?;
+        semantic_model.find_decl(node.clone().into(), SemanticDeclLevel::Trace(50))?;
 
     match semantic_decl {
         LuaSemanticDeclId::Member(member_id) => {
-            let member = semantic_model
-                .get_db()
-                .get_member_index()
-                .get_member(&member_id)?;
-            if matches!(member.get_decl_type(), LuaType::Signature(_)) {
+            let decl_type = semantic_model.get_type(member_id.into());
+            if matches!(decl_type, LuaType::Signature(_)) {
                 builder.push(name_token.syntax(), SemanticTokenType::FUNCTION);
                 return Some(());
             }
         }
 
         LuaSemanticDeclId::LuaDecl(decl_id) => {
-            let decl = semantic_model
-                .get_db()
-                .get_decl_index()
-                .get_decl(&decl_id)?;
-
-            let (token_type, modifier) = match &decl.extra {
-                LuaDeclExtra::Local { decl_type, .. } => match decl_type {
-                    Some(LuaType::Signature(_) | LuaType::DocFunction(_)) => {
-                        builder.push(name_token.syntax(), SemanticTokenType::FUNCTION);
-                        return Some(());
-                    }
-                    _ => (SemanticTokenType::VARIABLE, None),
-                },
-
-                LuaDeclExtra::Global { decl_type, .. } => match decl_type {
-                    Some(LuaType::Signature(signature)) => {
-                        let is_meta = semantic_model
-                            .get_db()
-                            .get_module_index()
-                            .is_meta_file(&signature.get_file_id());
-                        (
-                            SemanticTokenType::FUNCTION,
-                            is_meta.then_some(SemanticTokenModifier::DEFAULT_LIBRARY),
-                        )
-                    }
-                    _ => (SemanticTokenType::VARIABLE, None),
-                },
-
+            let decl_type = semantic_model.get_type(decl_id.into());
+            let (token_type, modifier) = match decl_type {
+                LuaType::Signature(signature) => {
+                    let is_meta = semantic_model
+                        .get_db()
+                        .get_module_index()
+                        .is_meta_file(&signature.get_file_id());
+                    (
+                        SemanticTokenType::FUNCTION,
+                        is_meta.then_some(SemanticTokenModifier::DEFAULT_LIBRARY),
+                    )
+                }
                 _ => (SemanticTokenType::VARIABLE, None),
             };