rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

master 2Branches 0Tags

Clone

HTTPS

SSH

Open with VS Code

Diffstat

-rw-r--r--

crates/ide/src/lib.rs

-rw-r--r--

crates/ide/src/static_index.rs

-rw-r--r--

crates/rust-analyzer/src/cli/flags.rs

-rw-r--r--

crates/rust-analyzer/src/cli/lsif.rs

-rw-r--r--

crates/rust-analyzer/src/cli/scip.rs

5 files changed, 95 insertions, 19 deletions

diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index eff4bc3d37..ba0aaae19c 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs

@@ -104,7 +104,9 @@ pub use crate::{

rename::RenameError,

runnables::{Runnable, RunnableKind, TestId},

signature_help::SignatureHelp,

- static_index::{StaticIndex, StaticIndexedFile, TokenId, TokenStaticData},

+ static_index::{

+ StaticIndex, StaticIndexedFile, TokenId, TokenStaticData, VendoredLibrariesConfig,

+ },

syntax_highlighting::{

tags::{Highlight, HlMod, HlMods, HlOperator, HlPunct, HlTag},

HighlightConfig, HlRange,

diff --git a/crates/ide/src/static_index.rs b/crates/ide/src/static_index.rs
index eaccee08e8..d3c0cac820 100644
--- a/crates/ide/src/static_index.rs
+++ b/crates/ide/src/static_index.rs

@@ -119,6 +119,11 @@ fn documentation_for_definition(

def.docs(sema.db, famous_defs.as_ref())

}

+pub enum VendoredLibrariesConfig<'a> {

+ Included { workspace_root: &'a VfsPath },

+ Excluded,

impl StaticIndex<'_> {

fn add_file(&mut self, file_id: FileId) {

let current_crate = crates_for(self.db, file_id).pop().map(Into::into);

@@ -230,15 +235,22 @@ impl StaticIndex<'_> {

self.files.push(result);

}

- pub fn compute<'a>(analysis: &'a Analysis, workspace_root: &VfsPath) -> StaticIndex<'a> {

+ pub fn compute<'a>(

+ analysis: &'a Analysis,

+ vendored_libs_config: VendoredLibrariesConfig<'_>,

+ ) -> StaticIndex<'a> {

let db = &*analysis.db;

let work = all_modules(db).into_iter().filter(|module| {

let file_id = module.definition_source_file_id(db).original_file(db);

let source_root = db.file_source_root(file_id.into());

let source_root = db.source_root(source_root);

- let is_vendored = source_root

- .path_for_file(&file_id.into())

- .is_some_and(|module_path| module_path.starts_with(workspace_root));

+ let is_vendored = match vendored_libs_config {

+ VendoredLibrariesConfig::Included { workspace_root } => source_root

+ .path_for_file(&file_id.into())

+ .is_some_and(|module_path| module_path.starts_with(workspace_root)),

+ VendoredLibrariesConfig::Excluded => false,

+ };

!source_root.is_library || is_vendored

});

let mut this = StaticIndex {

@@ -268,10 +280,11 @@ mod tests {

use ide_db::{base_db::VfsPath, FileRange, FxHashSet};

use syntax::TextSize;

- fn check_all_ranges(ra_fixture: &str) {

+ use super::VendoredLibrariesConfig;

+ fn check_all_ranges(ra_fixture: &str, vendored_libs_config: VendoredLibrariesConfig<'_>) {

let (analysis, ranges) = fixture::annotations_without_marker(ra_fixture);

- let s =

- StaticIndex::compute(&analysis, &VfsPath::new_virtual_path("/workspace".to_owned()));

+ let s = StaticIndex::compute(&analysis, vendored_libs_config);

let mut range_set: FxHashSet<_> = ranges.iter().map(|it| it.0).collect();

for f in s.files {

for (range, _) in f.tokens {

@@ -288,10 +301,9 @@ mod tests {

}

#[track_caller]

- fn check_definitions(ra_fixture: &str) {

+ fn check_definitions(ra_fixture: &str, vendored_libs_config: VendoredLibrariesConfig<'_>) {

let (analysis, ranges) = fixture::annotations_without_marker(ra_fixture);

- let s =

- StaticIndex::compute(&analysis, &VfsPath::new_virtual_path("/workspace".to_owned()));

+ let s = StaticIndex::compute(&analysis, vendored_libs_config);

let mut range_set: FxHashSet<_> = ranges.iter().map(|it| it.0).collect();

for (_, t) in s.tokens.iter() {

if let Some(t) = t.definition {

@@ -319,6 +331,9 @@ struct Foo;

enum E { X(Foo) }

//^ ^ ^^^

"#,

+ VendoredLibrariesConfig::Included {

+ workspace_root: &VfsPath::new_virtual_path("/workspace".to_owned()),

+ },

);

check_definitions(

r#"

@@ -327,6 +342,9 @@ struct Foo;

enum E { X(Foo) }

//^ ^

"#,

+ VendoredLibrariesConfig::Included {

+ workspace_root: &VfsPath::new_virtual_path("/workspace".to_owned()),

+ },

);

}

@@ -349,6 +367,9 @@ pub func() {

}

"#,

+ VendoredLibrariesConfig::Included {

+ workspace_root: &VfsPath::new_virtual_path("/workspace".to_owned()),

+ },

);

}

@@ -367,10 +388,31 @@ struct ExternalLibrary(i32);

struct VendoredLibrary(i32);

//^^^^^^^^^^^^^^^ ^^^

"#,

+ VendoredLibrariesConfig::Included {

+ workspace_root: &VfsPath::new_virtual_path("/workspace".to_owned()),

+ },

);

}

#[test]

+ fn vendored_crate_excluded() {

+ check_all_ranges(

+ r#"

+//- /workspace/main.rs crate:main deps:external,vendored

+struct Main(i32);

+ //^^^^ ^^^

+//- /external/lib.rs new_source_root:library crate:[email protected],https://a.b/foo.git library

+struct ExternalLibrary(i32);

+//- /workspace/vendored/lib.rs new_source_root:library crate:[email protected],https://a.b/bar.git library

+struct VendoredLibrary(i32);

+"#,

+ VendoredLibrariesConfig::Excluded,

+ )

+ }

+ #[test]

fn derives() {

check_all_ranges(

r#"

@@ -384,6 +426,9 @@ pub macro Copy {}

struct Hello(i32);

//^^^^^ ^^^

"#,

+ VendoredLibrariesConfig::Included {

+ workspace_root: &VfsPath::new_virtual_path("/workspace".to_owned()),

+ },

);

}

diff --git a/crates/rust-analyzer/src/cli/flags.rs b/crates/rust-analyzer/src/cli/flags.rs
index 2a3e74c680..16d90de661 100644
--- a/crates/rust-analyzer/src/cli/flags.rs
+++ b/crates/rust-analyzer/src/cli/flags.rs

@@ -138,6 +138,9 @@ xflags::xflags! {

cmd lsif {

required path: PathBuf

+ /// Exclude code from vendored libraries from the resulting index.

+ optional --exclude-vendored-libraries

}

cmd scip {

@@ -148,6 +151,9 @@ xflags::xflags! {

/// A path to an json configuration file that can be used to customize cargo behavior.

optional --config-path config_path: PathBuf

+ /// Exclude code from vendored libraries from the resulting index.

+ optional --exclude-vendored-libraries

}

@@ -259,6 +265,8 @@ pub struct Search {

#[derive(Debug)]

pub struct Lsif {

pub path: PathBuf,

+ pub exclude_vendored_libraries: bool,

}

#[derive(Debug)]

@@ -267,6 +275,7 @@ pub struct Scip {

pub output: Option<PathBuf>,

pub config_path: Option<PathBuf>,

+ pub exclude_vendored_libraries: bool,

}

impl RustAnalyzer {

diff --git a/crates/rust-analyzer/src/cli/lsif.rs b/crates/rust-analyzer/src/cli/lsif.rs
index 016f0edc2d..89fe712ced 100644
--- a/crates/rust-analyzer/src/cli/lsif.rs
+++ b/crates/rust-analyzer/src/cli/lsif.rs

@@ -5,7 +5,7 @@ use std::time::Instant;

use ide::{

Analysis, AnalysisHost, FileId, FileRange, MonikerKind, PackageInformation, RootDatabase,

- StaticIndex, StaticIndexedFile, TokenId, TokenStaticData,

+ StaticIndex, StaticIndexedFile, TokenId, TokenStaticData, VendoredLibrariesConfig,

};

use ide_db::{line_index::WideEncoding, LineIndexDatabase};

use load_cargo::{load_workspace, LoadCargoConfig, ProcMacroServerChoice};

@@ -296,7 +296,13 @@ impl flags::Lsif {

let db = host.raw_database();

let analysis = host.analysis();

- let si = StaticIndex::compute(&analysis, &path.clone().into());

+ let vendored_libs_config = if self.exclude_vendored_libraries {

+ VendoredLibrariesConfig::Excluded

+ } else {

+ VendoredLibrariesConfig::Included { workspace_root: &path.clone().into() }

+ };

+ let si = StaticIndex::compute(&analysis, vendored_libs_config);

let mut lsif = LsifManager::new(&analysis, db, &vfs);

lsif.add_vertex(lsif::Vertex::MetaData(lsif::MetaData {

diff --git a/crates/rust-analyzer/src/cli/scip.rs b/crates/rust-analyzer/src/cli/scip.rs
index 2fc0ef8d4d..34b20851dd 100644
--- a/crates/rust-analyzer/src/cli/scip.rs
+++ b/crates/rust-analyzer/src/cli/scip.rs

@@ -4,7 +4,7 @@ use std::{path::PathBuf, time::Instant};

use ide::{

AnalysisHost, LineCol, MonikerDescriptorKind, MonikerResult, StaticIndex, StaticIndexedFile,

- SymbolInformationKind, TextRange, TokenId,

+ SymbolInformationKind, TextRange, TokenId, VendoredLibrariesConfig,

};

use ide_db::LineIndexDatabase;

use load_cargo::{load_workspace_at, LoadCargoConfig, ProcMacroServerChoice};

@@ -63,7 +63,13 @@ impl flags::Scip {

let db = host.raw_database();

let analysis = host.analysis();

- let si = StaticIndex::compute(&analysis, &root.clone().into());

+ let vendored_libs_config = if self.exclude_vendored_libraries {

+ VendoredLibrariesConfig::Excluded

+ } else {

+ VendoredLibrariesConfig::Included { workspace_root: &root.clone().into() }

+ };

+ let si = StaticIndex::compute(&analysis, vendored_libs_config);

let metadata = scip_types::Metadata {

version: scip_types::ProtocolVersion::UnspecifiedProtocolVersion.into(),

@@ -352,8 +358,12 @@ mod test {

let (host, position) = position(ra_fixture);

let analysis = host.analysis();

- let si =

- StaticIndex::compute(&analysis, &VfsPath::new_virtual_path("/workspace".to_owned()));

+ let si = StaticIndex::compute(

+ &analysis,

+ VendoredLibrariesConfig::Included {

+ workspace_root: &VfsPath::new_virtual_path("/workspace".to_owned()),

+ },

+ );

let FilePosition { file_id, offset } = position;

@@ -617,8 +627,12 @@ pub mod example_mod {

host.raw_database_mut().apply_change(change_fixture.change);

let analysis = host.analysis();

- let si =

- StaticIndex::compute(&analysis, &VfsPath::new_virtual_path("/workspace".to_owned()));

+ let si = StaticIndex::compute(

+ &analysis,

+ VendoredLibrariesConfig::Included {

+ workspace_root: &VfsPath::new_virtual_path("/workspace".to_owned()),

+ },

+ );

let file = si.files.first().unwrap();

let (_, token_id) = file.tokens.first().unwrap();