Skip to content

Commit 7f7f92c

Browse files
committed
run formatter
1 parent c3c3207 commit 7f7f92c

File tree

13 files changed

+129
-91
lines changed

13 files changed

+129
-91
lines changed

apps/elixir_ls_debugger/lib/debugger/server.ex

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -944,10 +944,14 @@ defmodule ElixirLS.Debugger.Server do
944944
# it does not work in mixfile
945945
# but at this point we are probably modifying elixir_ls_debugger project
946946
Mix.ProjectStack.post_config(build_path: ".elixir_ls/debugger/build")
947-
Mix.ProjectStack.post_config(test_elixirc_options: [
948-
docs: true,
949-
debug_info: true
950-
])
947+
948+
Mix.ProjectStack.post_config(
949+
test_elixirc_options: [
950+
docs: true,
951+
debug_info: true
952+
]
953+
)
954+
951955
Mix.ProjectStack.post_config(prune_code_paths: false)
952956

953957
Code.put_compiler_option(:docs, true)

apps/elixir_ls_debugger/mix.exs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ defmodule ElixirLS.Debugger.Mixfile do
77
|> String.trim()
88

99
@dep_versions __DIR__
10-
|> Path.join("../../dep_versions.exs")
11-
|> Code.eval_file
12-
|> elem(0)
10+
|> Path.join("../../dep_versions.exs")
11+
|> Code.eval_file()
12+
|> elem(0)
1313

1414
def project do
1515
[
@@ -42,7 +42,8 @@ defmodule ElixirLS.Debugger.Mixfile do
4242
{:elixir_sense, github: "elixir-lsp/elixir_sense", ref: @dep_versions[:elixir_sense]},
4343
{:elixir_ls_utils, in_umbrella: true},
4444
{:jason_v, github: "elixir-lsp/jason", ref: @dep_versions[:jason_v]},
45-
{:dialyxir_vendored, github: "elixir-lsp/dialyxir", ref: @dep_versions[:dialyxir_vendored], runtime: false}
45+
{:dialyxir_vendored,
46+
github: "elixir-lsp/dialyxir", ref: @dep_versions[:dialyxir_vendored], runtime: false}
4647
]
4748
end
4849
end

apps/elixir_ls_debugger/test/debugger_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,10 +1731,10 @@ defmodule ElixirLS.Debugger.ServerTest do
17311731

17321732
if Version.match?(System.version(), ">= 1.15.0-dev") do
17331733
assert Enum.find(threads, &(&1["id"] == thread_id))["name"] ==
1734-
"Task.Supervised.noreply/4 #{:erlang.pid_to_list(pid)}"
1734+
"Task.Supervised.noreply/4 #{:erlang.pid_to_list(pid)}"
17351735
else
17361736
assert Enum.find(threads, &(&1["id"] == thread_id))["name"] ==
1737-
":proc_lib.init_p/5 #{:erlang.pid_to_list(pid)}"
1737+
":proc_lib.init_p/5 #{:erlang.pid_to_list(pid)}"
17381738
end
17391739

17401740
send(pid, :done)

apps/elixir_ls_utils/mix.exs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ defmodule ElixirLS.Utils.Mixfile do
77
|> String.trim()
88

99
@dep_versions __DIR__
10-
|> Path.join("../../dep_versions.exs")
11-
|> Code.eval_file
12-
|> elem(0)
10+
|> Path.join("../../dep_versions.exs")
11+
|> Code.eval_file()
12+
|> elem(0)
1313

