Skip to content

Commit 4da6103

Browse files
Rename experimental feature to subCases
Avoids the issue with match completion with suggests importing the feature.
1 parent 3b86dc9 commit 4da6103

File tree

10 files changed

+14
-14
lines changed

10 files changed

+14
-14
lines changed

compiler/src/dotty/tools/dotc/config/Feature.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ object Feature:
3737
val modularity = experimental("modularity")
3838
val quotedPatternsWithPolymorphicFunctions = experimental("quotedPatternsWithPolymorphicFunctions")
3939
val packageObjectValues = experimental("packageObjectValues")
40-
val matchWithSubCases = experimental("matchWithSubCases")
40+
val subCases = experimental("subCases")
4141

4242
def experimentalAutoEnableFeatures(using Context): List[TermName] =
4343
defn.languageExperimentalFeatures

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3108,7 +3108,7 @@ object Parsers {
31083108
(withinMatchPattern(pattern()), guard())
31093109
}
31103110
val body =
3111-
if in.token == WITH && in.featureEnabled(Feature.matchWithSubCases) then atSpan(in.skipToken()):
3111+
if in.token == WITH && in.featureEnabled(Feature.subCases) then atSpan(in.skipToken()):
31123112
subMatchClause(simpleExpr(Location.ElseWhere))
31133113
else atSpan(accept(ARROW)):
31143114
if exprOnly then

library/src/scala/language.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,10 @@ object language {
350350
@compileTimeOnly("`packageObjectValues` can only be used at compile time in import statements")
351351
object packageObjectValues
352352

353-
/** Experimental support for match expressions with sub-cases.
353+
/** Experimental support for match expressions with sub cases.
354354
*/
355-
@compileTimeOnly("`matchWithSubCases` can only be used at compile time in import statements")
356-
object matchWithSubCases
355+
@compileTimeOnly("`subCases` can only be used at compile time in import statements")
356+
object subCases
357357

358358
}
359359

library/src/scala/runtime/stdLibPatches/language.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@ object language:
155155
@compileTimeOnly("`packageObjectValues` can only be used at compile time in import statements")
156156
object packageObjectValues
157157

158-
/** Experimental support for match expressions with sub-cases.
158+
/** Experimental support for match expressions with sub cases.
159159
*/
160-
@compileTimeOnly("`matchWithSubCases` can only be used at compile time in import statements")
161-
object matchWithSubCases
160+
@compileTimeOnly("`subCases` can only be used at compile time in import statements")
161+
object subCases
162162
end experimental
163163

164164
/** The deprecated object contains features that are no longer officially suypported in Scala.

tests/pos/inline-sub-match.scala renamed to tests/pos/inline-match-sub-cases.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import scala.language.experimental.matchWithSubCases
1+
import scala.language.experimental.subCases
22

33
object Test:
44

tests/pos/sub-sub-match.scala renamed to tests/pos/match-sub-sub-cases.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import scala.language.experimental.matchWithSubCases
1+
import scala.language.experimental.subCases
22

33
object Test:
44
val x: Option[Option[Int]] = ???

tests/run/sub-catch.scala renamed to tests/run/catch-sub-cases.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import scala.language.experimental.matchWithSubCases
1+
import scala.language.experimental.subCases
22

33
enum E extends Exception:
44
case A(x: Any)

tests/run/sub-cases.scala renamed to tests/run/match-sub-cases.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import scala.language.experimental.matchWithSubCases
1+
import scala.language.experimental.subCases
22

33
enum E:
44
case A(e: E)

tests/run/pf-sub-cases.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import scala.language.experimental.matchWithSubCases
1+
import scala.language.experimental.subCases
22

33
val pf: PartialFunction[Option[Option[Int]], String] =
44
case Some(x2) with x2 match

tests/warn/sub-cases-exhaustivity.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import scala.language.experimental.matchWithSubCases
1+
import scala.language.experimental.subCases
22

33
enum E:
44
case A(e: E)

0 commit comments

Comments
 (0)