Skip to content

Commit 512b05a

Browse files
authored
Merge pull request #1101 from BenPH/catch-get-juliaformatter-config
Prevent language server crashes for invalid .JuliaFormatter.toml
2 parents 4aef2c1 + dd4e85b commit 512b05a

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

src/requests/features.jl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,8 @@ end
155155
function textDocument_formatting_request(params::DocumentFormattingParams, server::LanguageServerInstance, conn)
156156
doc = getdocument(server, params.textDocument.uri)
157157

158-
config = get_juliaformatter_config(doc, server)
159-
160158
newcontent = try
159+
config = get_juliaformatter_config(doc, server)
161160
format_text(get_text(doc), params, config)
162161
catch err
163162
return JSONRPC.JSONRPCError(
@@ -225,9 +224,8 @@ function textDocument_range_formatting_request(params::DocumentRangeFormattingPa
225224
longest_prefix = CSTParser.longest_common_prefix(something(longest_prefix, line), line)
226225
end
227226

228-
config = get_juliaformatter_config(doc, server)
229-
230227
newcontent = try
228+
config = get_juliaformatter_config(doc, server)
231229
format_text(text, params, config)
232230
catch err
233231
return JSONRPC.JSONRPCError(

0 commit comments

Comments
 (0)