1414
def project do
1515
[
@@ -39,7 +39,8 @@ defmodule ElixirLS.Utils.Mixfile do
3939
[
4040
{:jason_v, github: "elixir-lsp/jason", ref: @dep_versions[:jason_v]},
4141
{:mix_task_archive_deps, github: "elixir-lsp/mix_task_archive_deps"},
42-
{:dialyxir_vendored, github: "elixir-lsp/dialyxir", ref: @dep_versions[:dialyxir_vendored], runtime: false}
42+
{:dialyxir_vendored,
43+
github: "elixir-lsp/dialyxir", ref: @dep_versions[:dialyxir_vendored], runtime: false}
4344
]
4445
end
4546

apps/language_server/lib/language_server/build.ex

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,13 @@ defmodule ElixirLS.LanguageServer.Build do
113113
# FIXME: Private API
114114
Mix.ProjectStack.post_config(build_path: ".elixir_ls/build")
115115
Mix.ProjectStack.post_config(prune_code_paths: false)
116-
117-
Mix.ProjectStack.post_config(test_elixirc_options: [
118-
docs: true,
119-
debug_info: true
120-
])
116+
117+
Mix.ProjectStack.post_config(
118+
test_elixirc_options: [
119+
docs: true,
120+
debug_info: true
121+
]
122+
)
121123

122124
# Mix.ProjectStack.post_config(state_loader: {:cli, List.first(args)})
123125
# added in https://github.com/elixir-lang/elixir/commit/9e07da862784ac7d18a1884141c49ab049e61691
@@ -150,20 +152,27 @@ defmodule ElixirLS.LanguageServer.Build do
150152
# The project may override our logger config, so we reset it after loading their config
151153
logger_config = Application.get_all_env(:logger)
152154
Mix.Task.run("loadconfig")
153-
Application.put_all_env([logger: logger_config])
155+
Application.put_all_env(logger: logger_config)
154156

155157
# make sure ANSI is disabled
156158
Application.put_env(:elixir, :ansi_enabled, false)
157159

158160
if Version.match?(System.version(), ">= 1.15.0-dev") do
159161
# remove log handlers
160162
handler_ids = :logger.get_handler_ids()
163+
161164
for handler_id <- handler_ids, handler_id != Logger.Backends.JsonRpc do
162165
:ok = :logger.remove_handler(handler_id)
163166
end
167+
164168
# make sure our handler is installed
165169
if Logger.Backends.JsonRpc not in handler_ids do
166-
:ok = :logger.add_handler(Logger.Backends.JsonRpc, Logger.Backends.JsonRpc, Logger.Backends.JsonRpc.handler_config())
170+
:ok =
171+
:logger.add_handler(
172+
Logger.Backends.JsonRpc,
173+
Logger.Backends.JsonRpc,
174+
Logger.Backends.JsonRpc.handler_config()
175+
)
167176
end
168177
end
169178
end
@@ -187,11 +196,12 @@ defmodule ElixirLS.LanguageServer.Build do
187196
"--no-protocol-consolidation"
188197
]
189198

190-
opts = if Version.match?(System.version(), ">= 1.15.0-dev") do
191-
opts
192-
else
193-
opts ++ ["--all-warnings"]
194-
end
199+
opts =
200+
if Version.match?(System.version(), ">= 1.15.0-dev") do
201+
opts
202+
else
203+
opts ++ ["--all-warnings"]
204+
end
195205

196206
case Mix.Task.run("compile", opts) do
197207
{status, diagnostics} when status in [:ok, :error, :noop] and is_list(diagnostics) ->

apps/language_server/lib/language_server/cli.ex

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ defmodule ElixirLS.LanguageServer.CLI do
1212
# replace console logger with LSP
1313
if Version.match?(System.version(), ">= 1.15.0-dev") do
1414
:ok = :logger.remove_handler(:default)
15-
:ok = :logger.add_handler(Logger.Backends.JsonRpc, Logger.Backends.JsonRpc, Logger.Backends.JsonRpc.handler_config())
15+
16+
:ok =
17+
:logger.add_handler(
18+
Logger.Backends.JsonRpc,
19+
Logger.Backends.JsonRpc,
20+
Logger.Backends.JsonRpc.handler_config()
21+
)
1622
else
1723
Application.put_env(:logger, :backends, [Logger.Backends.JsonRpc])
1824

apps/language_server/lib/language_server/experimental/code_mod/format.ex

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,25 @@ defmodule ElixirLS.LanguageServer.Experimental.CodeMod.Format do
5353
true = Code.ensure_loaded?(Mix.Tasks.Format)
5454

5555
if project_dir && Version.match?(System.version(), ">= 1.15.0-dev") do
56-
{formatter_function, options} = Mix.Tasks.Format.formatter_for_file(path, root: project_dir)
56+
{formatter_function, options} =
57+
Mix.Tasks.Format.formatter_for_file(path, root: project_dir)
5758

5859
wrapped_formatter_function = wrap_with_try_catch(formatter_function)
5960

6061
{:ok, wrapped_formatter_function, options}
61-
else if Version.match?(System.version(), ">= 1.13.0") do
62-
{formatter_function, options} = Mix.Tasks.Format.formatter_for_file(path)
62+
else
63+
if Version.match?(System.version(), ">= 1.13.0") do
64+
{formatter_function, options} = Mix.Tasks.Format.formatter_for_file(path)
6365

