Skip to content

Use canonical paths for CLI commands #260

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.

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

Merged
merged 2 commits into from
May 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion tree-sitter-stack-graphs/src/cli/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,13 @@ impl IndexArgs {
let mut indexer = Indexer::new(&mut db, &mut loader, &logger);
indexer.force = self.force;
indexer.max_file_time = self.max_file_time;
indexer.index_all(self.source_paths, self.continue_from, &NoCancellation)?;

let source_paths = self
.source_paths
.into_iter()
.map(|p| p.canonicalize())
.collect::<std::result::Result<Vec<_>, _>>()?;
indexer.index_all(source_paths, self.continue_from, &NoCancellation)?;
Ok(())
}
}
Expand Down
8 changes: 4 additions & 4 deletions tree-sitter-stack-graphs/src/cli/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ impl Definition {
pub fn run(self, querier: &mut Querier) -> anyhow::Result<()> {
let cancellation_flag = NoCancellation;
let mut file_reader = FileReader::new();
for reference in self.references {
for mut reference in self.references {
reference.canonicalize()?;

let results = querier.definitions(reference.clone(), &cancellation_flag)?;
let numbered = results.len() > 1;
let indent = if numbered { 6 } else { 0 };
Expand Down Expand Up @@ -144,11 +146,9 @@ impl<'a> Querier<'a> {

pub fn definitions(
&mut self,
mut reference: SourcePosition,
reference: SourcePosition,
cancellation_flag: &dyn CancellationFlag,
) -> Result<Vec<QueryResult>> {
reference.canonicalize()?;

let log_path = PathBuf::from(reference.to_string());
let mut logger = self.logger.file(&log_path);

Expand Down
1 change: 1 addition & 0 deletions tree-sitter-stack-graphs/src/cli/status.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ impl StatusArgs {
self.status(&mut entries)?;
} else {
for source_path in &self.source_paths {
let source_path = source_path.canonicalize()?;
let mut files = db.list_file_or_directory(&source_path)?;
let mut entries = files.try_iter()?;
self.status(&mut entries)?;
Expand Down