From a235a24ad0ab0d1d2090ddfaefb2523422bcd96b Mon Sep 17 00:00:00 2001 From: Lukasz Samson Date: Fri, 27 Sep 2024 22:50:48 +0200 Subject: [PATCH] exclude more tests on < 1.16 --- test/elixir_sense/core/binding_test.exs | 12 +- test/elixir_sense/core/compiler_test.exs | 138 ++++++++++-------- .../metadata_builder/error_recovery_test.exs | 16 +- .../core/metadata_builder_test.exs | 2 +- 4 files changed, 92 insertions(+), 76 deletions(-) diff --git a/test/elixir_sense/core/binding_test.exs b/test/elixir_sense/core/binding_test.exs index 8e20fce4..0d27e5c0 100644 --- a/test/elixir_sense/core/binding_test.exs +++ b/test/elixir_sense/core/binding_test.exs @@ -122,19 +122,11 @@ defmodule ElixirSense.Core.BindingTest do assert { :struct, [ - {:__struct__, {:atom, URI}}, - {:port, nil}, - {:scheme, nil}, - {:path, nil}, - {:host, nil}, - {:userinfo, nil}, - {:fragment, nil}, - {:query, nil}, - {:authority, nil} + {:__struct__, {:atom, URI}} | _ ], {:atom, URI}, nil - } == + } = Binding.expand( @env, { diff --git a/test/elixir_sense/core/compiler_test.exs b/test/elixir_sense/core/compiler_test.exs index b6adafe8..89f2648e 100644 --- a/test/elixir_sense/core/compiler_test.exs +++ b/test/elixir_sense/core/compiler_test.exs @@ -298,28 +298,34 @@ if true or Version.match?(System.version(), ">= 1.17.0-dev") do assert_expansion("__ENV__.foo") end - test "expands quote literal" do - assert_expansion("quote do: 2") - assert_expansion("quote do: :foo") - assert_expansion("quote do: \"asd\"") - assert_expansion("quote do: []") - assert_expansion("quote do: [12]") - assert_expansion("quote do: [12, 34]") - assert_expansion("quote do: [12 | 34]") - assert_expansion("quote do: [12 | [34]]") - assert_expansion("quote do: {12}") - assert_expansion("quote do: {12, 34}") - assert_expansion("quote do: %{a: 12}") + if Version.match?(System.version(), ">= 1.16.0") do + test "expands quote literal" do + assert_expansion("quote do: 2") + assert_expansion("quote do: :foo") + assert_expansion("quote do: \"asd\"") + assert_expansion("quote do: []") + assert_expansion("quote do: [12]") + assert_expansion("quote do: [12, 34]") + assert_expansion("quote do: [12 | 34]") + assert_expansion("quote do: [12 | [34]]") + assert_expansion("quote do: {12}") + assert_expansion("quote do: {12, 34}") + assert_expansion("quote do: %{a: 12}") + end end - test "expands quote variable" do - assert_expansion("quote do: abc") + if Version.match?(System.version(), ">= 1.16.0") do + test "expands quote variable" do + assert_expansion("quote do: abc") + end end - test "expands quote quote" do - assert_expansion(""" - quote do: (quote do: 1) - """) + if Version.match?(System.version(), ">= 1.16.0") do + test "expands quote quote" do + assert_expansion(""" + quote do: (quote do: 1) + """) + end end test "expands quote block" do @@ -348,36 +354,44 @@ if true or Version.match?(System.version(), ">= 1.17.0-dev") do """) end - test "expands quote unquote_splicing" do - assert_expansion(""" - a = [1, 2, 3] - quote do: (unquote_splicing(a)) - """) + if Version.match?(System.version(), ">= 1.16.0") do + test "expands quote unquote_splicing" do + assert_expansion(""" + a = [1, 2, 3] + quote do: (unquote_splicing(a)) + """) + end end - test "expands quote unquote_splicing in list" do - assert_expansion(""" - a = [1, 2, 3] - quote do: [unquote_splicing(a) | [1]] - """) + if Version.match?(System.version(), ">= 1.16.0") do + test "expands quote unquote_splicing in list" do + assert_expansion(""" + a = [1, 2, 3] + quote do: [unquote_splicing(a) | [1]] + """) - assert_expansion(""" - a = [1, 2, 3] - quote do: [1 | unquote_splicing(a)] - """) + assert_expansion(""" + a = [1, 2, 3] + quote do: [1 | unquote_splicing(a)] + """) + end end - test "expands quote alias" do - assert_expansion("quote do: Date") - assert_expansion("quote do: Elixir.Date") - assert_expansion("quote do: String.Chars") - assert_expansion("alias String.Chars; quote do: Chars") - assert_expansion("alias String.Chars; quote do: Chars.foo().A") + if Version.match?(System.version(), ">= 1.16.0") do + test "expands quote alias" do + assert_expansion("quote do: Date") + assert_expansion("quote do: Elixir.Date") + assert_expansion("quote do: String.Chars") + assert_expansion("alias String.Chars; quote do: Chars") + assert_expansion("alias String.Chars; quote do: Chars.foo().A") + end end - test "expands quote import" do - assert_expansion("quote do: inspect(1)") - assert_expansion("quote do: &inspect/1") + if Version.match?(System.version(), ">= 1.16.0") do + test "expands quote import" do + assert_expansion("quote do: inspect(1)") + assert_expansion("quote do: &inspect/1") + end end if Version.match?(System.version(), ">= 1.17.0") do @@ -393,12 +407,14 @@ if true or Version.match?(System.version(), ">= 1.17.0-dev") do end end - test "expands quote with unquote false" do - assert_expansion(""" - quote unquote: false do - unquote("hello") + if Version.match?(System.version(), ">= 1.16.0") do + test "expands quote with unquote false" do + assert_expansion(""" + quote unquote: false do + unquote("hello") + end + """) end - """) end if Version.match?(System.version(), ">= 1.17.0") do @@ -409,22 +425,28 @@ if true or Version.match?(System.version(), ">= 1.17.0-dev") do end end - test "expands quote with line" do - assert_expansion(""" - quote line: 123, do: bar(1, 2, 3) - """) + if Version.match?(System.version(), ">= 1.16.0") do + test "expands quote with line" do + assert_expansion(""" + quote line: 123, do: bar(1, 2, 3) + """) + end end - test "expands quote with location: keep" do - assert_expansion(""" - quote location: :keep, do: bar(1, 2, 3) - """) + if Version.match?(System.version(), ">= 1.16.0") do + test "expands quote with location: keep" do + assert_expansion(""" + quote location: :keep, do: bar(1, 2, 3) + """) + end end - test "expands quote with context" do - assert_expansion(""" - quote context: Foo, do: abc = 3 - """) + if Version.match?(System.version(), ">= 1.16.0") do + test "expands quote with context" do + assert_expansion(""" + quote context: Foo, do: abc = 3 + """) + end end test "expands &super" do diff --git a/test/elixir_sense/core/metadata_builder/error_recovery_test.exs b/test/elixir_sense/core/metadata_builder/error_recovery_test.exs index fe485472..d5e8280d 100644 --- a/test/elixir_sense/core/metadata_builder/error_recovery_test.exs +++ b/test/elixir_sense/core/metadata_builder/error_recovery_test.exs @@ -2141,14 +2141,16 @@ defmodule ElixirSense.Core.MetadataBuilder.ErrorRecoveryTest do assert env.typespec == {:foo, 0} end - test "in type after :: type with fun ( nex arg" do - code = """ - defmodule Abc do - @type foo :: (bar, \ - """ + if Version.match?(System.version(), ">= 1.16.0") do + test "in type after :: type with fun ( nex arg" do + code = """ + defmodule Abc do + @type foo :: (bar, \ + """ - assert {_, env} = get_cursor_env(code) - assert env.typespec == {:foo, 0} + assert {_, env} = get_cursor_env(code) + assert env.typespec == {:foo, 0} + end end test "in type after :: type with map empty" do diff --git a/test/elixir_sense/core/metadata_builder_test.exs b/test/elixir_sense/core/metadata_builder_test.exs index 4dbcdec2..011b9065 100644 --- a/test/elixir_sense/core/metadata_builder_test.exs +++ b/test/elixir_sense/core/metadata_builder_test.exs @@ -8037,7 +8037,7 @@ defmodule ElixirSense.Core.MetadataBuilderTest do doc: "", meta: %{hidden: true} } - } == state.types + } = state.types end test "registers incomplete types" do