Consider virtual path for various server actions

crates/ruff_server/src/fix.rs

@@ -28,21 +28,22 @@ pub(crate) fn fix_all(
 ) -> crate::Result<Fixes> {
     let source_kind = query.make_source_kind();
     let settings = query.settings();
-    let document_path = query.file_path();
+    let document_path = query.virtual_file_path();
 
     // If the document is excluded, return an empty list of fixes.
-    let package = if let Some(document_path) = document_path.as_ref() {
-        if is_document_excluded_for_linting(
-            document_path,
-            &settings.file_resolver,
-            linter_settings,
-            query.text_document_language_id(),
-        ) {
-            return Ok(Fixes::default());
-        }
+    if is_document_excluded_for_linting(
+        &document_path,
+        &settings.file_resolver,
+        linter_settings,
+        query.text_document_language_id(),
+    ) {
+        return Ok(Fixes::default());
+    }
 
+    let file_path = query.file_path();
+    let package = if let Some(file_path) = &file_path {
         detect_package_root(
-            document_path
+            file_path
                 .parent()
                 .expect("a path to a document should have a parent path"),
             &linter_settings.namespace_packages,
@@ -65,7 +66,7 @@ pub(crate) fn fix_all(
         result,
         ..
     } = ruff_linter::linter::lint_fix(
-        &query.virtual_file_path(),
+        &document_path,
         package,
         flags::Noqa::Enabled,
         settings.unsafe_fixes,

crates/ruff_server/src/format.rs

@@ -12,10 +12,10 @@ pub(crate) fn format(
     document: &TextDocument,
     source_type: PySourceType,
     formatter_settings: &FormatterSettings,
-    path: Option<&Path>,
+    path: &Path,
 ) -> crate::Result<Option<String>> {
     let format_options =
-        formatter_settings.to_format_options(source_type, document.contents(), path);
+        formatter_settings.to_format_options(source_type, document.contents(), Some(path));
     match format_module_source(document.contents(), format_options) {
         Ok(formatted) => {
             let formatted = formatted.into_code();
@@ -40,10 +40,10 @@ pub(crate) fn format_range(
     source_type: PySourceType,
     formatter_settings: &FormatterSettings,
     range: TextRange,
-    path: Option<&Path>,
+    path: &Path,
 ) -> crate::Result<Option<PrintedRange>> {
     let format_options =
-        formatter_settings.to_format_options(source_type, document.contents(), path);
+        formatter_settings.to_format_options(source_type, document.contents(), Some(path));
 
     match ruff_python_formatter::format_range(document.contents(), range, format_options) {
         Ok(formatted) => {
@@ -97,7 +97,7 @@ with open("a_really_long_foo") as foo, open("a_really_long_bar") as bar, open("a
                 per_file_target_version,
                 ..Default::default()
             },
-            Some(Path::new("test.py")),
+            Path::new("test.py"),
         )
         .expect("Expected no errors when formatting")
         .expect("Expected formatting changes");
@@ -119,7 +119,7 @@ with open("a_really_long_foo") as foo, open("a_really_long_bar") as bar, open("a
                 unresolved_target_version: PythonVersion::PY38,
                 ..Default::default()
             },
-            Some(Path::new("test.py")),
+            Path::new("test.py"),
         )
         .expect("Expected no errors when formatting")
         .expect("Expected formatting changes");
@@ -167,7 +167,7 @@ sys.exit(
                 ..Default::default()
             },
             range,
-            Some(Path::new("test.py")),
+            Path::new("test.py"),
         )
         .expect("Expected no errors when formatting")
         .expect("Expected formatting changes");
@@ -190,7 +190,7 @@ sys.exit(
                 ..Default::default()
             },
             range,
-            Some(Path::new("test.py")),
+            Path::new("test.py"),
         )
         .expect("Expected no errors when formatting")
         .expect("Expected formatting changes");

crates/ruff_server/src/lint.rs

@@ -69,37 +69,29 @@ pub(crate) fn check(
 ) -> DiagnosticsMap {
     let source_kind = query.make_source_kind();
     let settings = query.settings();
-    let document_path = query.file_path();
+    let document_path = query.virtual_file_path();
 
     // If the document is excluded, return an empty list of diagnostics.
-    let package = if let Some(document_path) = document_path.as_ref() {
-        if is_document_excluded_for_linting(
-            document_path,
-            &settings.file_resolver,
-            &settings.linter,
-            query.text_document_language_id(),
-        ) {
-            return DiagnosticsMap::default();
-        }
+    if is_document_excluded_for_linting(
+        &document_path,
+        &settings.file_resolver,
+        &settings.linter,
+        query.text_document_language_id(),
+    ) {
+        return DiagnosticsMap::default();
+    }
 
-        detect_package_root(
-            document_path
-                .parent()
-                .expect("a path to a document should have a parent path"),
-            &settings.linter.namespace_packages,
-        )
-        .map(PackageRoot::root)
-    } else {
-        None
-    };
+    let package = detect_package_root(
+        document_path
+            .parent()
+            .expect("a path to a document should have a parent path"),
+        &settings.linter.namespace_packages,
+    )
+    .map(PackageRoot::root);
 
     let source_type = query.source_type();
 
-    let target_version = if let Some(path) = &document_path {
-        settings.linter.resolve_target_version(path)
-    } else {
-        settings.linter.unresolved_target_version
-    };
+    let target_version = settings.linter.resolve_target_version(&document_path);
 
     let parse_options =
         ParseOptions::from(source_type).with_target_version(target_version.parser_version());
@@ -123,7 +115,7 @@ pub(crate) fn check(
 
     // Generate checks.
     let diagnostics = check_path(
-        &query.virtual_file_path(),
+        &document_path,
         package,
         &locator,
         &stylist,
@@ -138,7 +130,7 @@ pub(crate) fn check(
     );
 
     let noqa_edits = generate_noqa_edits(
-        &query.virtual_file_path(),
+        &document_path,
         &diagnostics,
         &locator,
         indexer.comment_ranges(),

crates/ruff_server/src/server/api/requests/format.rs

@@ -83,26 +83,24 @@ fn format_text_document(
     is_notebook: bool,
 ) -> Result<super::FormatResponse> {
     let settings = query.settings();
+    let file_path = query.virtual_file_path();
 
     // If the document is excluded, return early.
-    let file_path = query.file_path();
-    if let Some(file_path) = &file_path {
-        if is_document_excluded_for_formatting(
-            file_path,
-            &settings.file_resolver,
-            &settings.formatter,
-            text_document.language_id(),
-        ) {
-            return Ok(None);
-        }
+    if is_document_excluded_for_formatting(
+        &file_path,
+        &settings.file_resolver,
+        &settings.formatter,
+        text_document.language_id(),
+    ) {
+        return Ok(None);
     }
 
     let source = text_document.contents();
     let formatted = crate::format::format(
         text_document,
         query.source_type(),
         &settings.formatter,
-        file_path.as_deref(),
+        &file_path,
     )
     .with_failure_code(lsp_server::ErrorCode::InternalError)?;
     let Some(mut formatted) = formatted else {

crates/ruff_server/src/server/api/requests/format_range.rs

@@ -47,18 +47,16 @@ fn format_text_document_range(
     encoding: PositionEncoding,
 ) -> Result<super::FormatResponse> {
     let settings = query.settings();
+    let file_path = query.virtual_file_path();
 
     // If the document is excluded, return early.
-    let file_path = query.file_path();
-    if let Some(file_path) = &file_path {
-        if is_document_excluded_for_formatting(
-            file_path,
-            &settings.file_resolver,
-            &settings.formatter,
-            text_document.language_id(),
-        ) {
-            return Ok(None);
-        }
+    if is_document_excluded_for_formatting(
+        &file_path,
+        &settings.file_resolver,
+        &settings.formatter,
+        text_document.language_id(),
+    ) {
+        return Ok(None);
     }
 
     let text = text_document.contents();
@@ -69,7 +67,7 @@ fn format_text_document_range(
         query.source_type(),
         &settings.formatter,
         range,
-        file_path.as_deref(),
+        &file_path,
     )
     .with_failure_code(lsp_server::ErrorCode::InternalError)?;