Fix formatting request parameters not being respected

Author: jrentlez

src/cli/lsp.rs

@@ -4,10 +4,11 @@ use lsp_server::{Connection, ErrorCode, Message, Response};
 use lsp_textdocument::{FullTextDocument, TextDocuments};
 use lsp_types::{
     request::{Formatting, RangeFormatting, Request},
-    DocumentFormattingParams, DocumentRangeFormattingParams, OneOf, Position, Range,
-    ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind, TextEdit, Uri,
+    DocumentFormattingParams, DocumentRangeFormattingParams, FormattingOptions, OneOf,
+    Position, Range, ServerCapabilities, ServerInfo, TextDocumentSyncCapability,
+    TextDocumentSyncKind, TextEdit, Uri,
 };
-use stylua_lib::{format_code, OutputVerification};
+use stylua_lib::{format_code, IndentType, OutputVerification};
 
 use crate::{config::ConfigResolver, opt};
 
@@ -16,17 +17,28 @@ fn handle_formatting(
     document: &FullTextDocument,
     range: Option<stylua_lib::Range>,
     config_resolver: &mut ConfigResolver,
+    formatting_options: 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();
 
+    config.indent_width = formatting_options
+        .tab_size
+        .try_into()
+        .expect("usize fits into u32");
+    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 last_line_idx = document.line_count().saturating_sub(1);
@@ -68,6 +80,7 @@ fn handle_request(
                         document,
                         None,
                         config_resolver,
+                        params.options,
                     ) {
                         Some(edits) => Response::new_ok(request.id, edits),
                         None => Response::new_ok(request.id, serde_json::Value::Null),
@@ -104,6 +117,7 @@ fn handle_request(
                         document,
                         Some(range),
                         config_resolver,
+                        params.options,
                     ) {
                         Some(edits) => Response::new_ok(request.id, edits),
                         None => Response::new_ok(request.id, serde_json::Value::Null),