From 26d13c9004d14c155b1f84abcdd3ccc4e30cee26 Mon Sep 17 00:00:00 2001 From: rochala Date: Tue, 3 Oct 2023 15:40:36 +0200 Subject: [PATCH] Improve SemVer creation, fix test tags --- .../scala/meta/internal/semver/SemVer.scala | 5 +-- .../test/scala/tests/pc/CompletionSuite.scala | 32 +++++++++---------- .../tests/pc/CompletionWorkspaceSuite.scala | 2 +- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/mtags-shared/src/main/scala/scala/meta/internal/semver/SemVer.scala b/mtags-shared/src/main/scala/scala/meta/internal/semver/SemVer.scala index 0350ce64067..388e46e73c2 100644 --- a/mtags-shared/src/main/scala/scala/meta/internal/semver/SemVer.scala +++ b/mtags-shared/src/main/scala/scala/meta/internal/semver/SemVer.scala @@ -59,10 +59,7 @@ object SemVer { } .getOrElse((None, None)) // specific condition for Scala 3 nightlies - 3.2.0-RC1-bin-20220307-6dc591a-NIGHTLY - val date = - if (parts.lift(7).contains("NIGHTLY")) - parts.lift(5).flatMap(d => Try(d.toInt).toOption) - else None + val date = parts.lift(5).flatMap(d => Try(d.toInt).toOption) Version(major, minor, patch, rc, milestone, date) } diff --git a/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala index d9c0f8a9b7a..c60486d5ea0 100644 --- a/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala +++ b/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala @@ -1729,7 +1729,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-scope".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|trait Foo |object T: @@ -1741,7 +1741,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-symbol-search".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|object T: | extension (x: ListBuffe@@) @@ -1753,7 +1753,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-type-parameter".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|trait Foo |object T: @@ -1765,7 +1765,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-type-parameter-symbol-search".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|object T: | extension [A <: ListBuffe@@] @@ -1777,7 +1777,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-using-param-clause".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|trait Foo |object T: @@ -1789,7 +1789,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-mix-1".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|trait Foo |object T: @@ -1801,7 +1801,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-mix-2".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|trait Foo |object T: @@ -1813,7 +1813,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-mix-3".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|trait Foo |object T: @@ -1825,7 +1825,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-mix-4".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|trait Foo |object T: @@ -1837,7 +1837,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-mix-5".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|trait Foo |object T: @@ -1849,7 +1849,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-mix-6".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|trait Foo |object T: @@ -1861,7 +1861,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-mix-7".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|trait Foo |object T: @@ -1873,7 +1873,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-select".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|object Test: | class TestSelect() @@ -1886,7 +1886,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-select-mix-1".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|object Test: | class TestSelect() @@ -1899,7 +1899,7 @@ class CompletionSuite extends BaseCompletionSuite { check( "extension-definition-select-mix-2".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|object Test: | class TestSelect[T]() @@ -1912,7 +1912,7 @@ class CompletionSuite extends BaseCompletionSuite { ) checkEdit( - "no-square-brackets", + "no-square-brackets".tag(IgnoreScala2), """|object O: | val a = List.appl@@ |""".stripMargin, diff --git a/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala index 2e5acdea7d8..8d4bb54bec5 100644 --- a/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala +++ b/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala @@ -343,7 +343,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite { checkEdit( "match-typed".tag( - IgnoreScalaVersion.for3LessThan("3.4.0-RC1-bin-20231004") + IgnoreScalaVersion.forLessThan("3.4.0-RC1-bin-20231004") ), """|object Main { | def foo(): Unit = null match {