Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(lsp): align ScriptElementKind to current versions of TypeScript/vscode #12663

Merged
merged 2 commits into from
Nov 9, 2021
Merged

chore(lsp): align ScriptElementKind to current versions of TypeScript/vscode #12663

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc787bb
chore(lsp): align ScriptElementKind to current versions of TypeScript…
kitsonk Nov 7, 2021
d6520ac
fix fixture
kitsonk Nov 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Next Next commit
chore(lsp): align ScriptElementKind to current versions of TypeScript… 
…/vscode
  • Loading branch information
@kitsonk
kitsonk committed Nov 7, 2021
commit cc787bb3a7c9ba321a1124ac7abf30d2cfe70755
51 changes: 31 additions & 20 deletions cli/lsp/tsc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,12 @@ pub enum ScriptElementKind {
JsxAttribute,
#[serde(rename = "string")]
String,
#[serde(rename = "link")]
Link,
#[serde(rename = "link name")]
LinkName,
#[serde(rename = "link test")]
LinkText,
}

impl Default for ScriptElementKind {
Expand All @@ -418,6 +424,7 @@ impl Default for ScriptElementKind {
}
}

/// This mirrors the method `convertKind` in `completions.ts` in vscode
impl From<ScriptElementKind> for lsp::CompletionItemKind {
fn from(kind: ScriptElementKind) -> Self {
match kind {
Expand Down Expand Up @@ -468,29 +475,33 @@ impl From<ScriptElementKind> for lsp::CompletionItemKind {
}
}

/// This mirrors `fromProtocolScriptElementKind` in vscode
impl From<ScriptElementKind> for lsp::SymbolKind {
fn from(kind: ScriptElementKind) -> Self {
match kind {
ScriptElementKind::ModuleElement => lsp::SymbolKind::Module,
ScriptElementKind::ClassElement => lsp::SymbolKind::Class,
ScriptElementKind::EnumElement => lsp::SymbolKind::Enum,
ScriptElementKind::InterfaceElement => lsp::SymbolKind::Interface,
ScriptElementKind::MemberFunctionElement => lsp::SymbolKind::Method,
ScriptElementKind::MemberVariableElement => lsp::SymbolKind::Property,
ScriptElementKind::MemberGetAccessorElement => lsp::SymbolKind::Property,
ScriptElementKind::MemberSetAccessorElement => lsp::SymbolKind::Property,
ScriptElementKind::VariableElement => lsp::SymbolKind::Variable,
ScriptElementKind::ConstElement => lsp::SymbolKind::Variable,
ScriptElementKind::LocalVariableElement => lsp::SymbolKind::Variable,
ScriptElementKind::FunctionElement => lsp::SymbolKind::Function,
ScriptElementKind::LocalFunctionElement => lsp::SymbolKind::Function,
ScriptElementKind::ConstructSignatureElement => {
lsp::SymbolKind::Constructor
}
ScriptElementKind::ConstructorImplementationElement => {
lsp::SymbolKind::Constructor
}
_ => lsp::SymbolKind::Variable,
ScriptElementKind::ModuleElement => Self::Module,
ScriptElementKind::ClassElement => Self::Class,
ScriptElementKind::EnumElement => Self::Enum,
ScriptElementKind::EnumMemberElement => Self::EnumMember,
ScriptElementKind::InterfaceElement => Self::Interface,
ScriptElementKind::IndexSignatureElement => Self::Method,
ScriptElementKind::CallSignatureElement => Self::Method,
ScriptElementKind::MemberFunctionElement => Self::Method,
ScriptElementKind::MemberVariableElement => Self::Property,
ScriptElementKind::MemberGetAccessorElement => Self::Property,
ScriptElementKind::MemberSetAccessorElement => Self::Property,
ScriptElementKind::VariableElement => Self::Variable,
ScriptElementKind::LetElement => Self::Variable,
ScriptElementKind::ConstElement => Self::Variable,
ScriptElementKind::LocalVariableElement => Self::Variable,
ScriptElementKind::Alias => Self::Variable,
ScriptElementKind::FunctionElement => Self::Function,
ScriptElementKind::LocalFunctionElement => Self::Function,
ScriptElementKind::ConstructSignatureElement => Self::Constructor,
ScriptElementKind::ConstructorImplementationElement => Self::Constructor,
ScriptElementKind::TypeParameterElement => Self::TypeParameter,
ScriptElementKind::String => Self::String,
_ => Self::Variable,
}
}
}
Expand Down