Skip to content

Commit a50c028

Browse files
committed
correctly format specs when there are more than one
previous version would remove @SPEC from everything but the first one Fixes #959
1 parent 216ff0e commit a50c028

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

apps/language_server/lib/language_server/source_file.ex

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,6 @@ defmodule ElixirLS.LanguageServer.SourceFile do
216216
{:ok, code} ->
217217
code
218218
|> to_string()
219-
|> lines()
220-
|> remove_indentation(String.length("@spec "))
221-
|> Enum.join("\n")
222219

223220
{:error, _} ->
224221
spec
@@ -267,12 +264,6 @@ defmodule ElixirLS.LanguageServer.SourceFile do
267264
end
268265
end
269266

270-
defp remove_indentation([line | rest], length) do
271-
[line | Enum.map(rest, &String.slice(&1, length..-1))]
272-
end
273-
274-
defp remove_indentation(lines, _), do: lines
275-
276267
def lsp_character_to_elixir(_utf8_line, lsp_character) when lsp_character <= 0, do: 1
277268

278269
def lsp_character_to_elixir(utf8_line, lsp_character) do

apps/language_server/test/providers/completion_test.exs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,9 +1111,9 @@ defmodule ElixirLS.LanguageServer.Providers.CompletionTest do
11111111
The summary
11121112
```
11131113
@spec add(
1114-
a_big_name :: integer,
1115-
b_big_name :: integer
1116-
) :: integer
1114+
a_big_name :: integer,
1115+
b_big_name :: integer
1116+
) :: integer
11171117
```
11181118
"""
11191119
}

apps/language_server/test/server_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,8 +1015,8 @@ defmodule ElixirLS.LanguageServer.ServerTest do
10151015
10161016
```
10171017
@spec inspect(device, item, keyword) ::
1018-
item
1019-
when item: var
1018+
item
1019+
when item: var
10201020
```
10211021
"""
10221022
},

apps/language_server/test/source_file_test.exs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ defmodule ElixirLS.LanguageServer.SourceFileTest do
3030
3131
```
3232
@spec format_spec(
33-
String.t(),
34-
keyword()
35-
) :: String.t()
33+
String.t(),
34+
keyword()
35+
) :: String.t()
3636
```
3737
"""
3838
end

0 commit comments

Comments
 (0)