Skip to content

Commit 428f5cc

Browse files
author
builduser
committed
Merged branch idea251.release-vasil/scala37 into idea251.release
2 parents a61d2ad + 333a3f8 commit 428f5cc

File tree

17 files changed

+57
-3
lines changed

17 files changed

+57
-3
lines changed

scala/compiler-integration/test/org/jetbrains/plugins/scala/compiler/IncrementalCompilationTest.scala

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@ class IncrementalIdeaOnServerCompilationTest_3_5 extends IncrementalIdeaOnServer
247247

248248
class IncrementalIdeaOnServerCompilationTest_3_6 extends IncrementalIdeaOnServerCompilationTestBase(ScalaVersion.Latest.Scala_3_6)
249249

250+
class IncrementalIdeaOnServerCompilationTest_3_7 extends IncrementalIdeaOnServerCompilationTestBase(ScalaVersion.Latest.Scala_3_7)
251+
250252
class IncrementalIdeaOnServerCompilationTest_3_LTS_RC extends IncrementalIdeaOnServerCompilationTestBase(ScalaVersion.Latest.Scala_3_LTS_RC)
251253

252254
class IncrementalIdeaOnServerCompilationTest_3_Next_RC extends IncrementalIdeaOnServerCompilationTestBase(ScalaVersion.Latest.Scala_3_Next_RC)
@@ -286,6 +288,8 @@ class IncrementalIdeaCompilationTest_3_5 extends IncrementalIdeaCompilationTestB
286288

287289
class IncrementalIdeaCompilationTest_3_6 extends IncrementalIdeaCompilationTestBase(ScalaVersion.Latest.Scala_3_6)
288290

291+
class IncrementalIdeaCompilationTest_3_7 extends IncrementalIdeaCompilationTestBase(ScalaVersion.Latest.Scala_3_7)
292+
289293
class IncrementalIdeaCompilationTest_3_LTS_RC extends IncrementalIdeaCompilationTestBase(ScalaVersion.Latest.Scala_3_LTS_RC)
290294

291295
class IncrementalIdeaCompilationTest_3_Next_RC extends IncrementalIdeaCompilationTestBase(ScalaVersion.Latest.Scala_3_Next_RC)
@@ -366,6 +370,8 @@ class IncrementalSbtOnServerCompilationTest_3_5 extends IncrementalSbtOnServerCo
366370

367371
class IncrementalSbtOnServerCompilationTest_3_6 extends IncrementalSbtOnServerCompilationTestBase(ScalaVersion.Latest.Scala_3_6)
368372

373+
class IncrementalSbtOnServerCompilationTest_3_7 extends IncrementalSbtOnServerCompilationTestBase(ScalaVersion.Latest.Scala_3_7)
374+
369375
class IncrementalSbtOnServerCompilationTest_3_LTS_RC extends IncrementalSbtOnServerCompilationTestBase(ScalaVersion.Latest.Scala_3_LTS_RC)
370376

371377
class IncrementalSbtOnServerCompilationTest_3_Next_RC extends IncrementalSbtOnServerCompilationTestBase(ScalaVersion.Latest.Scala_3_Next_RC)
@@ -407,6 +413,8 @@ class IncrementalSbtCompilationTest_3_5 extends IncrementalSbtCompilationTestBas
407413

408414
class IncrementalSbtCompilationTest_3_6 extends IncrementalSbtCompilationTestBase(ScalaVersion.Latest.Scala_3_6)
409415

416+
class IncrementalSbtCompilationTest_3_7 extends IncrementalSbtCompilationTestBase(ScalaVersion.Latest.Scala_3_7)
417+
410418
class IncrementalSbtCompilationTest_3_LTS_RC extends IncrementalSbtCompilationTestBase(ScalaVersion.Latest.Scala_3_LTS_RC)
411419

412420
class IncrementalSbtCompilationTest_3_Next_RC extends IncrementalSbtCompilationTestBase(ScalaVersion.Latest.Scala_3_Next_RC)

scala/compiler-integration/test/org/jetbrains/plugins/scala/compiler/highlighting/CompilerDiagnosticsTest_3.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,3 +281,7 @@ class CompilerDiagnosticsTest_3_5 extends CompilerDiagnosticsTest_3 {
281281
class CompilerDiagnosticsTest_3_6 extends CompilerDiagnosticsTest_3 {
282282
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_6
283283
}
284+
285+
class CompilerDiagnosticsTest_3_7 extends CompilerDiagnosticsTest_3 {
286+
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_7
287+
}

scala/compiler-integration/test/org/jetbrains/plugins/scala/compiler/highlighting/ScalaCompilerHighlightingTest.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,10 @@ class ScalaCompilerHighlightingTest_3_6 extends ScalaCompilerHighlightingTest_3_
260260
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_6
261261
}
262262

263+
class ScalaCompilerHighlightingTest_3_7 extends ScalaCompilerHighlightingTest_3_6 {
264+
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_7
265+
}
266+
263267
class ScalaCompilerHighlightingTest_3_RC extends ScalaCompilerHighlightingTest_3_3 {
264268
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_LTS_RC
265269
}

scala/compiler-integration/test/org/jetbrains/plugins/scala/compiler/highlighting/ScalaWorksheetCompilerHighlightingTest.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,10 @@ class ScalaWorksheetCompilerHighlightingTest_3_6 extends ScalaWorksheetCompilerH
206206
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_6
207207
}
208208

209+
class ScalaWorksheetCompilerHighlightingTest_3_7 extends ScalaWorksheetCompilerHighlightingTest_3_6 {
210+
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_7
211+
}
212+
209213
class ScalaWorksheetCompilerHighlightingTest_3_RC extends ScalaWorksheetCompilerHighlightingTest_3 {
210214
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_LTS_RC
211215
}

