Skip to content

Commit 867b3a1

Browse files
lukaszsamsonlukaszsamson
authored
Elixir 1.12 compatibility improvements (#550)
* bump elixir sense * add elixir 1.12 and otp 24 to ci workflow * run formatter on elixir 1.12 * relax deps and bump dialyxir * add more combos to isolate dialyzer breakage * do not match on line * remove not needed combos
1 parent 98b7906 commit 867b3a1

File tree

6 files changed

+42
-38
lines changed

6 files changed

+42
-38
lines changed

‎.github/workflows/ci.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,22 @@ jobs:
2020
otp: 21.3.8.20
2121
tests_may_fail: false
2222
- elixir: 1.9.x
23-
otp: 21.3.8.20
23+
otp: 21.3.8.23
2424
tests_may_fail: false
2525
- elixir: 1.10.x
26-
otp: 21.3.8.20
26+
otp: 21.3.8.23
2727
tests_may_fail: false
2828
check_unused_deps: true
2929
- elixir: 1.11.x
3030
otp: 21.3.8.20
3131
tests_may_fail: false
3232
check_unused_deps: true
33-
- elixir: 1.11.x
34-
otp: 23.2.x
33+
- elixir: 1.12.x
34+
otp: 22.3.4.19
35+
tests_may_fail: false
36+
check_unused_deps: true
37+
- elixir: 1.12.x
38+
otp: 24.0.x
3539
tests_may_fail: false
3640
warnings_as_errors: true
3741
check_formatted: true
@@ -62,8 +66,8 @@ jobs:
6266
strategy:
6367
matrix:
6468
include:
65-
- elixir: 1.11.x
66-
otp: 23.2.x
69+
- elixir: 1.12.x
70+
otp: 24.0.x
6771
steps:
6872
- uses: actions/checkout@v2
6973
- uses: erlef/setup-beam@v1

‎.github/workflows/release-asset.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- elixir-version: '1.11'
36-
otp-version: '23.1'
35+
- elixir-version: '1.12'
36+
otp-version: '24.0'
37+
- elixir-version: '1.11.4'
38+
otp-version: '23.3'
3739
- elixir-version: '1.10.4'
38-
otp-version: '23.1'
39-
- elixir-version: '1.9'
40+
otp-version: '23.3'
41+
- elixir-version: '1.9.4'
4042
otp-version: '22.3'
4143
- elixir-version: '1.8.2'
4244
otp-version: '21.3'

‎apps/language_server/lib/language_server/server.ex

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,7 @@ defmodule ElixirLS.LanguageServer.Server do
326326
# close notification send before
327327
JsonRpc.log_message(
328328
:warning,
329-
"Received textDocument/didOpen for file that is already open. Received uri: #{
330-
inspect(uri)
331-
}"
329+
"Received textDocument/didOpen for file that is already open. Received uri: #{inspect(uri)}"
332330
)
333331

334332
state

‎apps/language_server/mix.exs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ defmodule ElixirLS.LanguageServer.Mixfile do
2828
[
2929
{:elixir_ls_utils, in_umbrella: true},
3030
{:elixir_sense, github: "elixir-lsp/elixir_sense"},
31-
{:forms, "~> 0.0.1"},
31+
{:forms, "~> 0.0"},
3232
{:erl2ex, github: "dazuma/erl2ex"},
33-
{:dialyxir, "~> 1.0.0", runtime: false},
33+
{:dialyxir, "~> 1.0", runtime: false},
3434
{:jason_vendored, github: "elixir-lsp/jason", branch: "vendored"},
35-
{:stream_data, "~> 0.5.0", only: :test}
35+
{:stream_data, "~> 0.5", only: :test}
3636
]
3737
end
3838

