Upgrade Ruff to v0.0.92

ruffd-core/src/server_ops.rs

@@ -16,10 +16,10 @@ fn message_into_diagnostic(msg: Message) -> lsp_types::Diagnostic {
     // As ruff currently doesn't support the span of the error,
     // only have it span a single character
     let range = {
-        // diagnostic is zero indexed, but message is 1-indexed
-        let row_start = msg.location.row() as u32 - 1;
+        // diagnostic is zero indexed, but message rows are 1-indexed
+        let row_start = msg.location.row() as u32;
         let col_start = msg.location.column() as u32 - 1;
-        let row_end = msg.end_location.row() as u32 - 1;
+        let row_end = msg.end_location.row() as u32;
         let col_end = msg.end_location.column() as u32 - 1;
         let start = lsp_types::Position {
             line: row_start,
@@ -61,7 +61,7 @@ pub fn run_diagnostic_op(document_uri: lsp_types::Url) -> ServerNotification {
                     if let Some(buffer) = open_buffers.get(&document_uri) {
                         let doc = buffer.iter().collect::<String>();
                         if let Ok(path) = document_uri.to_file_path() {
-                            check(&path, &doc, true).unwrap_or_default()
+                            check(&path, &doc).unwrap_or_default()
                         } else {
                             vec![]
                         }

ruffd-types/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 lsp-types = "0.93"
-ruff = { git = "https://github.com/charliermarsh/ruff", tag = "v0.0.85", version = "0.0.85" }
+ruff = { git = "https://github.com/charliermarsh/ruff", tag = "v0.0.92", version = "0.0.92" }
 tokio = { version = "1.20", features = ["full"] }
 serde = "1.0"
 serde_json = "1.0"

ruffd-types/src/state.rs

@@ -1,6 +1,6 @@
 use crate::collections::{AggAvlTree, Rope};
 use crate::error::{DocumentError, RuntimeError};
-use ruff::settings::RawSettings;
+use ruff::settings::configuration::Configuration;
 use std::collections::HashMap;
 use std::ops::RangeBounds;
 use std::sync::Arc;
@@ -162,7 +162,7 @@ pub struct ServerState {
     pub project_root: Arc<RwLock<Option<lsp_types::Url>>>,
     pub open_buffers: Arc<RwLock<HashMap<lsp_types::Url, DocumentBuffer>>>,
     pub capabilities: Arc<RwLock<lsp_types::ServerCapabilities>>,
-    pub settings: Arc<RwLock<RawSettings>>,
+    pub settings: Arc<RwLock<Configuration>>,
 }
 
 impl ServerState {
@@ -195,10 +195,9 @@ impl ServerState {
         let project_root = Arc::new(RwLock::new(project_root_val));
         let capabilities = Arc::new(RwLock::new(capabilities_val));
         let open_buffers = Arc::new(RwLock::new(HashMap::new()));
-        let settings = Arc::new(RwLock::new(RawSettings::from_pyproject(
+        let settings = Arc::new(RwLock::new(Configuration::from_pyproject(
             &None,
             &project_root_path,
-            true,
         )?));
         Ok(Self {
             settings,
@@ -239,14 +238,14 @@ pub struct ServerStateLocks {
     pub project_root: RwReqOpt<Option<lsp_types::Url>>,
     pub open_buffers: RwReqOpt<HashMap<lsp_types::Url, DocumentBuffer>>,
     pub capabilities: RwReqOpt<lsp_types::ServerCapabilities>,
-    pub settings: RwReqOpt<RawSettings>,
+    pub settings: RwReqOpt<Configuration>,
 }
 
 pub struct ServerStateHandles<'a> {
     pub project_root: OptRwGuarded<'a, Option<lsp_types::Url>>,
     pub open_buffers: OptRwGuarded<'a, HashMap<lsp_types::Url, DocumentBuffer>>,
     pub capabilities: OptRwGuarded<'a, lsp_types::ServerCapabilities>,
-    pub settings: OptRwGuarded<'a, RawSettings>,
+    pub settings: OptRwGuarded<'a, Configuration>,
 }
 
 pub async fn server_state_handles_from_locks(locks: &ServerStateLocks) -> ServerStateHandles<'_> {