scala/compiler-integration/test/org/jetbrains/plugins/scala/compiler/highlighting/UpgradeWarningsToErrorsCompilerHighlightingTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ abstract class UpgradeWarningsToErrorsCompilerHighlightingTestBase(scalaVersion:
6161

6262
class UpgradeWarningsToErrorsCompilerHighlightingTest_3 extends UpgradeWarningsToErrorsCompilerHighlightingTestBase(ScalaVersion.Latest.Scala_3)
6363

64-
class UpgradeWarningsToErrorsCompilerHighlightingTest_3_Next extends UpgradeWarningsToErrorsCompilerHighlightingTestBase(ScalaVersion.Latest.Scala_3_6)
64+
class UpgradeWarningsToErrorsCompilerHighlightingTest_3_Next extends UpgradeWarningsToErrorsCompilerHighlightingTestBase(ScalaVersion.Latest.Scala_3_7)
6565

6666
class UpgradeWarningsToErrorsCompilerHighlightingTest_3_Next_RC extends UpgradeWarningsToErrorsCompilerHighlightingTestBase(ScalaVersion.Latest.Scala_3_Next_RC)

scala/compiler-integration/test/org/jetbrains/plugins/scala/javaHighlighting/JavaHighlightingScalaTest_since_2_12_CheckTestDataCompilerTest.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ class JavaHighlightingScalaTest_since_2_12_CheckTestDataCompilerTest_3_5
2828
class JavaHighlightingScalaTest_since_2_12_CheckTestDataCompilerTest_3_6
2929
extends JavaHighlightingScalaTest_since_2_12_CheckTestDataCompilerTestBase(ScalaVersion.Latest.Scala_3_6)
3030

31+
class JavaHighlightingScalaTest_since_2_12_CheckTestDataCompilerTest_3_7
32+
extends JavaHighlightingScalaTest_since_2_12_CheckTestDataCompilerTestBase(ScalaVersion.Latest.Scala_3_7)
33+
3134
class JavaHighlightingScalaTest_since_2_12_CheckTestDataCompilerTest_3_LTS_RC
3235
extends JavaHighlightingScalaTest_since_2_12_CheckTestDataCompilerTestBase(ScalaVersion.Latest.Scala_3_LTS_RC)
3336

scala/debugger/test/org/jetbrains/plugins/scala/debugger/breakpoints/LambdaBreakpointsTest.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,10 @@ class LambdaBreakpointsTest_3_6 extends LambdaBreakpointsTest_3_3 {
379379
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_6
380380
}
381381

382+
class LambdaBreakpointsTest_3_7 extends LambdaBreakpointsTest_3_3 {
383+
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_7
384+
}
385+
382386
class LambdaBreakpointsTest_3_RC extends LambdaBreakpointsTest_3_3 {
383387
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_LTS_RC
384388
}

scala/debugger/test/org/jetbrains/plugins/scala/debugger/breakpoints/TryCatchInLazyValTest.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ class TryCatchInLazyValTest_3_6 extends TryCatchInLazyValTest_3 {
5656
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_6
5757
}
5858

59+
class TryCatchInLazyValTest_3_7 extends TryCatchInLazyValTest_3 {
60+
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_7
61+
}
62+
5963
class TryCatchInLazyValTest_3_LTS_RC extends TryCatchInLazyValTest_3 {
6064
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_LTS_RC
6165
}

scala/debugger/test/org/jetbrains/plugins/scala/debugger/evaluation/evaluator/compiling/GeneratedClassTest.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ class GeneratedClassTest_Scala2_3_5 extends GeneratedClassTest_Scala2_Base(Scala
7979

8080
class GeneratedClassTest_Scala2_3_6 extends GeneratedClassTest_Scala2_Base(ScalaVersion.Latest.Scala_3_6)
8181

82+
class GeneratedClassTest_Scala2_3_7 extends GeneratedClassTest_Scala2_Base(ScalaVersion.Latest.Scala_3_7)
83+
8284
class GeneratedClassTest_Scala2_3_LTS_RC extends GeneratedClassTest_Scala2_Base(ScalaVersion.Latest.Scala_3_LTS_RC)
8385

8486
class GeneratedClassTest_Scala2_3_Next_RC extends GeneratedClassTest_Scala2_Base(ScalaVersion.Latest.Scala_3_Next_RC)
@@ -106,6 +108,8 @@ class GeneratedClassTest_Scala3_3_5 extends GeneratedClassTest_Scala3_Base(Scala
106108

107109
class GeneratedClassTest_Scala3_3_6 extends GeneratedClassTest_Scala3_Base(ScalaVersion.Latest.Scala_3_6)
108110

111+
class GeneratedClassTest_Scala3_3_7 extends GeneratedClassTest_Scala3_Base(ScalaVersion.Latest.Scala_3_7)
112+
109113
class GeneratedClassTest_Scala3_3_LTS_RC extends GeneratedClassTest_Scala3_Base(ScalaVersion.Latest.Scala_3_LTS_RC)
110114

111115
class GeneratedClassTest_Scala3_3_Next_RC extends GeneratedClassTest_Scala3_Base(ScalaVersion.Latest.Scala_3_Next_RC)

scala/debugger/test/org/jetbrains/plugins/scala/debugger/exactBreakpoints/PriorityTest.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ class PriorityTest_3_6 extends PriorityTestBase {
114114
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_6
115115
}
116116

117+
class PriorityTest_3_7 extends PriorityTestBase {
118+
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_7
119+
}
120+
117121
class PriorityTest_3_RC extends PriorityTestBase {
118122
override protected def supportedIn(version: ScalaVersion): Boolean = version == ScalaVersion.Latest.Scala_3_LTS_RC
119123
}

0 commit comments

Comments
 (0)