Skip to content

Commit

Permalink
Use real file path when available in ruff server
Browse files Browse the repository at this point in the history
  • Loading branch information
charliermarsh committed Jun 8, 2024
1 parent 32ca704 commit 53c7439
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion crates/ruff_server/src/fix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ pub(crate) fn fix_all(
result: LinterResult { error, .. },
..
} = ruff_linter::linter::lint_fix(
query.virtual_file_path(),
&query.virtual_file_path(),
package,
flags::Noqa::Enabled,
UnsafeFixes::Disabled,
Expand Down
4 changes: 2 additions & 2 deletions crates/ruff_server/src/lint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ pub(crate) fn check(query: &DocumentQuery, encoding: PositionEncoding) -> Diagno

// Generate checks.
let LinterResult { data, .. } = check_path(
query.virtual_file_path(),
&query.virtual_file_path(),
package,
&locator,
&stylist,
Expand All @@ -127,7 +127,7 @@ pub(crate) fn check(query: &DocumentQuery, encoding: PositionEncoding) -> Diagno
);

let noqa_edits = generate_noqa_edits(
query.virtual_file_path(),
&query.virtual_file_path(),
data.as_slice(),
&locator,
parsed.comment_ranges(),
Expand Down
5 changes: 3 additions & 2 deletions crates/ruff_server/src/session/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -544,8 +544,9 @@ impl DocumentQuery {
/// Get the path for the document selected by this query, ignoring whether the file exists on disk.
///
/// Returns the URL's path if this is an unsaved (untitled) document.
pub(crate) fn virtual_file_path(&self) -> &Path {
Path::new(self.file_url().path())
pub(crate) fn virtual_file_path(&self) -> PathBuf {
self.file_path()
.unwrap_or_else(|| Path::new(self.file_url().path()).to_path_buf())
}

/// Attempt to access the single inner text document selected by the query.
Expand Down

0 comments on commit 53c7439

Please sign in to comment.