diff --git a/scalafix-tests/input/src/main/scala-2/test/AnchorPatches.scala b/scalafix-tests/input/src/main/scala-2/test/AnchorPatches.scala deleted file mode 100644 index 06ed7b6cc..000000000 --- a/scalafix-tests/input/src/main/scala-2/test/AnchorPatches.scala +++ /dev/null @@ -1,28 +0,0 @@ -/* -rule = [RemoveUnused, ExplicitResultTypes] -ExplicitResultTypes.memberKind = [Def] -ExplicitResultTypes.memberVisibility = [Public] -unsafeShortenNames = true -ExplicitResultTypes.unsafeShortenNames = true - */ -package test - -import scala.collection.mutable -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 { - def d1s = Duration(1, "s") - def d2s = Duration(2, "s") // scalafix:ok ExplicitResultTypes -} \ No newline at end of file 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 index 0972ebe23..0ccd7ce40 100644 --- 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 index 774d24275..279071e98 100644 --- 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/scalafix-tests/input/src/main/scala/test/removeUnused/RemoveUnusedParams.scala b/scalafix-tests/input/src/main/scala-2/test/removeUnused/RemoveUnusedParams.scala similarity index 77% rename from scalafix-tests/input/src/main/scala/test/removeUnused/RemoveUnusedParams.scala rename to scalafix-tests/input/src/main/scala-2/test/removeUnused/RemoveUnusedParams.scala index 16e3a62ca..7d6cf1ddc 100644 --- a/scalafix-tests/input/src/main/scala/test/removeUnused/RemoveUnusedParams.scala +++ b/scalafix-tests/input/src/main/scala-2/test/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 new file mode 100644 index 000000000..d392e1f74 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/scalafix-tests/input/src/main/scala-2/test/Filename With Spaces.scala b/scalafix-tests/input/src/main/scala/test/Filename With Spaces.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/Filename With Spaces.scala rename to scalafix-tests/input/src/main/scala/test/Filename With Spaces.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/Headers.scala b/scalafix-tests/input/src/main/scala/test/Headers.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/Headers.scala rename to scalafix-tests/input/src/main/scala/test/Headers.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/LintAsserts.scala b/scalafix-tests/input/src/main/scala/test/LintAsserts.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/LintAsserts.scala rename to scalafix-tests/input/src/main/scala/test/LintAsserts.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/PatchWithEmptyRange.scala b/scalafix-tests/input/src/main/scala/test/PatchWithEmptyRange.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/PatchWithEmptyRange.scala rename to scalafix-tests/input/src/main/scala/test/PatchWithEmptyRange.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/ReplaceSymbol.scala b/scalafix-tests/input/src/main/scala/test/ReplaceSymbol.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/ReplaceSymbol.scala rename to scalafix-tests/input/src/main/scala/test/ReplaceSymbol.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorAnnotationMixed.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorAnnotationMixed.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorAnnotationMixed.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorAnnotationMixed.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorDescription.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorDescription.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorDescription.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorDescription.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorDoubleOn.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorDoubleOn.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorDoubleOn.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorDoubleOn.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorEOF.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorEOF.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorEOF.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorEOF.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorExpression.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorExpression.scala similarity index 92% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorExpression.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorExpression.scala index 0f67cbd96..059af8575 100644 --- a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorExpression.scala +++ b/scalafix-tests/input/src/main/scala/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/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorIntervals.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorIntervals.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorIntervals.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorIntervals.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorMultipleRules.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorMultipleRules.scala similarity index 88% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorMultipleRules.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorMultipleRules.scala index 0de4dd9cf..f6ffe4d07 100644 --- a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorMultipleRules.scala +++ b/scalafix-tests/input/src/main/scala/test/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/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorOverlapping.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorOverlapping.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorOverlapping.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorOverlapping.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorRange.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorRange.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorRange.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorRange.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorUnused.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorUnused.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorUnused.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorUnused.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorWildcard.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorWildcard.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnchorWildcard.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnchorWildcard.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationFullyQualified.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationFullyQualified.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationFullyQualified.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationFullyQualified.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationMultipleRules.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationMultipleRules.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationMultipleRules.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationMultipleRules.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationPrefixedRules.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationPrefixedRules.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationPrefixedRules.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationPrefixedRules.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationScopes.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationScopes.scala similarity index 93% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationScopes.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationScopes.scala index a2b79e50d..439ec0553 100644 --- a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationScopes.scala +++ b/scalafix-tests/input/src/main/scala/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,8 +104,8 @@ object AnnotationScopes { class DummyClass_5 { // assert: NoDummy @SuppressWarnings(Array("NoDummy")) - def this(eDummy: String, fDummy: String) { - this + def this(eDummy: String, fDummy: String) = { + this() } } @@ -119,8 +113,8 @@ object AnnotationScopes { 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/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationUnused.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationUnused.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationUnused.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationUnused.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationWildcard.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationWildcard.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationWildcard.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationWildcard.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationWithNonLiteralValue.scala b/scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationWithNonLiteralValue.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/escapeHatch/AnnotationWithNonLiteralValue.scala rename to scalafix-tests/input/src/main/scala/test/escapeHatch/AnnotationWithNonLiteralValue.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/organizeImports/ExpandRelativePackageObject.scala b/scalafix-tests/input/src/main/scala/test/organizeImports/ExpandRelativePackageObject.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/organizeImports/ExpandRelativePackageObject.scala rename to scalafix-tests/input/src/main/scala/test/organizeImports/ExpandRelativePackageObject.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/organizeImports/PresetDefault.scala b/scalafix-tests/input/src/main/scala/test/organizeImports/PresetDefault.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/organizeImports/PresetDefault.scala rename to scalafix-tests/input/src/main/scala/test/organizeImports/PresetDefault.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/organizeImports/PresetIntelliJ_2020_3.scala b/scalafix-tests/input/src/main/scala/test/organizeImports/PresetIntelliJ_2020_3.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/organizeImports/PresetIntelliJ_2020_3.scala rename to scalafix-tests/input/src/main/scala/test/organizeImports/PresetIntelliJ_2020_3.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/testRules/ScalatestAutofixRule.scala b/scalafix-tests/input/src/main/scala/test/testRules/ScalatestAutofixRule.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/testRules/ScalatestAutofixRule.scala rename to scalafix-tests/input/src/main/scala/test/testRules/ScalatestAutofixRule.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/testRules/ScalatestAutofixRule2.scala b/scalafix-tests/input/src/main/scala/test/testRules/ScalatestAutofixRule2.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/testRules/ScalatestAutofixRule2.scala rename to scalafix-tests/input/src/main/scala/test/testRules/ScalatestAutofixRule2.scala diff --git a/scalafix-tests/input/src/main/scala-2/test/testRules/ServiceLoaders.scala b/scalafix-tests/input/src/main/scala/test/testRules/ServiceLoaders.scala similarity index 100% rename from scalafix-tests/input/src/main/scala-2/test/testRules/ServiceLoaders.scala rename to scalafix-tests/input/src/main/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 index a6cd47c05..a8084d054 100644 --- 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/scalafix-tests/output/src/main/scala-2/com/geirsson/Future.scala b/scalafix-tests/output/src/main/scala/com/geirsson/Future.scala similarity index 100% rename from scalafix-tests/output/src/main/scala-2/com/geirsson/Future.scala rename to scalafix-tests/output/src/main/scala/com/geirsson/Future.scala diff --git a/scalafix-tests/output/src/main/scala-2/com/geirsson/fastmath.scala b/scalafix-tests/output/src/main/scala/com/geirsson/fastmath.scala similarity index 100% rename from scalafix-tests/output/src/main/scala-2/com/geirsson/fastmath.scala rename to scalafix-tests/output/src/main/scala/com/geirsson/fastmath.scala diff --git a/scalafix-tests/output/src/main/scala-2/com/geirsson/mutable/CoolBuffer.scala b/scalafix-tests/output/src/main/scala/com/geirsson/mutable/CoolBuffer.scala similarity index 100% rename from scalafix-tests/output/src/main/scala-2/com/geirsson/mutable/CoolBuffer.scala rename to scalafix-tests/output/src/main/scala/com/geirsson/mutable/CoolBuffer.scala diff --git a/scalafix-tests/output/src/main/scala-2/com/geirsson/mutable/unsafe/CoolMap.scala b/scalafix-tests/output/src/main/scala/com/geirsson/mutable/unsafe/CoolMap.scala similarity index 100% rename from scalafix-tests/output/src/main/scala-2/com/geirsson/mutable/unsafe/CoolMap.scala rename to scalafix-tests/output/src/main/scala/com/geirsson/mutable/unsafe/CoolMap.scala diff --git a/scalafix-tests/output/src/main/scala-2/fix/package.scala b/scalafix-tests/output/src/main/scala/fix/package.scala similarity index 100% rename from scalafix-tests/output/src/main/scala-2/fix/package.scala rename to scalafix-tests/output/src/main/scala/fix/package.scala diff --git a/scalafix-tests/output/src/main/scala-2/test/AnchorPatches.scala b/scalafix-tests/output/src/main/scala/test/AnchorPatches.scala similarity index 60% rename from scalafix-tests/output/src/main/scala-2/test/AnchorPatches.scala rename to scalafix-tests/output/src/main/scala/test/AnchorPatches.scala index 9f399bd14..51b3ae789 100644 --- a/scalafix-tests/output/src/main/scala-2/test/AnchorPatches.scala +++ b/scalafix-tests/output/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 } \ No newline at end of file diff --git a/scalafix-tests/output/src/main/scala-2/test/Filename With Spaces.scala b/scalafix-tests/output/src/main/scala/test/Filename With Spaces.scala similarity index 100% rename from scalafix-tests/output/src/main/scala-2/test/Filename With Spaces.scala rename to scalafix-tests/output/src/main/scala/test/Filename With Spaces.scala diff --git a/scalafix-tests/output/src/main/scala-2/test/Headers.scala b/scalafix-tests/output/src/main/scala/test/Headers.scala similarity index 100% rename from scalafix-tests/output/src/main/scala-2/test/Headers.scala rename to scalafix-tests/output/src/main/scala/test/Headers.scala diff --git a/scalafix-tests/output/src/main/scala-2/test/PatchWithEmptyRange.scala b/scalafix-tests/output/src/main/scala/test/PatchWithEmptyRange.scala similarity index 100% rename from scalafix-tests/output/src/main/scala-2/test/PatchWithEmptyRange.scala rename to scalafix-tests/output/src/main/scala/test/PatchWithEmptyRange.scala diff --git a/scalafix-tests/output/src/main/scala-2/test/ReplaceSymbol.scala b/scalafix-tests/output/src/main/scala/test/ReplaceSymbol.scala similarity index 100% rename from scalafix-tests/output/src/main/scala-2/test/ReplaceSymbol.scala rename to scalafix-tests/output/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 index 5115ab564..3f22f0a60 100644 --- 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/scalafix-tests/output/src/main/scala-2/test/testRules/ScalatestAutofixRule.scala b/scalafix-tests/output/src/main/scala/test/testRules/ScalatestAutofixRule.scala similarity index 100% rename from scalafix-tests/output/src/main/scala-2/test/testRules/ScalatestAutofixRule.scala rename to scalafix-tests/output/src/main/scala/test/testRules/ScalatestAutofixRule.scala diff --git a/scalafix-tests/output/src/main/scala-2/test/testRules/ScalatestAutofixRule2.scala b/scalafix-tests/output/src/main/scala/test/testRules/ScalatestAutofixRule2.scala similarity index 100% rename from scalafix-tests/output/src/main/scala-2/test/testRules/ScalatestAutofixRule2.scala rename to scalafix-tests/output/src/main/scala/test/testRules/ScalatestAutofixRule2.scala diff --git a/scalafix-tests/output/src/main/scala-2/test/testRules/ServiceLoaders.scala b/scalafix-tests/output/src/main/scala/test/testRules/ServiceLoaders.scala similarity index 100% rename from scalafix-tests/output/src/main/scala-2/test/testRules/ServiceLoaders.scala rename to scalafix-tests/output/src/main/scala/test/testRules/ServiceLoaders.scala