Skip to content

Commit da786cf

Browse files
committed
refactor: remove old std translation
1 parent 12e32d5 commit da786cf

File tree

5 files changed

+6
-147
lines changed

5 files changed

+6
-147
lines changed

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

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
use super::std_hover::{hover_std_description, is_std};
21
use emmylua_code_analysis::{
3-
DbIndex, InFiled, LuaMember, LuaMemberOwner, LuaMultiLineUnion, LuaSemanticDeclId, LuaType,
4-
LuaUnionType, RenderLevel, SemanticDeclLevel, SemanticModel, format_union_type,
2+
DbIndex, InFiled, LuaMember, LuaMultiLineUnion, LuaSemanticDeclId, LuaType, LuaUnionType,
3+
RenderLevel, SemanticDeclLevel, SemanticModel, format_union_type,
54
};
65

76
use emmylua_code_analysis::humanize_type;
@@ -167,38 +166,7 @@ pub fn extract_description_from_property_owner(
167166
let mut result = DescriptionInfo::new();
168167

169168
if let Some(detail) = property.description() {
170-
let mut description = detail.to_string();
171-
172-
match property_owner {
173-
LuaSemanticDeclId::Member(id) => {
174-
if let Some(member) = semantic_model.get_db().get_member_index().get_member(id)
175-
&& let Some(LuaMemberOwner::Type(ty)) = semantic_model
176-
.get_db()
177-
.get_member_index()
178-
.get_current_owner(id)
179-
&& is_std(semantic_model.get_db(), member.get_file_id())
180-
{
181-
let std_desc =
182-
hover_std_description(ty.get_name(), member.get_key().get_name());
183-
if !std_desc.is_empty() {
184-
description = std_desc;
185-
}
186-
}
187-
}
188-
LuaSemanticDeclId::LuaDecl(id) => {
189-
if let Some(decl) = semantic_model.get_db().get_decl_index().get_decl(id)
190-
&& is_std(semantic_model.get_db(), decl.get_file_id())
191-
{
192-
let std_desc = hover_std_description(decl.get_name(), None);
193-
if !std_desc.is_empty() {
194-
description = std_desc;
195-
}
196-
}
197-
}
198-
_ => {}
199-
}
200-
201-
result.description = Some(description);
169+
result.description = Some(detail.to_string());
202170
}
203171

204172
if let Some(tag_content) = property.tag_content() {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ mod hover_builder;
55
mod humanize_type_decl;
66
mod humanize_types;
77
mod keyword_hover;
8-
mod std_hover;
98

109
use super::RegisterCapabilities;
1110
use crate::context::ServerContextSnapshot;
@@ -24,7 +23,6 @@ use lsp_types::{
2423
Position, ServerCapabilities,
2524
};
2625
use rowan::TokenAtOffset;
27-
pub use std_hover::{hover_std_description, is_std};
2826
use tokio_util::sync::CancellationToken;
2927

3028
pub async fn on_hover(

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

Lines changed: 0 additions & 63 deletions
This file was deleted.

crates/emmylua_ls/src/handlers/signature_helper/signature_helper_builder.rs

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
use emmylua_code_analysis::{
2-
FileId, LuaCompilation, LuaMemberOwner, LuaSemanticDeclId, LuaType, SemanticDeclLevel,
3-
SemanticModel,
2+
LuaCompilation, LuaMemberOwner, LuaSemanticDeclId, LuaType, SemanticDeclLevel, SemanticModel,
43
};
54
use emmylua_parser::{LuaAstNode, LuaCallExpr, LuaExpr};
65
use lsp_types::{Documentation, MarkupContent, MarkupKind, ParameterInformation, ParameterLabel};
76
use rowan::NodeOrToken;
87

9-
use crate::handlers::hover::{
10-
find_member_origin_owner, hover_std_description, infer_prefix_global_name, is_std,
11-
};
8+
use crate::handlers::hover::{find_member_origin_owner, infer_prefix_global_name};
129

1310
use super::build_signature_helper::{build_function_label, generate_param_label};
1411

@@ -110,40 +107,19 @@ impl<'a> SignatureHelperBuilder<'a> {
110107
name.push_str(ty.get_simple_name());
111108
}
112109
self.prefix_name = Some(name);
113-
114-
// i18n
115-
self.set_std_function_description(
116-
member.get_file_id(),
117-
ty.get_name(),
118-
member.get_key().get_name(),
119-
);
120110
}
121111
self.function_name = member.get_key().to_path().to_string();
122112
}
123113
LuaSemanticDeclId::LuaDecl(decl_id) => {
124114
let decl = db.get_decl_index().get_decl(decl_id)?;
125115
self.function_name = decl.get_name().to_string();
126-
self.set_std_function_description(decl.get_file_id(), decl.get_name(), None);
116+
// self.set_std_function_description(decl.get_file_id(), decl.get_name(), None);
127117
}
128118
_ => {}
129119
}
130120
Some(())
131121
}
132122

133-
fn set_std_function_description(
134-
&mut self,
135-
file_id: FileId,
136-
type_name: &str,
137-
member_name: Option<&str>,
138-
) {
139-
if is_std(self.semantic_model.get_db(), file_id) {
140-
let std_desc = hover_std_description(type_name, member_name);
141-
if !std_desc.is_empty() {
142-
self.set_description(std_desc);
143-
}
144-
}
145-
}
146-
147123
fn set_description(&mut self, description: String) {
148124
self.description = Some(Documentation::MarkupContent(MarkupContent {
149125
kind: MarkupKind::Markdown,

crates/emmylua_ls/src/meta_text/mod.rs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,6 @@ pub fn meta_keyword(key: &str) -> String {
22
t!(format!("keywords.{}", key)).to_string()
33
}
44

5-
#[allow(unused)]
6-
pub fn meta_builtin_std(key: &str) -> String {
7-
t!(format!("builtin_std.{}", key)).to_string()
8-
}
9-
10-
pub fn meta_std(type_name: &str, member_name: Option<&str>) -> String {
11-
let key = if let Some(member_name) = member_name {
12-
format!("std.{}.{}", type_name, member_name)
13-
} else {
14-
format!("std.{}", type_name)
15-
};
16-
let s = t!(key).to_string();
17-
if s == key {
18-
// 临时处理, 因为我们还未完成所有翻译
19-
"".to_string()
20-
} else {
21-
s
22-
}
23-
}
24-
255
pub fn meta_doc_tag(key: &str) -> String {
266
t!(format!("tags.{}", key)).to_string()
277
}

0 commit comments

Comments
 (0)