rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Introduce StructureNodeKind

Browse Source
This commit is contained in:
ivan770
2021-03-14 17:16:29 +02:00
parent 8602f9573b
commit 7d48e04f31
7 changed files with 110 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/ide/src/annotations.rs
View File

@@ -1,7 +1,7 @@
use hir::Semantics; use hir::Semantics;
use ide_db::{ use ide_db::{
base_db::{FileId, FilePosition, FileRange, SourceDatabase}, base_db::{FileId, FilePosition, FileRange, SourceDatabase},
RootDatabase, SymbolKind, RootDatabase, StructureNodeKind, SymbolKind,
}; };
use syntax::TextRange; use syntax::TextRange;
@@ -80,15 +80,17 @@ pub(crate) fn annotations(
.filter(|node| { .filter(|node| {
matches!( matches!(
node.kind, node.kind,
SymbolKind::Trait StructureNodeKind::SymbolKind(SymbolKind::Trait)
| SymbolKind::Struct | StructureNodeKind::SymbolKind(SymbolKind::Struct)
| SymbolKind::Enum | StructureNodeKind::SymbolKind(SymbolKind::Enum)
| SymbolKind::Union | StructureNodeKind::SymbolKind(SymbolKind::Union)
| SymbolKind::Const | StructureNodeKind::SymbolKind(SymbolKind::Const)
) )
}) })
.for_each(|node| { .for_each(|node| {
if config.annotate_impls && node.kind != SymbolKind::Const { if config.annotate_impls
&& node.kind != StructureNodeKind::SymbolKind(SymbolKind::Const)
{
annotations.push(Annotation { annotations.push(Annotation {
range: node.node_range, range: node.node_range,
kind: AnnotationKind::HasImpls { kind: AnnotationKind::HasImpls {

126
crates/ide/src/file_structure.rs
View File

@@ -1,4 +1,4 @@
use ide_db::SymbolKind; use ide_db::{StructureNodeKind, SymbolKind};
use syntax::{ use syntax::{
ast::{self, AttrsOwner, GenericParamsOwner, NameOwner}, ast::{self, AttrsOwner, GenericParamsOwner, NameOwner},
match_ast, AstNode, AstToken, NodeOrToken, SourceFile, SyntaxNode, SyntaxToken, TextRange, match_ast, AstNode, AstToken, NodeOrToken, SourceFile, SyntaxNode, SyntaxToken, TextRange,
@@ -11,7 +11,7 @@ pub struct StructureNode {
pub label: String, pub label: String,
pub navigation_range: TextRange, pub navigation_range: TextRange,
pub node_range: TextRange, pub node_range: TextRange,
pub kind: SymbolKind, pub kind: StructureNodeKind,
pub detail: Option<String>, pub detail: Option<String>,
pub deprecated: bool, pub deprecated: bool,
} }
@@ -65,14 +65,14 @@ pub(crate) fn file_structure(file: &SourceFile) -> Vec<StructureNode> {
} }
fn structure_node(node: &SyntaxNode) -> Option<StructureNode> { fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
fn decl<N: NameOwner + AttrsOwner>(node: N, kind: SymbolKind) -> Option<StructureNode> { fn decl<N: NameOwner + AttrsOwner>(node: N, kind: StructureNodeKind) -> Option<StructureNode> {
decl_with_detail(&node, None, kind) decl_with_detail(&node, None, kind)
} }
fn decl_with_type_ref<N: NameOwner + AttrsOwner>( fn decl_with_type_ref<N: NameOwner + AttrsOwner>(
node: &N, node: &N,
type_ref: Option<ast::Type>, type_ref: Option<ast::Type>,
kind: SymbolKind, kind: StructureNodeKind,
) -> Option<StructureNode> { ) -> Option<StructureNode> {
let detail = type_ref.map(|type_ref| { let detail = type_ref.map(|type_ref| {
let mut detail = String::new(); let mut detail = String::new();
@@ -85,7 +85,7 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
fn decl_with_detail<N: NameOwner + AttrsOwner>( fn decl_with_detail<N: NameOwner + AttrsOwner>(
node: &N, node: &N,
detail: Option<String>, detail: Option<String>,
kind: SymbolKind, kind: StructureNodeKind,
) -> Option<StructureNode> { ) -> Option<StructureNode> {
let name = node.name()?; let name = node.name()?;
@@ -133,18 +133,18 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
collapse_ws(ret_type.syntax(), &mut detail); collapse_ws(ret_type.syntax(), &mut detail);
} }
decl_with_detail(&it, Some(detail), SymbolKind::Function) decl_with_detail(&it, Some(detail), StructureNodeKind::SymbolKind(SymbolKind::Function))
}, },
ast::Struct(it) => decl(it, SymbolKind::Struct), ast::Struct(it) => decl(it, StructureNodeKind::SymbolKind(SymbolKind::Struct)),
ast::Union(it) => decl(it, SymbolKind::Union), ast::Union(it) => decl(it, StructureNodeKind::SymbolKind(SymbolKind::Union)),
ast::Enum(it) => decl(it, SymbolKind::Enum), ast::Enum(it) => decl(it, StructureNodeKind::SymbolKind(SymbolKind::Enum)),
ast::Variant(it) => decl(it, SymbolKind::Variant), ast::Variant(it) => decl(it, StructureNodeKind::SymbolKind(SymbolKind::Variant)),
ast::Trait(it) => decl(it, SymbolKind::Trait), ast::Trait(it) => decl(it, StructureNodeKind::SymbolKind(SymbolKind::Trait)),
ast::Module(it) => decl(it, SymbolKind::Module), ast::Module(it) => decl(it, StructureNodeKind::SymbolKind(SymbolKind::Module)),
ast::TypeAlias(it) => decl_with_type_ref(&it, it.ty(), SymbolKind::TypeAlias), ast::TypeAlias(it) => decl_with_type_ref(&it, it.ty(), StructureNodeKind::SymbolKind(SymbolKind::TypeAlias)),
ast::RecordField(it) => decl_with_type_ref(&it, it.ty(), SymbolKind::Field), ast::RecordField(it) => decl_with_type_ref(&it, it.ty(), StructureNodeKind::SymbolKind(SymbolKind::Field)),
ast::Const(it) => decl_with_type_ref(&it, it.ty(), SymbolKind::Const), ast::Const(it) => decl_with_type_ref(&it, it.ty(), StructureNodeKind::SymbolKind(SymbolKind::Const)),
ast::Static(it) => decl_with_type_ref(&it, it.ty(), SymbolKind::Static), ast::Static(it) => decl_with_type_ref(&it, it.ty(), StructureNodeKind::SymbolKind(SymbolKind::Static)),
ast::Impl(it) => { ast::Impl(it) => {
let target_type = it.self_ty()?; let target_type = it.self_ty()?;
let target_trait = it.trait_(); let target_trait = it.trait_();
@@ -160,13 +160,13 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
label, label,
navigation_range: target_type.syntax().text_range(), navigation_range: target_type.syntax().text_range(),
node_range: it.syntax().text_range(), node_range: it.syntax().text_range(),
kind: SymbolKind::Impl, kind: StructureNodeKind::SymbolKind(SymbolKind::Impl),
detail: None, detail: None,
deprecated: false, deprecated: false,
}; };
Some(node) Some(node)
}, },
ast::MacroRules(it) => decl(it, SymbolKind::Macro), ast::MacroRules(it) => decl(it, StructureNodeKind::SymbolKind(SymbolKind::Macro)),
_ => None, _ => None,
} }
} }
@@ -182,7 +182,7 @@ fn structure_token(token: SyntaxToken) -> Option<StructureNode> {
label: region_name.to_string(), label: region_name.to_string(),
navigation_range: comment.syntax().text_range(), navigation_range: comment.syntax().text_range(),
node_range: comment.syntax().text_range(), node_range: comment.syntax().text_range(),
kind: SymbolKind::Region, kind: StructureNodeKind::Region,
detail: None, detail: None,
deprecated: false, deprecated: false,
}); });
@@ -268,7 +268,9 @@ fn g() {}
label: "Foo", label: "Foo",
navigation_range: 8..11, navigation_range: 8..11,
node_range: 1..26, node_range: 1..26,
kind: Struct, kind: SymbolKind(
Struct,
),
detail: None, detail: None,
deprecated: false, deprecated: false,
}, },
@@ -279,7 +281,9 @@ fn g() {}
label: "x", label: "x",
navigation_range: 18..19, navigation_range: 18..19,
node_range: 18..24, node_range: 18..24,
kind: Field, kind: SymbolKind(
Field,
),
detail: Some( detail: Some(
"i32", "i32",
), ),
@@ -290,7 +294,9 @@ fn g() {}
label: "m", label: "m",
navigation_range: 32..33, navigation_range: 32..33,
node_range: 28..158, node_range: 28..158,
kind: Module, kind: SymbolKind(
Module,
),
detail: None, detail: None,
deprecated: false, deprecated: false,
}, },
@@ -301,7 +307,9 @@ fn g() {}
label: "bar1", label: "bar1",
navigation_range: 43..47, navigation_range: 43..47,
node_range: 40..52, node_range: 40..52,
kind: Function, kind: SymbolKind(
Function,
),
detail: Some( detail: Some(
"fn()", "fn()",
), ),
@@ -314,7 +322,9 @@ fn g() {}
label: "bar2", label: "bar2",
navigation_range: 60..64, navigation_range: 60..64,
node_range: 57..81, node_range: 57..81,
kind: Function, kind: SymbolKind(
Function,
),
detail: Some( detail: Some(
"fn<T>(t: T) -> T", "fn<T>(t: T) -> T",
), ),
@@ -327,7 +337,9 @@ fn g() {}
label: "bar3", label: "bar3",
navigation_range: 89..93, navigation_range: 89..93,
node_range: 86..156, node_range: 86..156,
kind: Function, kind: SymbolKind(
Function,
),
detail: Some( detail: Some(
"fn<A, B>(a: A, b: B) -> Vec< u32 >", "fn<A, B>(a: A, b: B) -> Vec< u32 >",
), ),
@@ -338,7 +350,9 @@ fn g() {}
label: "E", label: "E",
navigation_range: 165..166, navigation_range: 165..166,
node_range: 160..180, node_range: 160..180,
kind: Enum, kind: SymbolKind(
Enum,
),
detail: None, detail: None,
deprecated: false, deprecated: false,
}, },
@@ -349,7 +363,9 @@ fn g() {}
label: "X", label: "X",
navigation_range: 169..170, navigation_range: 169..170,
node_range: 169..170, node_range: 169..170,
kind: Variant, kind: SymbolKind(
Variant,
),
detail: None, detail: None,
deprecated: false, deprecated: false,
}, },
@@ -360,7 +376,9 @@ fn g() {}
label: "Y", label: "Y",
navigation_range: 172..173, navigation_range: 172..173,
node_range: 172..178, node_range: 172..178,
kind: Variant, kind: SymbolKind(
Variant,
),
detail: None, detail: None,
deprecated: false, deprecated: false,
}, },
@@ -369,7 +387,9 @@ fn g() {}
label: "T", label: "T",
navigation_range: 186..187, navigation_range: 186..187,
node_range: 181..193, node_range: 181..193,
kind: TypeAlias, kind: SymbolKind(
TypeAlias,
),
detail: Some( detail: Some(
"()", "()",
), ),
@@ -380,7 +400,9 @@ fn g() {}
label: "S", label: "S",
navigation_range: 201..202, navigation_range: 201..202,
node_range: 194..213, node_range: 194..213,
kind: Static, kind: SymbolKind(
Static,
),
detail: Some( detail: Some(
"i32", "i32",
), ),
@@ -391,7 +413,9 @@ fn g() {}
label: "C", label: "C",
navigation_range: 220..221, navigation_range: 220..221,
node_range: 214..232, node_range: 214..232,
kind: Const, kind: SymbolKind(
Const,
),
detail: Some( detail: Some(
"i32", "i32",
), ),
@@ -402,7 +426,9 @@ fn g() {}
label: "impl E", label: "impl E",
navigation_range: 239..240, navigation_range: 239..240,
node_range: 234..243, node_range: 234..243,
kind: Impl, kind: SymbolKind(
Impl,
),
detail: None, detail: None,
deprecated: false, deprecated: false,
}, },
@@ -411,7 +437,9 @@ fn g() {}
label: "impl fmt::Debug for E", label: "impl fmt::Debug for E",
navigation_range: 265..266, navigation_range: 265..266,
node_range: 245..269, node_range: 245..269,
kind: Impl, kind: SymbolKind(
Impl,
),
detail: None, detail: None,
deprecated: false, deprecated: false,
}, },
@@ -420,7 +448,9 @@ fn g() {}
label: "mc", label: "mc",
navigation_range: 284..286, navigation_range: 284..286,
node_range: 271..303, node_range: 271..303,
kind: Macro, kind: SymbolKind(
Macro,
),
detail: None, detail: None,
deprecated: false, deprecated: false,
}, },
@@ -429,7 +459,9 @@ fn g() {}
label: "mcexp", label: "mcexp",
navigation_range: 334..339, navigation_range: 334..339,
node_range: 305..356, node_range: 305..356,
kind: Macro, kind: SymbolKind(
Macro,
),
detail: None, detail: None,
deprecated: false, deprecated: false,
}, },
@@ -438,7 +470,9 @@ fn g() {}
label: "mcexp", label: "mcexp",
navigation_range: 387..392, navigation_range: 387..392,
node_range: 358..409, node_range: 358..409,
kind: Macro, kind: SymbolKind(
Macro,
),
detail: None, detail: None,
deprecated: false, deprecated: false,
}, },
@@ -447,7 +481,9 @@ fn g() {}
label: "obsolete", label: "obsolete",
navigation_range: 428..436, navigation_range: 428..436,
node_range: 411..441, node_range: 411..441,
kind: Function, kind: SymbolKind(
Function,
),
detail: Some( detail: Some(
"fn()", "fn()",
), ),
@@ -458,7 +494,9 @@ fn g() {}
label: "very_obsolete", label: "very_obsolete",
navigation_range: 481..494, navigation_range: 481..494,
node_range: 443..499, node_range: 443..499,
kind: Function, kind: SymbolKind(
Function,
),
detail: Some( detail: Some(
"fn()", "fn()",
), ),
@@ -478,7 +516,9 @@ fn g() {}
label: "m", label: "m",
navigation_range: 568..569, navigation_range: 568..569,
node_range: 543..606, node_range: 543..606,
kind: Module, kind: SymbolKind(
Module,
),
detail: None, detail: None,
deprecated: false, deprecated: false,
}, },
@@ -500,7 +540,9 @@ fn g() {}
label: "f", label: "f",
navigation_range: 575..576, navigation_range: 575..576,
node_range: 572..581, node_range: 572..581,
kind: Function, kind: SymbolKind(
Function,
),
detail: Some( detail: Some(
"fn()", "fn()",
), ),
@@ -513,7 +555,9 @@ fn g() {}
label: "g", label: "g",
navigation_range: 598..599, navigation_range: 598..599,
node_range: 582..604, node_range: 582..604,
kind: Function, kind: SymbolKind(
Function,
),
detail: Some( detail: Some(
"fn()", "fn()",
), ),

