Skip to content

Commit 0c15bee

Browse files
committed
chore: Fix compilation issue after backport conflict
1 parent 5d6a151 commit 0c15bee

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

compiler/src/dotty/tools/repl/ReplDriver.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ class ReplDriver(settings: Array[String],
547547
try {
548548
val entries = flatten(jarFile)
549549

550-
val existingClass = entries.filter(_.ext.isClass).find(tryClassLoad(_).isDefined)
550+
val existingClass = entries.filter(_.extension == "class").find(tryClassLoad(_).isDefined)
551551
if (existingClass.nonEmpty)
552552
out.println(s"The path '$path' cannot be loaded, it contains a classfile that already exists on the classpath: ${existingClass.get}")
553553
else inContext(state.context):

tests/semanticdb/metac.expect

-6
Original file line numberDiff line numberDiff line change
@@ -3456,7 +3456,6 @@ Text => empty
34563456
Language => Scala
34573457
Symbols => 12 entries
34583458
Occurrences => 33 entries
3459-
Diagnostics => 1 entries
34603459
Synthetics => 4 entries
34613460

34623461
Symbols:
@@ -3508,11 +3507,6 @@ Occurrences:
35083507
[20:4..20:13): scalameta -> scala/reflect/Selectable#selectDynamic().
35093508
[21:4..21:19): StructuralTypes -> example/StructuralTypes.
35103509

3511-
Diagnostics:
3512-
[14:20..14:23): [warning] Alphanumeric method foo is not declared infix; it should not be used as infix operator.
3513-
Instead, use method syntax .foo(...) or backticked identifier `foo`.
3514-
The latter can be rewritten automatically under -rewrite -source 3.4-migration.
3515-
35163510
Synthetics:
35173511
[12:2..12:6):user => reflectiveSelectable(*)
35183512
[13:2..13:6):user => reflectiveSelectable(*)

0 commit comments

Comments
 (0)