From 478aea77f081b2412b4d915eae3a71e7ba96c9ad Mon Sep 17 00:00:00 2001 From: Adam Sokolnicki Date: Sat, 20 May 2023 23:26:58 +0200 Subject: [PATCH 1/3] Auto detect formatter when client did not specify it --- lib/ruby_lsp/executor.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ruby_lsp/executor.rb b/lib/ruby_lsp/executor.rb index 1e770b909..b4aab5fab 100644 --- a/lib/ruby_lsp/executor.rb +++ b/lib/ruby_lsp/executor.rb @@ -421,7 +421,7 @@ def initialize_request(options) end formatter = options.dig(:initializationOptions, :formatter) - @store.formatter = if formatter == "auto" + @store.formatter = if formatter == "auto" || formatter == '' || formatter.nil? detected_formatter else formatter From 9294c8733e0c046261e6c07ce43a1d6fb44b6226 Mon Sep 17 00:00:00 2001 From: Adam Sokolnicki Date: Fri, 26 May 2023 23:37:04 +0200 Subject: [PATCH 2/3] No need to handle "empty string" case --- lib/ruby_lsp/executor.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ruby_lsp/executor.rb b/lib/ruby_lsp/executor.rb index b4aab5fab..f17cb7b10 100644 --- a/lib/ruby_lsp/executor.rb +++ b/lib/ruby_lsp/executor.rb @@ -420,8 +420,8 @@ def initialize_request(options) encodings.first end - formatter = options.dig(:initializationOptions, :formatter) - @store.formatter = if formatter == "auto" || formatter == '' || formatter.nil? + formatter = options.dig(:initializationOptions, :formatter) || 'auto' + @store.formatter = if formatter == "auto" detected_formatter else formatter From 3b0543be803553a1b95a8c0ce5dc8429cc3b7745 Mon Sep 17 00:00:00 2001 From: Adam Sokolnicki Date: Mon, 29 May 2023 17:42:36 +0200 Subject: [PATCH 3/3] Correct a Rubocop offence --- lib/ruby_lsp/executor.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ruby_lsp/executor.rb b/lib/ruby_lsp/executor.rb index f17cb7b10..e11c0492f 100644 --- a/lib/ruby_lsp/executor.rb +++ b/lib/ruby_lsp/executor.rb @@ -420,7 +420,7 @@ def initialize_request(options) encodings.first end - formatter = options.dig(:initializationOptions, :formatter) || 'auto' + formatter = options.dig(:initializationOptions, :formatter) || "auto" @store.formatter = if formatter == "auto" detected_formatter else