1
crates/ide/src/syntax_highlighting/tags.rs
View File

@@ -107,7 +107,6 @@ impl HlTag {
SymbolKind::ValueParam => "value_param", SymbolKind::ValueParam => "value_param",
SymbolKind::SelfParam => "self_keyword", SymbolKind::SelfParam => "self_keyword",
SymbolKind::Impl => "self_type", SymbolKind::Impl => "self_type",
SymbolKind::Region => "region",
}, },
HlTag::Attribute => "attribute", HlTag::Attribute => "attribute",
HlTag::BoolLiteral => "bool_literal", HlTag::BoolLiteral => "bool_literal",

1
crates/ide_completion/src/item.rs
View File

@@ -225,7 +225,6 @@ impl CompletionItemKind {
SymbolKind::Local => "lc", SymbolKind::Local => "lc",
SymbolKind::Macro => "ma", SymbolKind::Macro => "ma",
SymbolKind::Module => "md", SymbolKind::Module => "md",
SymbolKind::Region => "rn",
SymbolKind::SelfParam => "sp", SymbolKind::SelfParam => "sp",
SymbolKind::Static => "sc", SymbolKind::Static => "sc",
SymbolKind::Struct => "st", SymbolKind::Struct => "st",

7
crates/ide_db/src/lib.rs
View File

@@ -135,6 +135,12 @@ fn line_index(db: &dyn LineIndexDatabase, file_id: FileId) -> Arc<LineIndex> {
Arc::new(LineIndex::new(&*text)) Arc::new(LineIndex::new(&*text))
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
pub enum StructureNodeKind {
SymbolKind(SymbolKind),
Region,
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
pub enum SymbolKind { pub enum SymbolKind {
Const, Const,
@@ -148,7 +154,6 @@ pub enum SymbolKind {
Local, Local,
Macro, Macro,
Module, Module,
Region,
SelfParam, SelfParam,
Static, Static,
Struct, Struct,

4
crates/rust-analyzer/src/handlers.rs
View File

@@ -11,7 +11,7 @@ use ide::{
AnnotationConfig, FileId, FilePosition, FileRange, HoverAction, HoverGotoTypeData, Query, AnnotationConfig, FileId, FilePosition, FileRange, HoverAction, HoverGotoTypeData, Query,
RangeInfo, Runnable, RunnableKind, SearchScope, SourceChange, TextEdit, RangeInfo, Runnable, RunnableKind, SearchScope, SourceChange, TextEdit,
}; };
use ide_db::SymbolKind; use ide_db::{StructureNodeKind, SymbolKind};
use itertools::Itertools; use itertools::Itertools;
use lsp_server::ErrorCode; use lsp_server::ErrorCode;
use lsp_types::{ use lsp_types::{
@@ -289,7 +289,7 @@ pub(crate) fn handle_document_symbol(
let doc_symbol = lsp_types::DocumentSymbol { let doc_symbol = lsp_types::DocumentSymbol {
name: symbol.label, name: symbol.label,
detail: symbol.detail, detail: symbol.detail,
kind: to_proto::symbol_kind(symbol.kind), kind: to_proto::structure_node_kind(symbol.kind),
tags: Some(tags), tags: Some(tags),
deprecated: Some(symbol.deprecated), deprecated: Some(symbol.deprecated),
range: to_proto::range(&line_index, symbol.node_range), range: to_proto::range(&line_index, symbol.node_range),

12
crates/rust-analyzer/src/to_proto.rs
View File

@@ -11,7 +11,7 @@ use ide::{
Markup, NavigationTarget, ReferenceAccess, RenameError, Runnable, Severity, SourceChange, Markup, NavigationTarget, ReferenceAccess, RenameError, Runnable, Severity, SourceChange,
TextEdit, TextRange, TextSize, TextEdit, TextRange, TextSize,
}; };
use ide_db::SymbolKind; use ide_db::{StructureNodeKind, SymbolKind};
use itertools::Itertools; use itertools::Itertools;
use serde_json::to_value; use serde_json::to_value;
@@ -60,7 +60,13 @@ pub(crate) fn symbol_kind(symbol_kind: SymbolKind) -> lsp_types::SymbolKind {
| SymbolKind::ValueParam | SymbolKind::ValueParam
| SymbolKind::Label => lsp_types::SymbolKind::Variable, | SymbolKind::Label => lsp_types::SymbolKind::Variable,
SymbolKind::Union => lsp_types::SymbolKind::Struct, SymbolKind::Union => lsp_types::SymbolKind::Struct,
SymbolKind::Region => lsp_types::SymbolKind::Namespace, }
}
pub(crate) fn structure_node_kind(kind: StructureNodeKind) -> lsp_types::SymbolKind {
match kind {
StructureNodeKind::SymbolKind(symbol) => symbol_kind(symbol),
StructureNodeKind::Region => lsp_types::SymbolKind::Namespace,
} }
} }
@@ -118,7 +124,6 @@ pub(crate) fn completion_item_kind(
SymbolKind::Local => lsp_types::CompletionItemKind::Variable, SymbolKind::Local => lsp_types::CompletionItemKind::Variable,
SymbolKind::Macro => lsp_types::CompletionItemKind::Method, SymbolKind::Macro => lsp_types::CompletionItemKind::Method,
SymbolKind::Module => lsp_types::CompletionItemKind::Module, SymbolKind::Module => lsp_types::CompletionItemKind::Module,
SymbolKind::Region => lsp_types::CompletionItemKind::Keyword,
SymbolKind::SelfParam => lsp_types::CompletionItemKind::Value, SymbolKind::SelfParam => lsp_types::CompletionItemKind::Value,
SymbolKind::Static => lsp_types::CompletionItemKind::Value, SymbolKind::Static => lsp_types::CompletionItemKind::Value,
SymbolKind::Struct => lsp_types::CompletionItemKind::Struct, SymbolKind::Struct => lsp_types::CompletionItemKind::Struct,
@@ -430,7 +435,6 @@ fn semantic_token_type_and_modifiers(
SymbolKind::TypeAlias => semantic_tokens::TYPE_ALIAS, SymbolKind::TypeAlias => semantic_tokens::TYPE_ALIAS,
SymbolKind::Trait => lsp_types::SemanticTokenType::INTERFACE, SymbolKind::Trait => lsp_types::SemanticTokenType::INTERFACE,
SymbolKind::Macro => lsp_types::SemanticTokenType::MACRO, SymbolKind::Macro => lsp_types::SemanticTokenType::MACRO,
SymbolKind::Region => lsp_types::SemanticTokenType::NAMESPACE,
}, },
HlTag::BuiltinType => semantic_tokens::BUILTIN_TYPE, HlTag::BuiltinType => semantic_tokens::BUILTIN_TYPE,
HlTag::None => semantic_tokens::GENERIC, HlTag::None => semantic_tokens::GENERIC,