optimize hover std

Author: xuhuanzy

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

@@ -5,11 +5,11 @@ use emmylua_code_analysis::{
 use emmylua_parser::{LuaAstNode, LuaCallExpr, LuaIndexExpr, LuaSyntaxKind, LuaSyntaxToken};
 use lsp_types::{Hover, HoverContents, MarkedString, MarkupContent};
 
-use crate::handlers::hover::std_hover::{hover_std_description, is_std_by_name};
+use crate::handlers::hover::std_hover::hover_std_description;
 
 use super::{
     build_hover::{add_signature_param_description, add_signature_ret_description},
-    std_hover::is_std_by_path,
+    std_hover::is_std,
 };
 
 #[derive(Debug)]
@@ -136,7 +136,7 @@ impl<'a> HoverBuilder<'a> {
                         .get_member(&id)
                     {
                         if let LuaMemberOwner::Type(ty) = &member.get_owner() {
-                            if is_std_by_name(&ty.get_name()) {
+                            if is_std(self.semantic_model.get_db(), member.get_file_id()) {
                                 let std_desc = hover_std_description(
                                     ty.get_name(),
                                     member.get_key().get_name(),
@@ -151,11 +151,7 @@ impl<'a> HoverBuilder<'a> {
                 LuaSemanticDeclId::LuaDecl(id) => {
                     if let Some(decl) = self.semantic_model.get_db().get_decl_index().get_decl(&id)
                     {
-                        if decl.is_global()
-                            && is_std_by_name(&decl.get_name())
-                            && is_std_by_path(self.semantic_model.get_db(), decl.get_file_id())
-                                .unwrap_or(false)
-                        {
+                        if is_std(self.semantic_model.get_db(), decl.get_file_id()) {
                             let std_desc = hover_std_description(decl.get_name(), None);
                             if !std_desc.is_empty() {
                                 description = std_desc;

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

@@ -2,6 +2,7 @@ use emmylua_code_analysis::{DbIndex, FileId};
 
 use crate::meta_text::meta_std;
 
+#[allow(unused)]
 pub fn is_std_by_name(name: &str) -> bool {
     match name {
         "oslib" => true,
@@ -57,7 +58,6 @@ pub fn hover_std_description(type_name: &str, member_name: Option<&str>) -> Stri
     meta_std(type_name, member_name)
 }
 
-pub fn is_std_by_path(db: &DbIndex, file_id: FileId) -> Option<bool> {
-    let module_info = db.get_module_index().get_module(file_id)?;
-    Some(module_info.workspace_id.is_std())
+pub fn is_std(db: &DbIndex, file_id: FileId) -> bool {
+    db.get_module_index().is_std(&file_id)
 }