Skip to content

Commit 21537f7

Browse files
committed
small simplifications
1 parent a1147df commit 21537f7

File tree

2 files changed

+7
-30
lines changed

2 files changed

+7
-30
lines changed

apps/language_server/lib/language_server/providers/folding_range/helpers.ex

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ defmodule ElixirLS.LanguageServer.Providers.FoldingRange.Helpers do
33

44
def first_and_last_of_list([]), do: :empty_list
55

6+
def first_and_last_of_list([head]), do: {head, head}
7+
8+
def first_and_last_of_list([head, last]), do: {head, last}
9+
610
def first_and_last_of_list([head | tail]) do
7-
tail
8-
|> List.last()
9-
|> case do
10-
nil -> {head, head}
11-
last -> {head, last}
12-
end
11+
{head, List.last(tail)}
1312
end
1413
end

apps/language_server/lib/language_server/providers/folding_range/token.ex

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ defmodule ElixirLS.LanguageServer.Providers.FoldingRange.Token do
66
"""
77

88
alias ElixirSense.Core.Normalized.Tokenizer
9-
alias ElixirLS.LanguageServer.JsonRpc
10-
require Logger
119

1210
@type t :: {atom(), {non_neg_integer(), non_neg_integer(), any()}, any()}
1311

@@ -22,7 +20,7 @@ defmodule ElixirLS.LanguageServer.Providers.FoldingRange.Token do
2220
reversed_tokens
2321
# This reverses the tokens, but they come out of Tokenizer.tokenize/1
2422
# already reversed.
25-
|> Enum.reduce_while({:ok, []}, fn tuple, {:ok, acc} ->
23+
|> Enum.reduce([], fn tuple, acc ->
2624
tuple =
2725
case tuple do
2826
{a, {b1, b2, b3}} ->
@@ -44,29 +42,9 @@ defmodule ElixirLS.LanguageServer.Providers.FoldingRange.Token do
4442

4543
{:list_heredoc, {b1, b2, b3}, _, _} ->
4644
{:list_heredoc, {b1 - 1, b2 - 1, b3}, nil}
47-
48-
# raise here?
49-
error ->
50-
Logger.warning("Unmatched token: #{inspect(error)}")
51-
52-
JsonRpc.telemetry(
53-
"folding_ranges_error",
54-
%{"elixir_ls.folding_ranges_error" => inspect(error)},
55-
%{}
56-
)
57-
58-
:error
5945
end
6046

61-
if tuple == :error do
62-
{:halt, :error}
63-
else
64-
{:cont, {:ok, [tuple | acc]}}
65-
end
47+
[tuple | acc]
6648
end)
67-
|> case do
68-
{:ok, formatted_tokens} -> formatted_tokens
69-
_ -> []
70-
end
7149
end
7250
end

0 commit comments

Comments
 (0)