64-
wrapped_formatter_function = wrap_with_try_catch(formatter_function)
66+
wrapped_formatter_function = wrap_with_try_catch(formatter_function)
6567

66-
{:ok, wrapped_formatter_function, options}
67-
else
68-
options = Mix.Tasks.Format.formatter_opts_for_file(path)
69-
formatter = build_formatter(options)
70-
{:ok, formatter, Mix.Tasks.Format.formatter_opts_for_file(path)}
68+
{:ok, wrapped_formatter_function, options}
69+
else
70+
options = Mix.Tasks.Format.formatter_opts_for_file(path)
71+
formatter = build_formatter(options)
72+
{:ok, formatter, Mix.Tasks.Format.formatter_opts_for_file(path)}
73+
end
7174
end
72-
end
7375
rescue
7476
e ->
7577
message = Exception.message(e)

apps/language_server/lib/language_server/experimental/language_server.ex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
defmodule ElixirLS.LanguageServer.Experimental.LanguageServer do
2-
32
require Logger
43

54
@type uri :: String.t()

apps/language_server/lib/language_server/providers/completion.ex

Lines changed: 48 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,8 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
320320
position_to_insert_alias: {line_to_insert_alias, column_to_insert_alias}
321321
},
322322
options
323-
) when required_alias != nil do
323+
)
324+
when required_alias != nil do
324325
completion_without_additional_text_edit =
325326
from_completion_item(
326327
%{
@@ -349,14 +350,15 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
349350
&("alias " <> &1)
350351
)
351352

352-
%__MODULE__{completion_without_additional_text_edit |
353-
additional_text_edit: %TextEdit{
354-
range: range(line_to_insert_alias, 0, line_to_insert_alias, 0),
355-
newText: alias_edit
356-
},
357-
documentation: name <> "\n" <> summary,
358-
label_details: label_details,
359-
priority: 24
353+
%__MODULE__{
354+
completion_without_additional_text_edit
355+
| additional_text_edit: %TextEdit{
356+
range: range(line_to_insert_alias, 0, line_to_insert_alias, 0),
357+
newText: alias_edit
358+
},
359+
documentation: name <> "\n" <> summary,
360+
label_details: label_details,
361+
priority: 24
360362
}
361363
end
362364

@@ -676,10 +678,12 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
676678
# import with only or except was used and the completion would need to change it
677679
# this is not trivial to implement and most likely not wanted so let's skip that
678680
defp from_completion_item(
679-
%{needed_import: needed_import},
680-
_context,
681-
_options
682-
) when needed_import != nil, do: nil
681+
%{needed_import: needed_import},
682+
_context,
683+
_options
684+
)
685+
when needed_import != nil,
686+
do: nil
683687

684688
defp from_completion_item(
685689
%{name: name, origin: origin} = item,
@@ -695,29 +699,35 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
695699
completion
696700
end
697701

698-
completion = if item.needed_require do
699-
{line_to_insert_require, column_to_insert_require} = context.position_to_insert_alias
700-
indentation =
701-
if column_to_insert_require >= 1,
702-
do: 1..column_to_insert_require |> Enum.map_join(fn _ -> " " end),
703-
else: ""
704-
require_edit = indentation <> "require " <> item.needed_require <> "\n"
705-
label_details =
706-
Map.update!(
707-
completion.label_details,
708-
"description",
709-
&("require " <> &1)
710-
)
711-
%__MODULE__{completion |
712-
additional_text_edit: %TextEdit{
713-
range: range(line_to_insert_require, 0, line_to_insert_require, 0),
714-
newText: require_edit
715-
},
716-
label_details: label_details
717-
}
718-
else
719-
completion
720-
end
702+
completion =
703+
if item.needed_require do
704+
{line_to_insert_require, column_to_insert_require} = context.position_to_insert_alias
705+
706+
indentation =
707+
if column_to_insert_require >= 1,
708+
do: 1..column_to_insert_require |> Enum.map_join(fn _ -> " " end),
709+
else: ""
710+
711+
require_edit = indentation <> "require " <> item.needed_require <> "\n"
712+
713+
label_details =
714+
Map.update!(
715+
completion.label_details,
716+
"description",
717+
&("require " <> &1)
718+
)
719+
720+
%__MODULE__{
721+
completion
722+
| additional_text_edit: %TextEdit{
723+
range: range(line_to_insert_require, 0, line_to_insert_require, 0),
724+
newText: require_edit
725+
},
726+
label_details: label_details
727+
}
728+
else
729+
completion
730+
end
721731

722732
file_path = Keyword.get(options, :file_path)
723733

@@ -1017,10 +1027,11 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
10171027
origin: origin,
10181028
metadata: metadata
10191029
} = info
1030+
10201031
%{
10211032
pipe_before?: pipe_before?,
10221033
capture_before?: capture_before?,
1023-
text_after_cursor: text_after_cursor,
1034+
text_after_cursor: text_after_cursor
10241035
} = context
10251036

10261037
locals_without_parens = Keyword.get(options, :locals_without_parens)

apps/language_server/lib/language_server/providers/hover.ex

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ defmodule ElixirLS.LanguageServer.Providers.Hover do
2828
%{actual_subject: subject, docs: docs, range: es_range} ->
2929
lines = SourceFile.lines(text)
3030

31-
%{"contents" => contents(docs, subject, project_dir), "range" => build_range(lines, es_range)}
31+
%{
32+
"contents" => contents(docs, subject, project_dir),
33+
"range" => build_range(lines, es_range)
34+
}
3235
end
3336

3437
{:ok, response}
@@ -38,11 +41,11 @@ defmodule ElixirLS.LanguageServer.Providers.Hover do
3841

3942
def build_range(lines, %{begin: {begin_line, begin_char}, end: {end_line, end_char}}) do
4043
range(
41-
begin_line - 1,
42-
SourceFile.elixir_character_to_lsp(lines |> Enum.at(begin_line - 1), begin_char),
43-
end_line - 1,
44-
SourceFile.elixir_character_to_lsp(lines |> Enum.at(end_line - 1), end_char)
45-
)
44+
begin_line - 1,
45+
SourceFile.elixir_character_to_lsp(lines |> Enum.at(begin_line - 1), begin_char),
46+
end_line - 1,
47+
SourceFile.elixir_character_to_lsp(lines |> Enum.at(end_line - 1), end_char)
48+
)
4649
end
4750

