From 9063741b3ddb020915a35ff41c79770c48ac03c1 Mon Sep 17 00:00:00 2001 From: Peter Krutz Date: Fri, 5 Aug 2022 13:13:47 -0700 Subject: [PATCH 1/3] switch between ruby and haml formatters --- lib/syntax_tree/language_server.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/syntax_tree/language_server.rb b/lib/syntax_tree/language_server.rb index 41b80af1..41da9a4f 100644 --- a/lib/syntax_tree/language_server.rb +++ b/lib/syntax_tree/language_server.rb @@ -56,7 +56,7 @@ def run store.delete(uri) in { method: "textDocument/formatting", id:, params: { textDocument: { uri: } } } contents = store[uri] - write(id: id, result: contents ? [format(store[uri])] : nil) + write(id: id, result: contents ? [format(store[uri], uri.split(".").last)] : nil) in { method: "textDocument/inlayHint", id:, params: { textDocument: { uri: } } } contents = store[uri] write(id: id, result: contents ? inlay_hints(store[uri]) : nil) @@ -86,7 +86,7 @@ def capabilities } end - def format(source) + def format(source, file_extension) { range: { start: { @@ -98,7 +98,7 @@ def format(source) character: 0 } }, - newText: SyntaxTree.format(source, print_width) + newText: file_extension == "haml" ? SyntaxTree::Haml.format(source, print_width) : SyntaxTree.format(source, print_width) } end @@ -119,3 +119,4 @@ def write(value) end end end + From 711f477acc0ef4821fbc2259f7b20b12805382a1 Mon Sep 17 00:00:00 2001 From: Peter Krutz Date: Wed, 10 Aug 2022 09:30:47 -0700 Subject: [PATCH 2/3] use syntaxtree handlers --- lib/syntax_tree/language_server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/syntax_tree/language_server.rb b/lib/syntax_tree/language_server.rb index 41da9a4f..03270e2a 100644 --- a/lib/syntax_tree/language_server.rb +++ b/lib/syntax_tree/language_server.rb @@ -98,7 +98,7 @@ def format(source, file_extension) character: 0 } }, - newText: file_extension == "haml" ? SyntaxTree::Haml.format(source, print_width) : SyntaxTree.format(source, print_width) + newText: SyntaxTree::HANDLERS[".#{file_extension}"].format(source, print_width) } end From 98eb03f080bd2f45ea67b8511eca6e87d886d1cd Mon Sep 17 00:00:00 2001 From: Peter Krutz Date: Wed, 10 Aug 2022 09:31:17 -0700 Subject: [PATCH 3/3] clean up --- lib/syntax_tree/language_server.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/syntax_tree/language_server.rb b/lib/syntax_tree/language_server.rb index 03270e2a..894fc2fd 100644 --- a/lib/syntax_tree/language_server.rb +++ b/lib/syntax_tree/language_server.rb @@ -119,4 +119,3 @@ def write(value) end end end -