mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-10-28 18:43:01 +00:00
Only include SCIP SymbolInformation for first inherent impl
This commit is contained in:
parent
3a93fe1150
commit
34dc94bb2d
2 changed files with 52 additions and 33 deletions
|
|
@ -249,29 +249,20 @@ pub(crate) fn def_to_kind(db: &RootDatabase, def: Definition) -> SymbolInformati
|
||||||
|
|
||||||
/// Computes a `MonikerResult` for a definition. Result cases:
|
/// Computes a `MonikerResult` for a definition. Result cases:
|
||||||
///
|
///
|
||||||
/// `Some(MonikerResult::Moniker(_))` provides a unique `Moniker` which refers to a definition.
|
/// * `Some(MonikerResult::Moniker(_))` provides a unique `Moniker` which refers to a definition.
|
||||||
///
|
///
|
||||||
/// `Some(MonikerResult::Local { .. })` provides a `Moniker` for the definition enclosing a local.
|
/// * `Some(MonikerResult::Local { .. })` provides a `Moniker` for the definition enclosing a local.
|
||||||
///
|
///
|
||||||
/// `None` is returned in the following cases:
|
/// * `None` is returned for definitions which are not in a module: `BuiltinAttr`, `BuiltinType`,
|
||||||
///
|
/// `BuiltinLifetime`, `TupleField`, `ToolModule`, and `InlineAsmRegOrRegClass`. TODO: it might be
|
||||||
/// * Inherent impl definitions, as they cannot be uniquely identified (multiple are allowed for the
|
/// sensible to provide monikers that refer to some non-existent crate of compiler builtin
|
||||||
/// same type).
|
/// definitions.
|
||||||
///
|
|
||||||
/// * Definitions which are not in a module: `BuiltinAttr`, `BuiltinType`, `BuiltinLifetime`,
|
|
||||||
/// `TupleField`, `ToolModule`, and `InlineAsmRegOrRegClass`. TODO: it might be sensible to
|
|
||||||
/// provide monikers that refer to some non-existent crate of compiler builtin definitions.
|
|
||||||
pub(crate) fn def_to_moniker(
|
pub(crate) fn def_to_moniker(
|
||||||
db: &RootDatabase,
|
db: &RootDatabase,
|
||||||
definition: Definition,
|
definition: Definition,
|
||||||
from_crate: Crate,
|
from_crate: Crate,
|
||||||
) -> Option<MonikerResult> {
|
) -> Option<MonikerResult> {
|
||||||
match definition {
|
match definition {
|
||||||
// Not possible to give sensible unique symbols for inherent impls, as multiple can be
|
|
||||||
// defined for the same type.
|
|
||||||
Definition::SelfType(impl_) if impl_.trait_(db).is_none() => {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
Definition::Local(_) | Definition::Label(_) | Definition::GenericParam(_) => {
|
Definition::Local(_) | Definition::Label(_) | Definition::GenericParam(_) => {
|
||||||
return Some(MonikerResult::Local {
|
return Some(MonikerResult::Local {
|
||||||
enclosing_moniker: enclosing_def_to_moniker(db, definition, from_crate),
|
enclosing_moniker: enclosing_def_to_moniker(db, definition, from_crate),
|
||||||
|
|
@ -352,9 +343,7 @@ fn def_to_non_local_moniker(
|
||||||
match def {
|
match def {
|
||||||
Definition::Module(module) if module.is_crate_root() => {}
|
Definition::Module(module) if module.is_crate_root() => {}
|
||||||
_ => {
|
_ => {
|
||||||
tracing::error!(
|
tracing::error!(?def, "Encountered enclosing definition with no name");
|
||||||
?def, "Encountered enclosing definition with no name"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -102,12 +102,26 @@ impl flags::Scip {
|
||||||
// This is called after definitions have been deduplicated by token_ids_emitted. The purpose
|
// This is called after definitions have been deduplicated by token_ids_emitted. The purpose
|
||||||
// is to detect reuse of symbol names because this causes ambiguity about their meaning.
|
// is to detect reuse of symbol names because this causes ambiguity about their meaning.
|
||||||
let mut record_error_if_symbol_already_used =
|
let mut record_error_if_symbol_already_used =
|
||||||
|symbol: String, relative_path: &str, line_index: &LineIndex, text_range: TextRange| {
|
|symbol: String,
|
||||||
|
is_inherent_impl: bool,
|
||||||
|
relative_path: &str,
|
||||||
|
line_index: &LineIndex,
|
||||||
|
text_range: TextRange| {
|
||||||
let is_local = symbol.starts_with("local ");
|
let is_local = symbol.starts_with("local ");
|
||||||
if !is_local && !nonlocal_symbols_emitted.insert(symbol.clone()) {
|
if !is_local && !nonlocal_symbols_emitted.insert(symbol.clone()) {
|
||||||
let source_location =
|
// See #18772. Duplicate SymbolInformation for inherent impls is omitted.
|
||||||
text_range_to_string(relative_path, line_index, text_range);
|
if is_inherent_impl {
|
||||||
duplicate_symbol_errors.push((source_location, symbol));
|
false
|
||||||
|
} else {
|
||||||
|
let source_location =
|
||||||
|
text_range_to_string(relative_path, line_index, text_range);
|
||||||
|
duplicate_symbol_errors.push((source_location, symbol));
|
||||||
|
// Keep duplicate SymbolInformation. This behavior is preferred over
|
||||||
|
// omitting so that the issue might be visible within downstream tools.
|
||||||
|
true
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
true
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -126,13 +140,13 @@ impl flags::Scip {
|
||||||
tokens.into_iter().for_each(|(text_range, id)| {
|
tokens.into_iter().for_each(|(text_range, id)| {
|
||||||
let token = si.tokens.get(id).unwrap();
|
let token = si.tokens.get(id).unwrap();
|
||||||
|
|
||||||
let (symbol, enclosing_symbol) =
|
let (symbol, enclosing_symbol, is_inherent_impl) =
|
||||||
if let Some(TokenSymbols { symbol, enclosing_symbol }) =
|
if let Some(TokenSymbols { symbol, enclosing_symbol, is_inherent_impl }) =
|
||||||
symbol_generator.token_symbols(id, token)
|
symbol_generator.token_symbols(id, token)
|
||||||
{
|
{
|
||||||
(symbol, enclosing_symbol)
|
(symbol, enclosing_symbol, is_inherent_impl)
|
||||||
} else {
|
} else {
|
||||||
("".to_owned(), None)
|
("".to_owned(), None, false)
|
||||||
};
|
};
|
||||||
|
|
||||||
if !symbol.is_empty() {
|
if !symbol.is_empty() {
|
||||||
|
|
@ -144,17 +158,20 @@ impl flags::Scip {
|
||||||
if token_ids_emitted.insert(id) {
|
if token_ids_emitted.insert(id) {
|
||||||
// token_ids_emitted does deduplication. This checks that this results
|
// token_ids_emitted does deduplication. This checks that this results
|
||||||
// in unique emitted symbols, as otherwise references are ambiguous.
|
// in unique emitted symbols, as otherwise references are ambiguous.
|
||||||
record_error_if_symbol_already_used(
|
let should_emit = record_error_if_symbol_already_used(
|
||||||
symbol.clone(),
|
symbol.clone(),
|
||||||
|
is_inherent_impl,
|
||||||
relative_path.as_str(),
|
relative_path.as_str(),
|
||||||
&line_index,
|
&line_index,
|
||||||
text_range,
|
text_range,
|
||||||
);
|
);
|
||||||
symbols.push(compute_symbol_info(
|
if should_emit {
|
||||||
symbol.clone(),
|
symbols.push(compute_symbol_info(
|
||||||
enclosing_symbol,
|
symbol.clone(),
|
||||||
token,
|
enclosing_symbol,
|
||||||
));
|
token,
|
||||||
|
));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
token_ids_referenced.insert(id);
|
token_ids_referenced.insert(id);
|
||||||
|
|
@ -227,12 +244,13 @@ impl flags::Scip {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
let TokenSymbols { symbol, enclosing_symbol } = symbol_generator
|
let TokenSymbols { symbol, enclosing_symbol, .. } = symbol_generator
|
||||||
.token_symbols(id, token)
|
.token_symbols(id, token)
|
||||||
.expect("To have been referenced, the symbol must be in the cache.");
|
.expect("To have been referenced, the symbol must be in the cache.");
|
||||||
|
|
||||||
record_error_if_symbol_already_used(
|
record_error_if_symbol_already_used(
|
||||||
symbol.clone(),
|
symbol.clone(),
|
||||||
|
false,
|
||||||
relative_path.as_str(),
|
relative_path.as_str(),
|
||||||
&line_index,
|
&line_index,
|
||||||
text_range,
|
text_range,
|
||||||
|
|
@ -395,6 +413,9 @@ struct TokenSymbols {
|
||||||
symbol: String,
|
symbol: String,
|
||||||
/// Definition that contains this one. Only set when `symbol` is local.
|
/// Definition that contains this one. Only set when `symbol` is local.
|
||||||
enclosing_symbol: Option<String>,
|
enclosing_symbol: Option<String>,
|
||||||
|
/// True if this symbol is for an inherent impl. This is used to only emit `SymbolInformation`
|
||||||
|
/// for a struct's first inherent impl, since their symbol names are not disambiguated.
|
||||||
|
is_inherent_impl: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
struct SymbolGenerator {
|
struct SymbolGenerator {
|
||||||
|
|
@ -421,6 +442,14 @@ impl SymbolGenerator {
|
||||||
MonikerResult::Moniker(moniker) => TokenSymbols {
|
MonikerResult::Moniker(moniker) => TokenSymbols {
|
||||||
symbol: scip::symbol::format_symbol(moniker_to_symbol(moniker)),
|
symbol: scip::symbol::format_symbol(moniker_to_symbol(moniker)),
|
||||||
enclosing_symbol: None,
|
enclosing_symbol: None,
|
||||||
|
is_inherent_impl: moniker
|
||||||
|
.identifier
|
||||||
|
.description
|
||||||
|
.get(moniker.identifier.description.len() - 2)
|
||||||
|
.map_or(false, |descriptor| {
|
||||||
|
descriptor.desc == MonikerDescriptorKind::Type
|
||||||
|
&& descriptor.name == "impl"
|
||||||
|
}),
|
||||||
},
|
},
|
||||||
MonikerResult::Local { enclosing_moniker } => {
|
MonikerResult::Local { enclosing_moniker } => {
|
||||||
let local_symbol = scip::types::Symbol::new_local(local_count);
|
let local_symbol = scip::types::Symbol::new_local(local_count);
|
||||||
|
|
@ -431,6 +460,7 @@ impl SymbolGenerator {
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.map(moniker_to_symbol)
|
.map(moniker_to_symbol)
|
||||||
.map(scip::symbol::format_symbol),
|
.map(scip::symbol::format_symbol),
|
||||||
|
is_inherent_impl: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue