Add initialization options to respect editor's formatting options

Author: jrentlez

src/cli/lsp.rs

@@ -4,12 +4,12 @@ use lsp_server::{Connection, ErrorCode, Message, Response};
 use lsp_textdocument::{FullTextDocument, TextDocuments};
 use lsp_types::{
     request::{Formatting, RangeFormatting, Request},
-    DocumentFormattingParams, DocumentRangeFormattingParams, InitializeResult, OneOf, Range,
-    ServerCapabilities, ServerInfo, TextDocumentSyncCapability, TextDocumentSyncKind, TextEdit,
-    Uri,
+    DocumentFormattingParams, DocumentRangeFormattingParams, FormattingOptions, InitializeParams,
+    InitializeResult, OneOf, Range, ServerCapabilities, ServerInfo, TextDocumentSyncCapability,
+    TextDocumentSyncKind, TextEdit, Uri,
 };
 use similar::{DiffOp, TextDiff};
-use stylua_lib::{format_code, OutputVerification};
+use stylua_lib::{format_code, IndentType, OutputVerification};
 
 use crate::{config::ConfigResolver, opt};
 
@@ -64,17 +64,30 @@ fn handle_formatting(
     document: &FullTextDocument,
     range: Option<stylua_lib::Range>,
     config_resolver: &mut ConfigResolver,
+    formatting_options: Option<&FormattingOptions>,
 ) -> Option<Vec<TextEdit>> {
     if document.language_id() != "lua" && document.language_id() != "luau" {
         return None;
     }
 
     let contents = document.get_content(None);
 
-    let config = config_resolver
+    let mut config = config_resolver
         .load_configuration(uri.path().as_str().as_ref())
         .unwrap_or_default();
 
+    if let Some(formatting_options) = formatting_options {
+        config.indent_width = formatting_options
+            .tab_size
+            .try_into()
+            .expect("u32 fits into usize");
+        config.indent_type = if formatting_options.insert_spaces {
+            IndentType::Spaces
+        } else {
+            IndentType::Tabs
+        };
+    }
+
     let formatted_contents = format_code(contents, config, range, OutputVerification::None).ok()?;
 
     let operations =
@@ -94,6 +107,7 @@ fn handle_request(
     request: lsp_server::Request,
     documents: &TextDocuments,
     config_resolver: &mut ConfigResolver,
+    respect_editor_formatting_options: bool,
 ) -> Response {
     match request.method.as_str() {
         Formatting::METHOD => {
@@ -115,6 +129,7 @@ fn handle_request(
                         document,
                         None,
                         config_resolver,
+                        respect_editor_formatting_options.then_some(&params.options),
                     ) {
                         Some(edits) => Response::new_ok(request.id, edits),
                         None => Response::new_ok(request.id, serde_json::Value::Null),
@@ -151,6 +166,7 @@ fn handle_request(
                         document,
                         Some(range),
                         config_resolver,
+                        respect_editor_formatting_options.then_some(&params.options),
                     ) {
                         Some(edits) => Response::new_ok(request.id, edits),
                         None => Response::new_ok(request.id, serde_json::Value::Null),
@@ -187,7 +203,17 @@ fn main_loop(connection: Connection, config_resolver: &mut ConfigResolver) -> an
         }),
     };
 
-    let (id, _) = connection.initialize_start()?;
+    let (id, initialize_params) = connection.initialize_start()?;
+
+    let respect_editor_formatting_options =
+        serde_json::from_value::<InitializeParams>(initialize_params)?
+            .initialization_options
+            .as_ref()
+            .and_then(|init_options| init_options.as_object())
+            .and_then(|map| map.get("respect_editor_formatting_options"))
+            .and_then(|value| value.as_bool())
+            .unwrap_or(false);
+
     connection.initialize_finish(id, serde_json::to_value(initialize_result)?)?;
 
     let mut documents = TextDocuments::new();
@@ -198,7 +224,12 @@ fn main_loop(connection: Connection, config_resolver: &mut ConfigResolver) -> an
                     break;
                 }
 
-                let response = handle_request(req, &documents, config_resolver);
+                let response = handle_request(
+                    req,
+                    &documents,
+                    config_resolver,
+                    respect_editor_formatting_options,
+                );
                 connection.sender.send(Message::Response(response))?
             }
             Message::Response(_) => {}