Merge pull request #1952 from bjaglin/scala3-moreexpecttests

run more expect tests against Scala 3
scalacenter · Apr 13, 2024 · 089ec8b · 089ec8b
2 parents f51cb4a + b332360
commit 089ec8b
Show file tree

Hide file tree

Showing 49 changed files with 47 additions and 42 deletions.
diff --git a/scalafix-tests/input/src/main/scala-2/test/AnchorPatches.scala b/scalafix-tests/input/src/main/scala-2/test/AnchorPatches.scala
diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/Issue694.scala b/scalafix-tests/input/src/main/scala-2/test/escapeHatch/Issue694.scala
@@ -8,6 +8,8 @@ package test.escapeHatch
 
 import scala.collection.mutable
 
+// Fails with Scala3 dialect as the second silencer is not attached to the Defn.Val
+// https://github.com/scalameta/scalameta/issues/3689
 class Issue694 {
 
   // overlapping switches must not interfere with each other. The one with wider range wins

diff --git a/scalafix-tests/input/src/main/scala-2/test/organizeImports/ExplicitlyImportedImplicits.scala b/scalafix-tests/input/src/main/scala-2/test/organizeImports/ExplicitlyImportedImplicits.scala
@@ -10,6 +10,9 @@ import test.organizeImports.Implicits.b._
 import ExecutionContext.Implicits.global
 import test.organizeImports.Implicits.a.{nonImplicit, intImplicit, stringImplicit}
 
+// Unsupported on Scala 3
+// https://github.com/scala/scala3/issues/12766
+// https://github.com/scalacenter/scalafix/blob/f51cb4a/docs/rules/OrganizeImports.md?plain=1#L440-L444
 object ExplicitlyImportedImplicits {
   def f1()(implicit i: Int) = ???
   def f2()(implicit s: String) = ???

diff --git a/...est/removeUnused/RemoveUnusedParams.scala → ...est/removeUnused/RemoveUnusedParams.scala b/...est/removeUnused/RemoveUnusedParams.scala → ...est/removeUnused/RemoveUnusedParams.scala
@@ -3,6 +3,8 @@ rule = RemoveUnused
  */
 package test.removeUnused
 
+// Not available as of Scala 3.4.1
+// https://github.com/scalacenter/scalafix/issues/1937
 object UnusedParams {
   val f: String => Unit = unused => println("f")
   val ff = (unused: String) => println("f")

diff --git a/scalafix-tests/input/src/main/scala/test/AnchorPatches.scala b/scalafix-tests/input/src/main/scala/test/AnchorPatches.scala
@@ -0,0 +1,24 @@
+/*
+rule = [RemoveUnused]
+ */
+package test
+
+import scala.collection.AbstractMap
+import scala.collection.immutable // scalafix:ok RemoveUnusedImports
+
+import scala.collection.mutable.{ // scalafix:ok RemoveUnusedImports
+  Map,
+  Set
+}
+
+import scala.collection.mutable.{
+  Map,
+  Set
+}
+
+import scala.concurrent.duration.Duration
+
+object AnchorPatches {
+  private def d1s = Duration(1, "s")
+  private def d2s = Duration(2, "s") // scalafix:ok RemoveUnused
+}
diff --git a/...n/scala-2/test/Filename With Spaces.scala → ...ain/scala/test/Filename With Spaces.scala b/...n/scala-2/test/Filename With Spaces.scala → ...ain/scala/test/Filename With Spaces.scala
diff --git a/...input/src/main/scala-2/test/Headers.scala → ...s/input/src/main/scala/test/Headers.scala b/...input/src/main/scala-2/test/Headers.scala → ...s/input/src/main/scala/test/Headers.scala
diff --git a/...t/src/main/scala-2/test/LintAsserts.scala → ...put/src/main/scala/test/LintAsserts.scala b/...t/src/main/scala-2/test/LintAsserts.scala → ...put/src/main/scala/test/LintAsserts.scala
diff --git a/...in/scala-2/test/PatchWithEmptyRange.scala → ...main/scala/test/PatchWithEmptyRange.scala b/...in/scala-2/test/PatchWithEmptyRange.scala → ...main/scala/test/PatchWithEmptyRange.scala
diff --git a/...src/main/scala-2/test/ReplaceSymbol.scala → ...t/src/main/scala/test/ReplaceSymbol.scala b/...src/main/scala-2/test/ReplaceSymbol.scala → ...t/src/main/scala/test/ReplaceSymbol.scala
diff --git a/...t/escapeHatch/AnchorAnnotationMixed.scala → ...t/escapeHatch/AnchorAnnotationMixed.scala b/...t/escapeHatch/AnchorAnnotationMixed.scala → ...t/escapeHatch/AnchorAnnotationMixed.scala
diff --git a/.../test/escapeHatch/AnchorDescription.scala → .../test/escapeHatch/AnchorDescription.scala b/.../test/escapeHatch/AnchorDescription.scala → .../test/escapeHatch/AnchorDescription.scala
diff --git a/...a-2/test/escapeHatch/AnchorDoubleOn.scala → ...ala/test/escapeHatch/AnchorDoubleOn.scala b/...a-2/test/escapeHatch/AnchorDoubleOn.scala → ...ala/test/escapeHatch/AnchorDoubleOn.scala
diff --git a/.../scala-2/test/escapeHatch/AnchorEOF.scala → ...in/scala/test/escapeHatch/AnchorEOF.scala b/.../scala-2/test/escapeHatch/AnchorEOF.scala → ...in/scala/test/escapeHatch/AnchorEOF.scala
diff --git a/...2/test/escapeHatch/AnchorExpression.scala → ...a/test/escapeHatch/AnchorExpression.scala b/...2/test/escapeHatch/AnchorExpression.scala → ...a/test/escapeHatch/AnchorExpression.scala
@@ -17,6 +17,8 @@ Disable.symbols = [
 
 package test.escapeHatch
 
+import test.disableSyntax.DisableSyntaxMoreRules.toString
+
 object AnchorExpression {
 
   val aDummy = 0 // assert: NoDummy

diff --git a/...-2/test/escapeHatch/AnchorIntervals.scala → ...la/test/escapeHatch/AnchorIntervals.scala b/...-2/test/escapeHatch/AnchorIntervals.scala → ...la/test/escapeHatch/AnchorIntervals.scala
diff --git a/...est/escapeHatch/AnchorMultipleRules.scala → ...est/escapeHatch/AnchorMultipleRules.scala b/...est/escapeHatch/AnchorMultipleRules.scala → ...est/escapeHatch/AnchorMultipleRules.scala
@@ -17,6 +17,8 @@ Disable.symbols = [
 
 package test.escapeHatch
 
+import test.disableSyntax.DisableSyntaxMoreRules.toString
+
 object AnchorMultipleRules {
 
   // scalafix:off Disable.None, Disable.get

diff --git a/.../test/escapeHatch/AnchorOverlapping.scala → .../test/escapeHatch/AnchorOverlapping.scala b/.../test/escapeHatch/AnchorOverlapping.scala → .../test/escapeHatch/AnchorOverlapping.scala
diff --git a/...cala-2/test/escapeHatch/AnchorRange.scala → .../scala/test/escapeHatch/AnchorRange.scala b/...cala-2/test/escapeHatch/AnchorRange.scala → .../scala/test/escapeHatch/AnchorRange.scala
diff --git a/...ala-2/test/escapeHatch/AnchorUnused.scala → ...scala/test/escapeHatch/AnchorUnused.scala b/...ala-2/test/escapeHatch/AnchorUnused.scala → ...scala/test/escapeHatch/AnchorUnused.scala
diff --git a/...a-2/test/escapeHatch/AnchorWildcard.scala → ...ala/test/escapeHatch/AnchorWildcard.scala b/...a-2/test/escapeHatch/AnchorWildcard.scala → ...ala/test/escapeHatch/AnchorWildcard.scala
diff --git a/...scapeHatch/AnnotationFullyQualified.scala → ...scapeHatch/AnnotationFullyQualified.scala b/...scapeHatch/AnnotationFullyQualified.scala → ...scapeHatch/AnnotationFullyQualified.scala
diff --git a/...escapeHatch/AnnotationMultipleRules.scala → ...escapeHatch/AnnotationMultipleRules.scala b/...escapeHatch/AnnotationMultipleRules.scala → ...escapeHatch/AnnotationMultipleRules.scala
diff --git a/...escapeHatch/AnnotationPrefixedRules.scala → ...escapeHatch/AnnotationPrefixedRules.scala b/...escapeHatch/AnnotationPrefixedRules.scala → ...escapeHatch/AnnotationPrefixedRules.scala
diff --git a/...2/test/escapeHatch/AnnotationScopes.scala → ...a/test/escapeHatch/AnnotationScopes.scala b/...2/test/escapeHatch/AnnotationScopes.scala → ...a/test/escapeHatch/AnnotationScopes.scala
@@ -25,8 +25,6 @@ object AnnotationScopes {
 
   class Foo_0[DummyTypeParam] // assert: NoDummy
 
-  def dummyMacro_0: Unit = macro ??? // assert: NoDummy
-
   class DummyClass_0( // assert: NoDummy
                  val aDummy: Int, // assert: NoDummy
                  val bDummy: Int) { // assert: NoDummy
@@ -35,7 +33,7 @@ object AnnotationScopes {
     var dDummy = 0 // assert: NoDummy
 
     def this(eDummy: String, // assert: NoDummy
-             fDummy: String) { // assert: NoDummy
+             fDummy: String) = { // assert: NoDummy
       this(eDummy.toInt, fDummy.toInt) // assert: NoDummy
     }
 
@@ -70,10 +68,6 @@ object AnnotationScopes {
   // Type parameter
   class Foo_1[@SuppressWarnings(Array("NoDummy")) DummyTypeParam]
 
-  // Macro
-  @SuppressWarnings(Array("NoDummy"))
-  def dummyMacro_1: Unit = macro ???
-
   // Object
   @SuppressWarnings(Array("NoDummy"))
   object DummyObject_1 {
@@ -110,17 +104,17 @@ object AnnotationScopes {
   class DummyClass_5 { // assert: NoDummy
 
     @SuppressWarnings(Array("NoDummy"))
-    def this(eDummy: String, fDummy: String) {
-      this
+    def this(eDummy: String, fDummy: String) = {
+      this()
     }
   }
 
   // Secondary constructor parameter
   class DummyClass_6 { // assert: NoDummy
 
     def this(@SuppressWarnings(Array("NoDummy")) eDummy: String,
-             fDummy: String) { // assert: NoDummy
-      this
+             fDummy: String) = { // assert: NoDummy
+      this()
     }
   }
 

diff --git a/...2/test/escapeHatch/AnnotationUnused.scala → ...a/test/escapeHatch/AnnotationUnused.scala b/...2/test/escapeHatch/AnnotationUnused.scala → ...a/test/escapeHatch/AnnotationUnused.scala
diff --git a/...test/escapeHatch/AnnotationWildcard.scala → ...test/escapeHatch/AnnotationWildcard.scala b/...test/escapeHatch/AnnotationWildcard.scala → ...test/escapeHatch/AnnotationWildcard.scala
diff --git a/...Hatch/AnnotationWithNonLiteralValue.scala → ...Hatch/AnnotationWithNonLiteralValue.scala b/...Hatch/AnnotationWithNonLiteralValue.scala → ...Hatch/AnnotationWithNonLiteralValue.scala
diff --git a/...Imports/ExpandRelativePackageObject.scala → ...Imports/ExpandRelativePackageObject.scala b/...Imports/ExpandRelativePackageObject.scala → ...Imports/ExpandRelativePackageObject.scala
diff --git a/.../test/organizeImports/PresetDefault.scala → .../test/organizeImports/PresetDefault.scala b/.../test/organizeImports/PresetDefault.scala → .../test/organizeImports/PresetDefault.scala
diff --git a/...ganizeImports/PresetIntelliJ_2020_3.scala → ...ganizeImports/PresetIntelliJ_2020_3.scala b/...ganizeImports/PresetIntelliJ_2020_3.scala → ...ganizeImports/PresetIntelliJ_2020_3.scala
diff --git a/...test/testRules/ScalatestAutofixRule.scala → ...test/testRules/ScalatestAutofixRule.scala b/...test/testRules/ScalatestAutofixRule.scala → ...test/testRules/ScalatestAutofixRule.scala
diff --git a/...est/testRules/ScalatestAutofixRule2.scala → ...est/testRules/ScalatestAutofixRule2.scala b/...est/testRules/ScalatestAutofixRule2.scala → ...est/testRules/ScalatestAutofixRule2.scala
diff --git a/...ala-2/test/testRules/ServiceLoaders.scala → ...scala/test/testRules/ServiceLoaders.scala b/...ala-2/test/testRules/ServiceLoaders.scala → ...scala/test/testRules/ServiceLoaders.scala
diff --git a/scalafix-tests/output/src/main/scala-2/test/removeUnused/RemoveUnusedParams.scala b/scalafix-tests/output/src/main/scala-2/test/removeUnused/RemoveUnusedParams.scala
@@ -1,5 +1,7 @@
 package test.removeUnused
 
+// Not available as of Scala 3.4.1
+// https://github.com/scalacenter/scalafix/issues/1937
 object UnusedParams {
   val f: String => Unit = _ => println("f")
   val ff = (_: String) => println("f")

diff --git a/...rc/main/scala-2/com/geirsson/Future.scala → .../src/main/scala/com/geirsson/Future.scala b/...rc/main/scala-2/com/geirsson/Future.scala → .../src/main/scala/com/geirsson/Future.scala
diff --git a/.../main/scala-2/com/geirsson/fastmath.scala → ...rc/main/scala/com/geirsson/fastmath.scala b/.../main/scala-2/com/geirsson/fastmath.scala → ...rc/main/scala/com/geirsson/fastmath.scala
diff --git a/...a-2/com/geirsson/mutable/CoolBuffer.scala → ...ala/com/geirsson/mutable/CoolBuffer.scala b/...a-2/com/geirsson/mutable/CoolBuffer.scala → ...ala/com/geirsson/mutable/CoolBuffer.scala
diff --git a/...com/geirsson/mutable/unsafe/CoolMap.scala → ...com/geirsson/mutable/unsafe/CoolMap.scala b/...com/geirsson/mutable/unsafe/CoolMap.scala → ...com/geirsson/mutable/unsafe/CoolMap.scala
diff --git a/...output/src/main/scala-2/fix/package.scala → ...s/output/src/main/scala/fix/package.scala b/...output/src/main/scala-2/fix/package.scala → ...s/output/src/main/scala/fix/package.scala
diff --git a/...src/main/scala-2/test/AnchorPatches.scala → ...t/src/main/scala/test/AnchorPatches.scala b/...src/main/scala-2/test/AnchorPatches.scala → ...t/src/main/scala/test/AnchorPatches.scala
@@ -9,9 +9,8 @@ import scala.collection.mutable.{ // scalafix:ok RemoveUnusedImports
 
 
 import scala.concurrent.duration.Duration
-import scala.concurrent.duration.FiniteDuration
 
 object AnchorPatches {
-  def d1s: FiniteDuration = Duration(1, "s")
-  def d2s = Duration(2, "s") // scalafix:ok ExplicitResultTypes
+
+  private def d2s = Duration(2, "s") // scalafix:ok RemoveUnused
 }
diff --git a/...n/scala-2/test/Filename With Spaces.scala → ...ain/scala/test/Filename With Spaces.scala b/...n/scala-2/test/Filename With Spaces.scala → ...ain/scala/test/Filename With Spaces.scala
diff --git a/...utput/src/main/scala-2/test/Headers.scala → .../output/src/main/scala/test/Headers.scala b/...utput/src/main/scala-2/test/Headers.scala → .../output/src/main/scala/test/Headers.scala
diff --git a/...in/scala-2/test/PatchWithEmptyRange.scala → ...main/scala/test/PatchWithEmptyRange.scala b/...in/scala-2/test/PatchWithEmptyRange.scala → ...main/scala/test/PatchWithEmptyRange.scala
diff --git a/...src/main/scala-2/test/ReplaceSymbol.scala → ...t/src/main/scala/test/ReplaceSymbol.scala b/...src/main/scala-2/test/ReplaceSymbol.scala → ...t/src/main/scala/test/ReplaceSymbol.scala
diff --git a/scalafix-tests/output/src/main/scala/test/organizeImports/ExplicitlyImportedImplicits.scala b/scalafix-tests/output/src/main/scala/test/organizeImports/ExplicitlyImportedImplicits.scala
@@ -9,6 +9,9 @@ import ExecutionContext.Implicits.global
 import test.organizeImports.Implicits.a.intImplicit
 import test.organizeImports.Implicits.a.stringImplicit
 
+// Unsupported on Scala 3
+// https://github.com/scala/scala3/issues/12766
+// https://github.com/scalacenter/scalafix/blob/f51cb4a/docs/rules/OrganizeImports.md?plain=1#L440-L444
 object ExplicitlyImportedImplicits {
   def f1()(implicit i: Int) = ???
   def f2()(implicit s: String) = ???

diff --git a/...test/testRules/ScalatestAutofixRule.scala → ...test/testRules/ScalatestAutofixRule.scala b/...test/testRules/ScalatestAutofixRule.scala → ...test/testRules/ScalatestAutofixRule.scala
diff --git a/...est/testRules/ScalatestAutofixRule2.scala → ...est/testRules/ScalatestAutofixRule2.scala b/...est/testRules/ScalatestAutofixRule2.scala → ...est/testRules/ScalatestAutofixRule2.scala
diff --git a/...ala-2/test/testRules/ServiceLoaders.scala → ...scala/test/testRules/ServiceLoaders.scala b/...ala-2/test/testRules/ServiceLoaders.scala → ...scala/test/testRules/ServiceLoaders.scala