Skip to content

Commit 84500ae

Browse files
committed
vendor dialyxir
Fixes #744
1 parent a59ce3c commit 84500ae

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

apps/elixir_ls_debugger/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ defmodule ElixirLS.Debugger.Mixfile do
2727
[
2828
{:elixir_sense, github: "elixir-lsp/elixir_sense"},
2929
{:elixir_ls_utils, in_umbrella: true},
30-
{:dialyxir, "~> 1.0", runtime: false}
30+
{:dialyxir_vendored, github: "elixir-lsp/dialyxir", branch: "vendored", runtime: false}
3131
]
3232
end
3333
end

apps/elixir_ls_utils/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ defmodule ElixirLS.Utils.Mixfile do
2929
[
3030
{:jason_vendored, github: "elixir-lsp/jason", branch: "vendored"},
3131
{:mix_task_archive_deps, github: "elixir-lsp/mix_task_archive_deps"},
32-
{:dialyxir, "~> 1.0", runtime: false}
32+
{:dialyxir_vendored, github: "elixir-lsp/dialyxir", branch: "vendored", runtime: false}
3333
]
3434
end
3535

apps/language_server/lib/language_server/dialyzer.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
516516
end
517517

518518
try do
519-
%{^warning_name => warning_module} = Dialyxir.Warnings.warnings()
519+
%{^warning_name => warning_module} = DialyxirVendored.Warnings.warnings()
520520
<<_::binary>> = apply(warning_module, format_function, [args])
521521
rescue
522522
_ -> warning_message(raw_warning, "dialyzer")

apps/language_server/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ defmodule ElixirLS.LanguageServer.Mixfile do
2929
{:elixir_ls_utils, in_umbrella: true},
3030
{:elixir_sense, github: "elixir-lsp/elixir_sense"},
3131
{:erl2ex, github: "dazuma/erl2ex"},
32-
{:dialyxir, "~> 1.0", runtime: false},
32+
{:dialyxir_vendored, github: "elixir-lsp/dialyxir", branch: "vendored", runtime: false},
3333
{:jason_vendored, github: "elixir-lsp/jason", branch: "vendored"},
3434
{:stream_data, "~> 0.5", only: :test},
3535
{:path_glob_vendored, github: "elixir-lsp/path_glob", branch: "vendored"},

mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ defmodule ElixirLS.Mixfile do
1111
deps: deps(),
1212
elixir: ">= 1.11.0",
1313
dialyzer: [
14-
plt_add_apps: [:dialyxir, :debugger, :dialyzer, :hipe],
14+
plt_add_apps: [:dialyxir_vendored, :debugger, :dialyzer, :hipe],
1515
flags: [
1616
# enable only to verify error handling
1717
# :unmatched_returns,

mix.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
%{
22
"dialyxir": {:hex, :dialyxir, "1.1.0", "c5aab0d6e71e5522e77beff7ba9e08f8e02bad90dfbeffae60eaf0cb47e29488", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "07ea8e49c45f15264ebe6d5b93799d4dd56a44036cf42d0ad9c960bc266c0b9a"},
3+
"dialyxir_vendored": {:git, "https://github.com/elixir-lsp/dialyxir.git", "2f6f18f81f8dc4a5012b9810202e31737473874c", [branch: "vendored"]},
34
"docsh": {:hex, :docsh, "0.7.2", "f893d5317a0e14269dd7fe79cf95fb6b9ba23513da0480ec6e77c73221cae4f2", [:rebar3], [{:providers, "1.8.1", [hex: :providers, repo: "hexpm", optional: false]}], "hexpm", "4e7db461bb07540d2bc3d366b8513f0197712d0495bb85744f367d3815076134"},
45
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "8acc87c901f6fb89b0b18deb85ece6f527876964", []},
56
"erl2ex": {:git, "https://github.com/dazuma/erl2ex.git", "244c2d9ed5805ef4855a491d8616b8842fef7ca4", []},

0 commit comments

Comments
 (0)