From aae50a2db8c16e65ef5794fd9e9f78e9b22fe66a Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Fri, 12 Jan 2024 20:46:52 +0100 Subject: [PATCH] chore: Unignore tests after backporting --- .../Scala3DocumentHighlightSuite.scala | 8 +-- .../scala/tests/pc/CompletionArgSuite.scala | 10 ++-- .../scala/tests/pc/CompletionIssueSuite.scala | 2 +- .../tests/pc/CompletionKeywordSuite.scala | 59 ++++++++++++++++--- .../tests/pc/CompletionScala3Suite.scala | 2 +- .../test/scala/tests/pc/CompletionSuite.scala | 23 ++------ .../tests/pc/SyntheticDecorationsSuite.scala | 8 +-- 7 files changed, 68 insertions(+), 44 deletions(-) diff --git a/tests/cross/src/test/scala/tests/highlight/Scala3DocumentHighlightSuite.scala b/tests/cross/src/test/scala/tests/highlight/Scala3DocumentHighlightSuite.scala index dd22d8111a8..e0475eea505 100644 --- a/tests/cross/src/test/scala/tests/highlight/Scala3DocumentHighlightSuite.scala +++ b/tests/cross/src/test/scala/tests/highlight/Scala3DocumentHighlightSuite.scala @@ -268,7 +268,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite { ) check( - "type-params-in-enum".tag(IgnoreForScala3CompilerPC), + "type-params-in-enum", """|enum MyOption[+<>]: | case MySome(value: <>) | case MyNone @@ -276,7 +276,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite { ) check( - "type-params-in-enum2".tag(IgnoreForScala3CompilerPC), + "type-params-in-enum2", """|enum MyOption[+<>]: | case MySome(value: <>) | case MyNone @@ -284,7 +284,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite { ) check( - "type-params-in-enum3".tag(IgnoreForScala3CompilerPC), + "type-params-in-enum3", """|enum MyOption[<>](v: <>): | def get: <> = ??? | case MySome[AA](value: AA) extends MyOption[Int](1) @@ -292,7 +292,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite { ) check( - "type-params-in-enum4".tag(IgnoreForScala3CompilerPC), + "type-params-in-enum4", """|enum MyOption[+<>]: | def get: <> = ??? | case MySome(value: <>) diff --git a/tests/cross/src/test/scala/tests/pc/CompletionArgSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionArgSuite.scala index d5ccc0891fc..f35b03a76e8 100644 --- a/tests/cross/src/test/scala/tests/pc/CompletionArgSuite.scala +++ b/tests/cross/src/test/scala/tests/pc/CompletionArgSuite.scala @@ -1149,7 +1149,7 @@ class CompletionArgSuite extends BaseCompletionSuite { ) check( - "second-first".tag(IgnoreForScala3CompilerPC), + "second-first", """|object Main { | def foo(aaa: Int, bbb: Int, ccc: Int) = aaa + bbb + ccc | val k = foo ( @@ -1164,7 +1164,7 @@ class CompletionArgSuite extends BaseCompletionSuite { ) check( - "second-first2".tag(IgnoreForScala3CompilerPC), + "second-first2", """|object Main { | def foo(aaa: Int, bbb: Int, ccc: Int) = aaa + bbb + ccc | val k = foo ( @@ -1180,7 +1180,7 @@ class CompletionArgSuite extends BaseCompletionSuite { ) check( - "second-first3".tag(IgnoreForScala3CompilerPC), + "second-first3", """|object Main { | def foo(ddd: Int)(aaa: Int, bbb: Int, ccc: Int) = aaa + bbb + ccc | val k = foo(123)( @@ -1196,7 +1196,7 @@ class CompletionArgSuite extends BaseCompletionSuite { ) check( - "second-first4".tag(IgnoreScala2).tag(IgnoreForScala3CompilerPC), + "second-first4".tag(IgnoreScala2), """|object O: | val hello: (x: Int, y: Int) => Unit = (x, _) => println(x) |val k = O.hello(y = 1, @@) @@ -1207,7 +1207,7 @@ class CompletionArgSuite extends BaseCompletionSuite { ) check( - "second-first5".tag(IgnoreScala2).tag(IgnoreForScala3CompilerPC), + "second-first5".tag(IgnoreScala2), """|val hello: (x: Int) => Int => (str: String, ccc: String) => Unit = x => j => (str, _) => println(str) |val k = hello(x = 1)(2)(ccc = "abc", @@) |""".stripMargin, diff --git a/tests/cross/src/test/scala/tests/pc/CompletionIssueSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionIssueSuite.scala index 1c84e660f82..9199542d44b 100644 --- a/tests/cross/src/test/scala/tests/pc/CompletionIssueSuite.scala +++ b/tests/cross/src/test/scala/tests/pc/CompletionIssueSuite.scala @@ -20,7 +20,7 @@ class CompletionIssueSuite extends BaseCompletionSuite { } check( - "comparison".tag(IgnoreForScala3CompilerPC), + "comparison", """package a |object w { | abstract class T(x: Int) { diff --git a/tests/cross/src/test/scala/tests/pc/CompletionKeywordSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionKeywordSuite.scala index b04f14fb61c..2c0ba734618 100644 --- a/tests/cross/src/test/scala/tests/pc/CompletionKeywordSuite.scala +++ b/tests/cross/src/test/scala/tests/pc/CompletionKeywordSuite.scala @@ -3,8 +3,6 @@ package tests.pc import tests.BaseCompletionSuite class CompletionKeywordSuite extends BaseCompletionSuite { - override protected def ignoreScalaVersion: Option[IgnoreScalaVersion] = - Some(IgnoreForScala3CompilerPC) check( "super-template", @@ -42,7 +40,10 @@ class CompletionKeywordSuite extends BaseCompletionSuite { compat = Map( "3" -> """|transient scala (commit: '') |transparentTrait(): transparentTrait (commit: '') - |transparentTrait - scala.annotation (commit: '')""".stripMargin + |transparentTrait - scala.annotation (commit: '')""".stripMargin, + "3.4" -> """|transient scala (commit: '') + |transparentTrait - scala.annotation (commit: '') + |""".stripMargin ), includeCommitCharacter = true ) @@ -66,7 +67,11 @@ class CompletionKeywordSuite extends BaseCompletionSuite { compat = Map( "3" -> """|transient scala (commit: '') |transparentTrait(): transparentTrait (commit: '') - |transparentTrait - scala.annotation (commit: '')""".stripMargin + |transparentTrait - scala.annotation (commit: '')""".stripMargin, + "3.4" -> + """|transient scala (commit: '') + |transparentTrait - scala.annotation (commit: '') + |""".stripMargin ), includeCommitCharacter = true ) @@ -493,7 +498,11 @@ class CompletionKeywordSuite extends BaseCompletionSuite { |var |varargs(): varargs |varargs - scala.annotation - |""".stripMargin + |""".stripMargin, + "3.4" -> """|val + |var + |varargs - scala.annotation + |""".stripMargin ) ) @@ -555,7 +564,25 @@ class CompletionKeywordSuite extends BaseCompletionSuite { includeCommitCharacter = true, compat = Map( "2" -> "", - "3.3" -> """|using (commit: '') + "3.3.0" -> """|using (commit: '') + |unsafeExceptions scala (commit: '') + |unchecked scala (commit: '') + |unsafe - scala.caps (commit: '') + |unsafeNulls - scala.runtime.stdLibPatches.language (commit: '') + |""".stripMargin, + "3.3.1" -> """|using (commit: '') + |unsafeExceptions scala (commit: '') + |unchecked scala (commit: '') + |unsafe - scala.caps (commit: '') + |unsafeNulls - scala.runtime.stdLibPatches.language (commit: '') + |""".stripMargin, + "3.3.2" -> """|using (commit: '') + |unsafeExceptions scala (commit: '') + |unchecked scala (commit: '') + |unsafe - caps (commit: '') + |unsafeNulls - scala.runtime.stdLibPatches.language (commit: '') + |""".stripMargin, + "3.4" -> """|using (commit: '') |unsafeExceptions scala (commit: '') |unchecked scala (commit: '') |unsafe - scala.caps (commit: '') @@ -577,11 +604,27 @@ class CompletionKeywordSuite extends BaseCompletionSuite { |unsafeNulls - scala.runtime.stdLibPatches.language |unshared(): unshared |uncheckedStable(): uncheckedStable""".stripMargin, - "3.3" -> """|unsafeExceptions scala + "3.3.0" -> """|unsafeExceptions scala + |unchecked scala + |unsafe - scala.caps + |unsafeNulls - scala.runtime.stdLibPatches.language + |unshared(): unshared""".stripMargin, + "3.3.1" -> """|unsafeExceptions scala + |unchecked scala + |unsafe - scala.caps + |unsafeNulls - scala.runtime.stdLibPatches.language + |unshared(): unshared""".stripMargin, + "3.3.2" -> """|unsafeExceptions scala + |unchecked scala + |unsafe - caps + |unsafeNulls - scala.runtime.stdLibPatches.language + |unshared(): unshared""".stripMargin, + "3.4" -> """|unsafeExceptions scala |unchecked scala |unsafe - scala.caps |unsafeNulls - scala.runtime.stdLibPatches.language - |unshared(): unshared""".stripMargin + |unused - scala.annotation + |""".stripMargin ), topLines = Some(5) ) diff --git a/tests/cross/src/test/scala/tests/pc/CompletionScala3Suite.scala b/tests/cross/src/test/scala/tests/pc/CompletionScala3Suite.scala index 180e49decc6..ab878f63d38 100644 --- a/tests/cross/src/test/scala/tests/pc/CompletionScala3Suite.scala +++ b/tests/cross/src/test/scala/tests/pc/CompletionScala3Suite.scala @@ -91,7 +91,7 @@ class CompletionScala3Suite extends BaseCompletionSuite { check( "multi-export".tag( - IgnoreScalaVersion.forLessThan("3.2.2").and(IgnoreForScala3CompilerPC) + IgnoreScalaVersion.forLessThan("3.2.2") ), """|export scala.collection.{AbstractMap, Set@@} |""".stripMargin, diff --git a/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala index 97f8d8f4dc6..0fabcf864b9 100644 --- a/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala +++ b/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala @@ -429,7 +429,7 @@ class CompletionSuite extends BaseCompletionSuite { ) check( - "import-star-multi-import".tag(IgnoreForScala3CompilerPC), + "import-star-multi-import", """ |import scala.collection.immutable.List.{range => r, *@@} |""".stripMargin, @@ -1020,14 +1020,6 @@ class CompletionSuite extends BaseCompletionSuite { """|Some(value) scala |Some scala |Some[A](value: A): Some[A] - |""".stripMargin, - scala3PresentationCompilerVersion -> - """|Some(value) scala - |Some scala - |Some[A](value: A): Some[A] - |SomeToExpr(x: Some[T])(using Quotes): Expr[Some[T]] - |SomeToExpr[T: Type: ToExpr]: SomeToExpr[T] - |SomeFromExpr[T](using Type[T], FromExpr[T]): SomeFromExpr[T] |""".stripMargin ) ) @@ -1045,13 +1037,6 @@ class CompletionSuite extends BaseCompletionSuite { "3" -> """|Some scala |Some[A](value: A): Some[A] - |""".stripMargin, - scala3PresentationCompilerVersion -> - """|Some scala - |Some[A](value: A): Some[A] - |SomeToExpr(x: Some[T])(using Quotes): Expr[Some[T]] - |SomeToExpr[T: Type: ToExpr]: SomeToExpr[T] - |SomeFromExpr[T](using Type[T], FromExpr[T]): SomeFromExpr[T] |""".stripMargin ) ) @@ -2153,7 +2138,7 @@ class CompletionSuite extends BaseCompletionSuite { ) check( - "multi-imports".tag(IgnoreForScala3CompilerPC), + "multi-imports", """|import scala.collection.{AbstractMap, Set@@} |""".stripMargin, """|Set scala.collection @@ -2178,7 +2163,7 @@ class CompletionSuite extends BaseCompletionSuite { ) check( - "multi-imports-empty-query".tag(IgnoreForScala3CompilerPC), + "multi-imports-empty-query", """|import scala.collection.{AbstractMap, @@} |""".stripMargin, """|+: scala.collection @@ -2206,7 +2191,7 @@ class CompletionSuite extends BaseCompletionSuite { ) check( - "import-rename".tag(IgnoreForScala3CompilerPC), + "import-rename", """|import scala.collection.{AbstractMap => Set@@} |""".stripMargin, "" diff --git a/tests/cross/src/test/scala/tests/pc/SyntheticDecorationsSuite.scala b/tests/cross/src/test/scala/tests/pc/SyntheticDecorationsSuite.scala index ca6ae36fbb4..1edf9c3f305 100644 --- a/tests/cross/src/test/scala/tests/pc/SyntheticDecorationsSuite.scala +++ b/tests/cross/src/test/scala/tests/pc/SyntheticDecorationsSuite.scala @@ -6,10 +6,6 @@ import tests.BaseSyntheticDecorationsSuite class SyntheticDecorationsSuite extends BaseSyntheticDecorationsSuite { - override protected def ignoreScalaVersion: Option[IgnoreScalaVersion] = Some( - IgnoreForScala3CompilerPC - ) - check( "type-params", """|object Main { @@ -568,7 +564,7 @@ class SyntheticDecorationsSuite extends BaseSyntheticDecorationsSuite { ) check( - "val-def-with-bind", + "val-def-with-bind".tag(IgnoreForScala3CompilerPC), """|object O { | val tupleBound @ (one, two) = ("1", "2") |} @@ -580,7 +576,7 @@ class SyntheticDecorationsSuite extends BaseSyntheticDecorationsSuite { ) check( - "val-def-with-bind-and-comment", + "val-def-with-bind-and-comment".tag(IgnoreForScala3CompilerPC), """|object O { | val tupleBound /* comment */ @ (one, two) = ("1", "2") |}