4851
defp contents(%{docs: "No documentation available\n"}, _subject, _project_dir) do

apps/language_server/lib/language_server/source_file.ex

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,13 @@ defmodule ElixirLS.LanguageServer.SourceFile do
241241

242242
if project_dir && Version.match?(System.version(), ">= 1.15.0-dev") do
243243
{:ok, apply(Mix.Tasks.Format, :formatter_for_file, [path, [root: project_dir]])}
244-
else if Version.match?(System.version(), ">= 1.13.0") do
245-
{:ok, apply(Mix.Tasks.Format, :formatter_for_file, [path])}
246244
else
247-
{:ok, {nil, apply(Mix.Tasks.Format, :formatter_opts_for_file, [path])}}
245+
if Version.match?(System.version(), ">= 1.13.0") do
246+
{:ok, apply(Mix.Tasks.Format, :formatter_for_file, [path])}
247+
else
248+
{:ok, {nil, apply(Mix.Tasks.Format, :formatter_opts_for_file, [path])}}
249+
end
248250
end
249-
end
250251
rescue
251252
e ->
252253
message = Exception.message(e)

apps/language_server/mix.exs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ defmodule ElixirLS.LanguageServer.Mixfile do
77
|> String.trim()
88

99
@dep_versions __DIR__
10-
|> Path.join("../../dep_versions.exs")
11-
|> Code.eval_file
12-
|> elem(0)
10+
|> Path.join("../../dep_versions.exs")
11+
|> Code.eval_file()
12+
|> elem(0)
1313

1414
def project do
1515
[
@@ -40,7 +40,8 @@ defmodule ElixirLS.LanguageServer.Mixfile do
4040
{:elixir_sense, github: "elixir-lsp/elixir_sense", ref: @dep_versions[:elixir_sense]},
4141
{:erl2ex, github: "dazuma/erl2ex"},
4242
{:sourceror, "0.11.2"},
43-
{:dialyxir_vendored, github: "elixir-lsp/dialyxir", ref: @dep_versions[:dialyxir_vendored], runtime: false},
43+
{:dialyxir_vendored,
44+
github: "elixir-lsp/dialyxir", ref: @dep_versions[:dialyxir_vendored], runtime: false},
4445
{:jason_v, github: "elixir-lsp/jason", ref: @dep_versions[:jason_v]},
4546
{:stream_data, "~> 0.5", only: [:dev, :test], runtime: false},
4647
{:path_glob_vendored, github: "elixir-lsp/path_glob", branch: "vendored"},

0 commit comments

Comments
 (0)