diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 636b91084529..1f556a290fc3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -142,6 +142,9 @@ jobs: run: | ./project/scripts/sbt ";sjsSandbox/run ;sjsSandbox/test ;sjsJUnitTests/test ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToESModules ;sjsJUnitTests/test ;sjsCompilerTests/test" + - name: Test with Scala 2 library TASTy + run: ./project/scripts/sbt ";set ThisBuild/Build.useScala2LibraryTasty := true ;scala3-bootstrapped/testCompilation i5; scala3-bootstrapped/testCompilation tests/run/typelevel-peano.scala" # only test a subset of test to avoid doubling the CI execution time + test_windows_fast: runs-on: [self-hosted, Windows] if: "( @@ -209,10 +212,6 @@ jobs: run: sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test" shell: cmd - - name: Test with Scala 2 library TASTy - run: sbt ";set ThisBuild/Build.useScala2LibraryTasty := true ;scala3-bootstrapped/testCompilation i5" # only test a subset of test to avoid doubling the CI execution time - shell: cmd - - name: Scala.js Test run: sbt ";sjsJUnitTests/test ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToESModules ;sjsJUnitTests/test ;sjsCompilerTests/test" shell: cmd diff --git a/community-build/community-projects/verify b/community-build/community-projects/verify index 073921a373e0..ae37d7e153fc 160000 --- a/community-build/community-projects/verify +++ b/community-build/community-projects/verify @@ -1 +1 @@ -Subproject commit 073921a373e05bcfdc863769f676089ab889a002 +Subproject commit ae37d7e153fc62d64c40a72c45f810511aef2e01 diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index fe68d22f779a..4381c9a2f52c 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -450,10 +450,18 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas // Scala 2 sometimes pickle the same type parameter symbol multiple times // (see i11173 for an example), but we should only unpickle it once. || tag == TYPEsym && flags.is(TypeParam) && symScope(owner).lookup(name.asTypeName).exists + // We discard the private val representing a case accessor. We only load the case accessor def. + || flags.isAllOf(CaseAccessor| PrivateLocal, butNot = Method) then // skip this member return NoSymbol + // Adapt the flags of getters so they become like vals/vars instead. + // The info of this symbol is adapted in the `LocalUnpickler`. + if flags.isAllOf(Method | Accessor) && !name.toString().endsWith("_$eq") then + flags &~= Method | Accessor + if !flags.is(StableRealizable) then flags |= Mutable + name = name.adjustIfModuleClass(flags) if (flags.is(Method)) name = @@ -618,7 +626,14 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas setClassInfo(denot, tp, fromScala2 = true, selfInfo) NamerOps.addConstructorProxies(denot.classSymbol) case denot => - val tp1 = translateTempPoly(tp) + val tp1 = translateTempPoly(tp) match + case ExprType(resultType) if !denot.isOneOf(Param | Method) => + // Adapt the flags of getters so they become like vals/vars instead. + // This is the `def` of an accessor that needs to be transformed into + // a `val`/`var`. Note that the `Method | Accessor` flags were already + // striped away in `readDisambiguatedSymbol`. + resultType + case tp1 => tp1 denot.info = if (tag == ALIASsym) TypeAlias(tp1) else if (denot.isType) checkNonCyclic(denot.symbol, tp1, reportErrors = false) diff --git a/compiler/src/dotty/tools/dotc/inlines/InlineReducer.scala b/compiler/src/dotty/tools/dotc/inlines/InlineReducer.scala index 2dbfd9117f48..029616502c8c 100644 --- a/compiler/src/dotty/tools/dotc/inlines/InlineReducer.scala +++ b/compiler/src/dotty/tools/dotc/inlines/InlineReducer.scala @@ -329,7 +329,7 @@ class InlineReducer(inliner: Inliner)(using Context): val paramCls = paramType.classSymbol if (paramCls.is(Case) && unapp.symbol.is(Synthetic) && scrut <:< paramType) { val caseAccessors = - if (paramCls.is(Scala2x)) paramCls.caseAccessors.filter(_.is(Method)) + if paramCls.is(Scala2x) then paramCls.caseAccessors else paramCls.asClass.paramAccessors val selectors = for (accessor <- caseAccessors) diff --git a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala index 8f5eec693609..05ef16961698 100644 --- a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala +++ b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala @@ -327,7 +327,7 @@ object PatternMatcher { /** Plan for matching the result of an unapply against argument patterns `args` */ def unapplyPlan(unapp: Tree, args: List[Tree]): Plan = { def caseClass = unapp.symbol.owner.linkedClass - lazy val caseAccessors = caseClass.caseAccessors.filter(_.is(Method)) + lazy val caseAccessors = caseClass.caseAccessors def isSyntheticScala2Unapply(sym: Symbol) = sym.isAllOf(SyntheticCase) && sym.owner.is(Scala2x) diff --git a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala index 6e1302c88398..ffb68a721fef 100644 --- a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala @@ -409,7 +409,7 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context): New(defn.RuntimeTupleMirrorTypeRef, Literal(Constant(arity)) :: Nil) def makeProductMirror(pre: Type, cls: Symbol, tps: Option[List[Type]]): TreeWithErrors = - val accessors = cls.caseAccessors.filterNot(_.isAllOf(PrivateLocal)) + val accessors = cls.caseAccessors val elemLabels = accessors.map(acc => ConstantType(Constant(acc.name.toString))) val typeElems = tps.getOrElse(accessors.map(mirroredType.resultType.memberInfo(_).widenExpr)) val nestedPairs = TypeOps.nestedPairs(typeElems) diff --git a/language-server/test/dotty/tools/languageserver/CompletionTest.scala b/language-server/test/dotty/tools/languageserver/CompletionTest.scala index 7a21fe15fbe5..eaff8c307843 100644 --- a/language-server/test/dotty/tools/languageserver/CompletionTest.scala +++ b/language-server/test/dotty/tools/languageserver/CompletionTest.scala @@ -39,7 +39,7 @@ class CompletionTest { code"class Foo { val foo: BigD${m1} }" .completion( ("BigDecimal", Field, "BigDecimal"), - ("BigDecimal", Method, "=> scala.math.BigDecimal.type"), + ("BigDecimal", Field, "scala.math.BigDecimal"), ) } diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionDocSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionDocSuite.scala index c419ce3946d9..6c5da76114a2 100644 --- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionDocSuite.scala +++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionDocSuite.scala @@ -214,7 +214,7 @@ class CompletionDocSuite extends BaseCompletionSuite: """.stripMargin, """ |> Found documentation for scala/package.Vector. - |Vector scala.collection.immutable + |Vector: scala.collection.immutable |""".stripMargin, includeDocs = true ) diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala index 055363830a1b..b77404d4e7fc 100644 --- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala +++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala @@ -25,7 +25,7 @@ class CompletionSuite extends BaseCompletionSuite: | Lis@@ |}""".stripMargin, """ - |List scala.collection.immutable + |List: scala.collection.immutable |List - java.awt |List - java.util |List - scala.collection.immutable @@ -647,7 +647,7 @@ class CompletionSuite extends BaseCompletionSuite: |} |""".stripMargin, """|None scala - |NoManifest scala.reflect + |NoManifest: scala.reflect |""".stripMargin, topLines = Some(2) ) @@ -660,8 +660,8 @@ class CompletionSuite extends BaseCompletionSuite: |} |""".stripMargin, """|Some(value) scala - |Seq scala.collection.immutable - |Set scala.collection.immutable + |Seq: scala.collection.immutable + |Set: scala.collection.immutable |""".stripMargin, topLines = Some(3) ) diff --git a/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala index 9ef153e51da1..5d1fe1083b52 100644 --- a/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala +++ b/presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala @@ -194,7 +194,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite: s"""|package <>/*namespace*/ | |object <>/*class*/ { - | val <>/*variable,definition,readonly*/ = <>/*class*/(1,2,3) + | val <>/*variable,definition,readonly*/ = <>/*variable,readonly*/(1,2,3) | val <>/*variable,definition,readonly*/ = <>/*class*/(1) | val <>/*class*/(<>/*variable,definition,readonly*/) = <>/*variable,readonly*/ | val <>/*class*/(<>/*variable,definition,readonly*/) = <>/*variable,readonly*/ @@ -269,7 +269,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite: |object <>/*class*/ { | val <>/*variable,definition,readonly*/ = 1 | var <>/*variable,definition*/ = 2 - | val <>/*variable,definition,readonly*/ = <>/*class*/(1,<>/*variable,readonly*/,<>/*variable*/) + | val <>/*variable,definition,readonly*/ = <>/*variable,readonly*/(1,<>/*variable,readonly*/,<>/*variable*/) | <>/*variable*/ = <>/*variable,readonly*/ |""".stripMargin ) @@ -278,10 +278,10 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite: check( """ |object <
>/*class*/ { - | val <>/*variable,definition,readonly*/ = <>/*class*/(1,2,3) - | val <>/*variable,definition,readonly*/ = <>/*class*/(1,2) - | val <>/*variable,definition,readonly*/ = <>/*class*/(1,2,3) - | val <>/*variable,definition,readonly*/ = <>/*class*/(1) + |val <>/*variable,definition,readonly*/ = <>/*variable,readonly*/(1,2,3) + |val <>/*variable,definition,readonly*/ = <>/*variable,readonly*/(1,2) + |val <>/*variable,definition,readonly*/ = <>/*variable,readonly*/(1,2,3) + |val <>/*variable,definition,readonly*/ = <>/*variable,readonly*/(1) |}""".stripMargin ) @@ -326,7 +326,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite: | |object <>/*class*/ { | val <>/*variable,definition,readonly*/ = for { - | <>/*variable,definition,readonly*/ <- <>/*class*/("a", "b", "c") + | <>/*variable,definition,readonly*/ <- <>/*variable,readonly*/("a", "b", "c") | <<_>>/*class,abstract*/ = <>/*method*/("print!") | } yield <>/*variable,readonly*/ |} diff --git a/tests/coverage/pos/For.scoverage.check b/tests/coverage/pos/For.scoverage.check index 9fdc9a7e9d80..068331533fd9 100644 --- a/tests/coverage/pos/For.scoverage.check +++ b/tests/coverage/pos/For.scoverage.check @@ -262,23 +262,6 @@ covtest For$package$ Object covtest.For$package$ -testForeach -301 -304 -13 -Nil -Ident -false -0 -false -Nil - -15 -For.scala -covtest -For$package$ -Object -covtest.For$package$ $anonfun 318 343 @@ -290,7 +273,7 @@ false false println("user code here") -16 +15 For.scala covtest For$package$ diff --git a/tests/coverage/pos/Inlined.scoverage.check b/tests/coverage/pos/Inlined.scoverage.check index dccee7d0026b..f66c16709e84 100644 --- a/tests/coverage/pos/Inlined.scoverage.check +++ b/tests/coverage/pos/Inlined.scoverage.check @@ -94,23 +94,6 @@ Object covtest.Inlined$package$ testInlined 155 -159 -6 -List -Ident -false -0 -false -List - -5 -Inlined.scala -covtest -Inlined$package$ -Object -covtest.Inlined$package$ -testInlined -155 169 6 length @@ -120,7 +103,7 @@ false false List(l).length -6 +5 Inlined.scala covtest Inlined$package$ @@ -137,7 +120,7 @@ false false scala.runtime.Scala3RunTime.assertFailed() -7 +6 Inlined.scala covtest Inlined$package$ @@ -154,7 +137,7 @@ true false scala.runtime.Scala3RunTime.assertFailed() -8 +7 Inlined.scala covtest Inlined$package$ @@ -171,7 +154,7 @@ true false -9 +8 Inlined.scala covtest Inlined$package$ @@ -188,24 +171,7 @@ false false List(l) -10 -Inlined.scala -covtest -Inlined$package$ -Object -covtest.Inlined$package$ -testInlined -180 -184 -7 -List -Ident -false -0 -false -List - -11 +9 Inlined.scala covtest Inlined$package$ @@ -222,7 +188,7 @@ false false List(l).length -12 +10 Inlined.scala covtest Inlined$package$ @@ -239,7 +205,7 @@ false false scala.runtime.Scala3RunTime.assertFailed() -13 +11 Inlined.scala covtest Inlined$package$ @@ -256,7 +222,7 @@ true false scala.runtime.Scala3RunTime.assertFailed() -14 +12 Inlined.scala covtest Inlined$package$ @@ -273,7 +239,7 @@ true false -15 +13 Inlined.scala covtest Inlined$package$ diff --git a/tests/coverage/pos/InlinedFromLib.scoverage.check b/tests/coverage/pos/InlinedFromLib.scoverage.check index d7b2a42cd3b3..1d890ac0b962 100644 --- a/tests/coverage/pos/InlinedFromLib.scoverage.check +++ b/tests/coverage/pos/InlinedFromLib.scoverage.check @@ -94,23 +94,6 @@ Object covtest.InlinedFromLib$package$ testInlined 198 -202 -7 -List -Ident -false -0 -false -List - -5 -InlinedFromLib.scala -covtest -InlinedFromLib$package$ -Object -covtest.InlinedFromLib$package$ -testInlined -198 212 7 length @@ -120,7 +103,7 @@ false false List(l).length -6 +5 InlinedFromLib.scala covtest InlinedFromLib$package$ @@ -137,7 +120,7 @@ false false assert(l == List(l).length) -7 +6 InlinedFromLib.scala covtest InlinedFromLib$package$ @@ -154,7 +137,7 @@ true false assert(l == List(l).length) -8 +7 InlinedFromLib.scala covtest InlinedFromLib$package$ @@ -171,7 +154,7 @@ true false assert(l == List(l).length) -9 +8 InlinedFromLib.scala covtest InlinedFromLib$package$ @@ -188,24 +171,7 @@ false false List(l) -10 -InlinedFromLib.scala -covtest -InlinedFromLib$package$ -Object -covtest.InlinedFromLib$package$ -testInlined -223 -227 -8 -List -Ident -false -0 -false -List - -11 +9 InlinedFromLib.scala covtest InlinedFromLib$package$ @@ -222,7 +188,7 @@ false false List(l).length -12 +10 InlinedFromLib.scala covtest InlinedFromLib$package$ @@ -239,7 +205,7 @@ false false assert(List(l).length == 1) -13 +11 InlinedFromLib.scala covtest InlinedFromLib$package$ @@ -256,7 +222,7 @@ true false assert(List(l).length == 1) -14 +12 InlinedFromLib.scala covtest InlinedFromLib$package$ @@ -273,7 +239,7 @@ true false assert(List(l).length == 1) -15 +13 InlinedFromLib.scala covtest InlinedFromLib$package$ diff --git a/tests/coverage/pos/StructuralTypes.scoverage.check b/tests/coverage/pos/StructuralTypes.scoverage.check index 6108c83b08d6..6035bb427774 100644 --- a/tests/coverage/pos/StructuralTypes.scoverage.check +++ b/tests/coverage/pos/StructuralTypes.scoverage.check @@ -41,23 +41,6 @@ covtest Record Class covtest.Record -$anonfun -159 -163 -5 -_1 -Select -false -0 -false -_._1 - -2 -StructuralTypes.scala -covtest -Record -Class -covtest.Record selectDynamic 148 176 @@ -69,24 +52,7 @@ false false elems.find(_._1 == name).get -3 -StructuralTypes.scala -covtest -Record -Class -covtest.Record -selectDynamic -148 -179 -5 -_2 -Select -false -0 -false -elems.find(_._1 == name).get._2 - -4 +2 StructuralTypes.scala covtest Record @@ -103,7 +69,7 @@ false false def selectDynamic -5 +3 StructuralTypes.scala covtest StructuralTypes$ @@ -120,7 +86,7 @@ false false "name" -> "Emma" -6 +4 StructuralTypes.scala covtest StructuralTypes$ @@ -137,7 +103,7 @@ false false "age" -> 42 -7 +5 StructuralTypes.scala covtest StructuralTypes$ @@ -154,7 +120,7 @@ false false person.name -8 +6 StructuralTypes.scala covtest StructuralTypes$ diff --git a/tests/coverage/pos/TypeLambdas.scoverage.check b/tests/coverage/pos/TypeLambdas.scoverage.check index 4085c3e41f18..76c6f2286af9 100644 --- a/tests/coverage/pos/TypeLambdas.scoverage.check +++ b/tests/coverage/pos/TypeLambdas.scoverage.check @@ -42,23 +42,6 @@ TypeLambdas$ Object covtest.TypeLambdas$ test -306 -309 -13 -Map -Ident -false -0 -false -Map - -2 -TypeLambdas.scala -covtest -TypeLambdas$ -Object -covtest.TypeLambdas$ -test 310 318 13 @@ -69,7 +52,7 @@ false false 1 -> "1" -3 +2 TypeLambdas.scala covtest TypeLambdas$ @@ -86,7 +69,7 @@ false false println(m) -4 +3 TypeLambdas.scala covtest TypeLambdas$ @@ -103,7 +86,7 @@ false false println(tuple) -5 +4 TypeLambdas.scala covtest TypeLambdas$ diff --git a/tests/coverage/run/i16940/i16940.scoverage.check b/tests/coverage/run/i16940/i16940.scoverage.check index 8981e91283d5..05e4c1dd6d56 100644 --- a/tests/coverage/run/i16940/i16940.scoverage.check +++ b/tests/coverage/run/i16940/i16940.scoverage.check @@ -93,23 +93,6 @@ Test$ Object .Test$ -387 -390 -19 -Seq -Ident -false -0 -false -Seq - -5 -i16940/i16940.scala - -Test$ -Object -.Test$ - 391 421 19 @@ -120,7 +103,7 @@ false false brokenSynchronizedBlock(false) -6 +5 i16940/i16940.scala Test$ @@ -137,7 +120,7 @@ false false brokenSynchronizedBlock(true) -7 +6 i16940/i16940.scala Test$ @@ -154,7 +137,7 @@ false false println(test) -8 +7 i16940/i16940.scala Test$ @@ -171,7 +154,7 @@ false false assert(test == 2) -9 +8 i16940/i16940.scala Test$ @@ -188,7 +171,7 @@ true false assert(test == 2) -10 +9 i16940/i16940.scala Test$ @@ -205,7 +188,7 @@ true false assert(test == 2) -11 +10 i16940/i16940.scala Test$ @@ -222,7 +205,7 @@ false false 3.seconds -12 +11 i16940/i16940.scala i16940$package$ @@ -239,7 +222,7 @@ false false Future {\n if (option) {\n Thread.sleep(500)\n }\n synchronized {\n val tmp = test\n Thread.sleep(1000)\n test = tmp + 1\n }\n} -13 +12 i16940/i16940.scala i16940$package$ @@ -256,7 +239,7 @@ false false Thread.sleep(500) -14 +13 i16940/i16940.scala i16940$package$ @@ -273,7 +256,7 @@ true false {\n Thread.sleep(500)\n } -15 +14 i16940/i16940.scala i16940$package$ @@ -290,7 +273,7 @@ true false -16 +15 i16940/i16940.scala i16940$package$ @@ -307,7 +290,7 @@ false false synchronized {\n val tmp = test\n Thread.sleep(1000)\n test = tmp + 1\n } -17 +16 i16940/i16940.scala i16940$package$ @@ -324,7 +307,7 @@ false false Thread.sleep(1000) -18 +17 i16940/i16940.scala i16940$package$ diff --git a/tests/coverage/run/i18233-min/i18233-min.scoverage.check b/tests/coverage/run/i18233-min/i18233-min.scoverage.check index 5699003d5564..ec6cd04e2ce0 100644 --- a/tests/coverage/run/i18233-min/i18233-min.scoverage.check +++ b/tests/coverage/run/i18233-min/i18233-min.scoverage.check @@ -110,23 +110,6 @@ i18233-min$package$ Object .i18233-min$package$ aList -14 -18 -1 -List -Ident -false -0 -false -List - -6 -i18233-min/i18233-min.scala - -i18233-min$package$ -Object -.i18233-min$package$ -aList 19 34 1 @@ -137,7 +120,7 @@ false false Array[String]() -7 +6 i18233-min/i18233-min.scala i18233-min$package$ @@ -154,7 +137,7 @@ false false def aList -8 +7 i18233-min/i18233-min.scala i18233-min$package$ @@ -171,7 +154,7 @@ false false Array("abc", "def") -9 +8 i18233-min/i18233-min.scala i18233-min$package$ @@ -188,7 +171,7 @@ false false def arr -10 +9 i18233-min/i18233-min.scala i18233-min$package$ @@ -205,24 +188,7 @@ false false List(arr*) -11 -i18233-min/i18233-min.scala - -i18233-min$package$ -Object -.i18233-min$package$ -anotherList -91 -95 -7 -List -Ident -false -0 -false -List - -12 +10 i18233-min/i18233-min.scala i18233-min$package$ @@ -239,7 +205,7 @@ false false arr -13 +11 i18233-min/i18233-min.scala i18233-min$package$ diff --git a/tests/coverage/run/i18233/i18233.scoverage.check b/tests/coverage/run/i18233/i18233.scoverage.check index 6c8ce6bf38ba..ae679e097b2c 100644 --- a/tests/coverage/run/i18233/i18233.scoverage.check +++ b/tests/coverage/run/i18233/i18233.scoverage.check @@ -42,23 +42,6 @@ Foo$ Object .Foo$ render -54 -58 -4 -List -Ident -false -0 -false -List - -2 -i18233/i18233.scala - -Foo$ -Object -.Foo$ -render 59 65 4 @@ -69,7 +52,7 @@ false false values -3 +2 i18233/i18233.scala Foo$ @@ -86,7 +69,7 @@ false false values.tail -4 +3 i18233/i18233.scala Foo$ @@ -103,7 +86,7 @@ false false List(values.tail*).mkString -5 +4 i18233/i18233.scala Foo$ @@ -120,7 +103,7 @@ false false def render -6 +5 i18233/i18233.scala Test$ @@ -137,7 +120,7 @@ false false println(Foo.render) -7 +6 i18233/i18233.scala Test$ diff --git a/tests/coverage/run/interpolation/test.scoverage.check b/tests/coverage/run/interpolation/test.scoverage.check index 6b38152cdcc1..8d6081130d8a 100644 --- a/tests/coverage/run/interpolation/test.scoverage.check +++ b/tests/coverage/run/interpolation/test.scoverage.check @@ -127,23 +127,6 @@ Test$ Object .Test$ main -195 -199 -9 -List -Ident -false -0 -false -List - -7 -interpolation/test.scala - -Test$ -Object -.Test$ -main 229 278 10 @@ -154,7 +137,7 @@ false false xs.zipWithIndex.map((s, i) => println(s"$i: $s")) -8 +7 interpolation/test.scala Test$ @@ -171,7 +154,7 @@ false false xs.zipWithIndex -9 +8 interpolation/test.scala Test$ @@ -188,7 +171,7 @@ false false println(s"$i: $s") -10 +9 interpolation/test.scala Test$ @@ -205,7 +188,7 @@ false false s"$i: $s" -11 +10 interpolation/test.scala Test$ @@ -222,7 +205,7 @@ false false println(simple(1, "abc")) -12 +11 interpolation/test.scala Test$ @@ -239,7 +222,7 @@ false false simple(1, "abc") -13 +12 interpolation/test.scala Test$ @@ -256,7 +239,7 @@ false false println(hexa(127)) -14 +13 interpolation/test.scala Test$ @@ -273,7 +256,7 @@ false false hexa(127) -15 +14 interpolation/test.scala Test$ @@ -290,7 +273,7 @@ false false println(raw"a\\nb") -16 +15 interpolation/test.scala Test$ @@ -307,7 +290,7 @@ false false raw"a\\nb" -17 +16 interpolation/test.scala Test$ diff --git a/tests/coverage/run/lifting/test.scoverage.check b/tests/coverage/run/lifting/test.scoverage.check index 536c5ab0cf1b..f6c9da70a860 100644 --- a/tests/coverage/run/lifting/test.scoverage.check +++ b/tests/coverage/run/lifting/test.scoverage.check @@ -42,23 +42,6 @@ Vals Class .Vals -22 -26 -1 -List -Ident -false -0 -false -List - -2 -lifting/test.scala - -Vals -Class -.Vals - 41 57 2 @@ -69,7 +52,7 @@ false false l :: List(1,2,3) -3 +2 lifting/test.scala Vals @@ -86,24 +69,7 @@ false false List(1,2,3) -4 -lifting/test.scala - -Vals -Class -.Vals - -46 -50 -2 -List -Ident -false -0 -false -List - -5 +3 lifting/test.scala A @@ -120,7 +86,7 @@ false false "string" + a + "." + b + "." + c -6 +4 lifting/test.scala A @@ -137,7 +103,7 @@ false false "string" + a + "." + b + "." -7 +5 lifting/test.scala A @@ -154,7 +120,7 @@ false false "string" + a + "." + b -8 +6 lifting/test.scala A @@ -171,7 +137,7 @@ false false "string" + a + "." -9 +7 lifting/test.scala A @@ -188,7 +154,7 @@ false false "string" + a -10 +8 lifting/test.scala A @@ -205,7 +171,7 @@ false false def msg -11 +9 lifting/test.scala A @@ -222,7 +188,7 @@ false false def integer -12 +10 lifting/test.scala A @@ -239,7 +205,7 @@ false false def ex -13 +11 lifting/test.scala test$package$ @@ -256,7 +222,7 @@ false false A() -14 +12 lifting/test.scala test$package$ @@ -273,7 +239,7 @@ false false def f -15 +13 lifting/test.scala test$package$ @@ -290,7 +256,7 @@ false false a.msg(i, 0, a.integer) -16 +14 lifting/test.scala test$package$ @@ -307,7 +273,7 @@ false false a.integer -17 +15 lifting/test.scala test$package$ @@ -324,7 +290,7 @@ false false println(x) -18 +16 lifting/test.scala test$package$ @@ -341,7 +307,7 @@ false false a.ex.msg(i, 0, a.ex.integer) -19 +17 lifting/test.scala test$package$ @@ -358,7 +324,7 @@ false false a.ex -20 +18 lifting/test.scala test$package$ @@ -375,7 +341,7 @@ false false a.ex -21 +19 lifting/test.scala test$package$ @@ -392,7 +358,7 @@ false false a.ex.integer -22 +20 lifting/test.scala test$package$ @@ -409,7 +375,7 @@ false false println(x) -23 +21 lifting/test.scala test$package$ @@ -426,7 +392,7 @@ false false a.msg(f(), 0, i) -24 +22 lifting/test.scala test$package$ @@ -443,7 +409,7 @@ false false f() -25 +23 lifting/test.scala test$package$ @@ -460,7 +426,7 @@ false false println(x) -26 +24 lifting/test.scala test$package$ diff --git a/tests/coverage/run/type-apply/test.measurement.check b/tests/coverage/run/type-apply/test.measurement.check index f0382d7405be..f1d6ee365359 100644 --- a/tests/coverage/run/type-apply/test.measurement.check +++ b/tests/coverage/run/type-apply/test.measurement.check @@ -1,7 +1,5 @@ -6 +4 1 -3 2 -5 -4 +3 0 diff --git a/tests/coverage/run/type-apply/test.scoverage.check b/tests/coverage/run/type-apply/test.scoverage.check index 74dc7fde6bb0..cbb93f8d8244 100644 --- a/tests/coverage/run/type-apply/test.scoverage.check +++ b/tests/coverage/run/type-apply/test.scoverage.check @@ -75,23 +75,6 @@ type-apply/test.scala test$package$ Object .test$package$ -Test -171 -175 -4 -List -Ident -false -0 -false -List - -4 -type-apply/test.scala - -test$package$ -Object -.test$package$ $anonfun 192 199 @@ -103,24 +86,7 @@ false false List(a) -5 -type-apply/test.scala - -test$package$ -Object -.test$package$ -$anonfun -192 -196 4 -List -Ident -false -0 -false -List - -6 type-apply/test.scala test$package$ diff --git a/tests/neg/constructor-proxy-shadowing.check b/tests/neg/constructor-proxy-shadowing.check index f45b9b3205c3..091d1ed14c1e 100644 --- a/tests/neg/constructor-proxy-shadowing.check +++ b/tests/neg/constructor-proxy-shadowing.check @@ -52,7 +52,7 @@ 17 |val x = Seq(3) // error: shadowing | ^^^ | Reference to constructor proxy for class Seq - | shadows outer reference to getter Seq in package scala + | shadows outer reference to value Seq in package scala | | The instance needs to be created with an explicit `new`. |-------------------------------------------------------------------------------------------------------------------- @@ -66,7 +66,7 @@ | | new Seq(...) | - | Or it could mean calling the apply method of getter Seq in package scala as in + | Or it could mean calling the apply method of value Seq in package scala as in | | Seq.apply(...) |