‎apps/language_server/test/dialyzer_test.exs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ defmodule ElixirLS.LanguageServer.DialyzerTest do
4141
%{
4242
"message" => error_message1,
4343
"range" => %{
44-
"end" => %{"character" => 0, "line" => 1},
45-
"start" => %{"character" => 0, "line" => 1}
44+
"end" => %{"character" => 0, "line" => _},
45+
"start" => %{"character" => 0, "line" => _}
4646
},
4747
"severity" => 2,
4848
"source" => "ElixirLS Dialyzer"
4949
},
5050
%{
5151
"message" => error_message2,
5252
"range" => %{
53-
"end" => %{"character" => 0, "line" => 2},
54-
"start" => %{"character" => 0, "line" => 2}
53+
"end" => %{"character" => 0, "line" => _},
54+
"start" => %{"character" => 0, "line" => _}
5555
},
5656
"severity" => 2,
5757
"source" => "ElixirLS Dialyzer"
@@ -175,17 +175,17 @@ defmodule ElixirLS.LanguageServer.DialyzerTest do
175175
%{
176176
"message" => error_message1,
177177
"range" => %{
178-
"end" => %{"character" => 0, "line" => 1},
179-
"start" => %{"character" => 0, "line" => 1}
178+
"end" => %{"character" => 0, "line" => _},
179+
"start" => %{"character" => 0, "line" => _}
180180
},
181181
"severity" => 2,
182182
"source" => "ElixirLS Dialyzer"
183183
},
184184
%{
185185
"message" => error_message2,
186186
"range" => %{
187-
"end" => %{"character" => 0, "line" => 2},
188-
"start" => %{"character" => 0, "line" => 2}
187+
"end" => %{"character" => 0, "line" => _},
188+
"start" => %{"character" => 0, "line" => _}
189189
},
190190
"severity" => 2,
191191
"source" => "ElixirLS Dialyzer"
@@ -229,17 +229,17 @@ defmodule ElixirLS.LanguageServer.DialyzerTest do
229229
%{
230230
"message" => error_message1,
231231
"range" => %{
232-
"end" => %{"character" => 0, "line" => 1},
233-
"start" => %{"character" => 0, "line" => 1}
232+
"end" => %{"character" => 0, "line" => _},
233+
"start" => %{"character" => 0, "line" => _}
234234
},
235235
"severity" => 2,
236236
"source" => "ElixirLS Dialyzer"
237237
},
238238
%{
239239
"message" => error_message2,
240240
"range" => %{
241-
"end" => %{"character" => 0, "line" => 2},
242-
"start" => %{"character" => 0, "line" => 2}
241+
"end" => %{"character" => 0, "line" => _},
242+
"start" => %{"character" => 0, "line" => _}
243243
},
244244
"severity" => 2,
245245
"source" => "ElixirLS Dialyzer"
@@ -274,17 +274,17 @@ defmodule ElixirLS.LanguageServer.DialyzerTest do
274274
%{
275275
"message" => error_message1,
276276
"range" => %{
277-
"end" => %{"character" => 0, "line" => 1},
278-
"start" => %{"character" => 0, "line" => 1}
277+
"end" => %{"character" => 0, "line" => _},
278+
"start" => %{"character" => 0, "line" => _}
279279
},
280280
"severity" => 2,
281281
"source" => "ElixirLS Dialyzer"
282282
},
283283
%{
284284
"message" => _error_message2,
285285
"range" => %{
286-
"end" => %{"character" => 0, "line" => 2},
287-
"start" => %{"character" => 0, "line" => 2}
286+
"end" => %{"character" => 0, "line" => _},
287+
"start" => %{"character" => 0, "line" => _}
288288
},
289289
"severity" => 2,
290290
"source" => "ElixirLS Dialyzer"
@@ -320,17 +320,17 @@ defmodule ElixirLS.LanguageServer.DialyzerTest do
320320
%{
321321
"message" => error_message1,
322322
"range" => %{
323-
"end" => %{"character" => 0, "line" => 1},
324-
"start" => %{"character" => 0, "line" => 1}
323+
"end" => %{"character" => 0, "line" => _},
324+
"start" => %{"character" => 0, "line" => _}
325325
},
326326
"severity" => 2,
327327
"source" => "ElixirLS Dialyzer"
328328
},
329329
%{
330330
"message" => error_message2,
331331
"range" => %{
332-
"end" => %{"character" => 0, "line" => 2},
333-
"start" => %{"character" => 0, "line" => 2}
332+
"end" => %{"character" => 0, "line" => _},
333+
"start" => %{"character" => 0, "line" => _}
334334
},
335335
"severity" => 2,
336336
"source" => "ElixirLS Dialyzer"

‎mix.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%{
2-
"dialyxir": {:hex, :dialyxir, "1.0.0", "6a1fa629f7881a9f5aaf3a78f094b2a51a0357c843871b8bc98824e7342d00a5", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "aeb06588145fac14ca08d8061a142d52753dbc2cf7f0d00fc1013f53f8654654"},
2+
"dialyxir": {:hex, :dialyxir, "1.1.0", "c5aab0d6e71e5522e77beff7ba9e08f8e02bad90dfbeffae60eaf0cb47e29488", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "07ea8e49c45f15264ebe6d5b93799d4dd56a44036cf42d0ad9c960bc266c0b9a"},
33
"docsh": {:hex, :docsh, "0.7.2", "f893d5317a0e14269dd7fe79cf95fb6b9ba23513da0480ec6e77c73221cae4f2", [:rebar3], [{:providers, "1.8.1", [hex: :providers, repo: "hexpm", optional: false]}], "hexpm", "4e7db461bb07540d2bc3d366b8513f0197712d0495bb85744f367d3815076134"},
4-
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "1fb9b6b63ebc0429a1db87da2381a22707d51e3a", []},
4+
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "d35b08a32efea1c73f837211fd1a3e2f280b51e8", []},
55
"erl2ex": {:git, "https://github.com/dazuma/erl2ex.git", "244c2d9ed5805ef4855a491d8616b8842fef7ca4", []},
66
"erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
77
"forms": {:hex, :forms, "0.0.1", "45f3b10b6f859f95f2c2c1a1de244d63855296d55ed8e93eb0dd116b3e86c4a6", [:rebar3], [], "hexpm", "530f63ed8ed5a171f744fc75bd69cb2e36496899d19dbef48101b4636b795868"},

0 commit comments

Comments
 (0)