Skip to content

Commit fd8574b

Browse files
committed
bugfix: Fix null errors after backporting
1 parent 591b5f5 commit fd8574b

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

compiler/src/dotty/tools/dotc/Driver.scala

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,13 @@ class Driver {
9292
case "help" =>
9393
case reporterClassName =>
9494
try
95-
Class.forName(reporterClassName).getDeclaredConstructor().newInstance() match
96-
case userReporter: Reporter =>
97-
ictx.setReporter(userReporter)
98-
case badReporter => report.error:
99-
em"Not a reporter: ${ctx.settings.Yreporter.value}"
95+
val newCls = Class.forName(reporterClassName).nn
96+
val newInst = newCls.getDeclaredConstructor().nn.newInstance().nn
97+
newInst match
98+
case userReporter: Reporter =>
99+
ictx.setReporter(userReporter)
100+
case badReporter => report.error:
101+
em"Not a reporter: ${ctx.settings.Yreporter.value}"
100102
catch case e: ReflectiveOperationException => report.error:
101103
em"Could not create reporter ${ctx.settings.Yreporter.value}: ${e}"
102104
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,6 @@ private sealed trait YSettings:
377377
val YdisableFlatCpCaching: Setting[Boolean] = BooleanSetting("-YdisableFlatCpCaching", "Do not cache flat classpath representation of classpath elements from jars across compiler instances.")
378378

379379
val Yscala2Unpickler: Setting[String] = StringSetting("-Yscala2-unpickler", "", "Control where we may get Scala 2 symbols from. This is either \"always\", \"never\", or a classpath.", "always")
380-
val YnoReporter: Setting[Boolean] = BooleanSetting("-Yno-reporter", "Diagnostics are silently consumed")
381380
val Yreporter: Setting[String] = StringSetting(name = "-Yreporter", helpArg = "<class>", descr = "Specify a dotty.tools.dotc.reporting.Reporter", default = "dotty.tools.dotc.reporting.ConsoleReporter")
382381

383382
val YnoImports: Setting[Boolean] = BooleanSetting("-Yno-imports", "Compile without importing scala.*, java.lang.*, or Predef.")

compiler/src/dotty/tools/dotc/interactive/Completion.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -576,8 +576,8 @@ object Completion:
576576
termRef.denot.asSingleDenotation.mapInfo(_ => tpe)
577577
}
578578
catch case NonFatal(ex) =>
579-
logger.warning(
580-
s"Exception when trying to apply extension method:\n ${ex.getMessage()}\n${ex.getStackTrace().mkString("\n")}"
579+
logger.nn.warning(
580+
s"Exception when trying to apply extension method:\n ${ex.getMessage()}\n${ex.getStackTrace().nn.mkString("\n")}"
581581
)
582582
None
583583

@@ -684,8 +684,8 @@ object Completion:
684684
interactiv.println(i"implicit conversion targets considered: ${conversions.toList}%, %")
685685
conversions
686686
} catch case NonFatal(ex) =>
687-
logger.warning(
688-
s"Exception when searching for implicit conversions:\n ${ex.getMessage()}\n${ex.getStackTrace().mkString("\n")}"
687+
logger.nn.warning(
688+
s"Exception when searching for implicit conversions:\n ${ex.getMessage()}\n${ex.getStackTrace().nn.mkString("\n")}"
689689
)
690690
Set.empty
691691

compiler/src/dotty/tools/dotc/util/Chars.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ object Chars:
137137

138138
def escapedChar(ch: Char): String =
139139
if requiresFormat(ch) then
140-
val b = StringBuilder().append('\'')
140+
val b = StringBuilder().append('\'').nn
141141
escapedChar(b, ch)
142142
b.append('\'').toString
143143
else

presentation-compiler/test/dotty/tools/pc/tests/DiagnosticProviderSuite.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ class DiagnosticProviderSuite extends PcAssertions {
3232
additionalChecks: List[Diagnostic] => Unit = identity
3333
): Unit =
3434
val diagnostics = pc
35-
.didChange(TestVirtualFileParams(URI.create("file:/Diagnostic.scala"), text))
35+
.didChange(TestVirtualFileParams(URI.create("file:/Diagnostic.scala").nn, text))
36+
.nn
3637
.asScala
3738

38-
val actual = diagnostics.map(d => TestDiagnostic(d.getRange().getStart().getOffset(text), d.getRange().getEnd().getOffset(text), d.getMessage(), d.getSeverity()))
39+
val actual = diagnostics.map(d => TestDiagnostic(d.getRange().nn.getStart().nn.getOffset(text), d.getRange().nn.getEnd().nn.getOffset(text), d.getMessage().nn, d.getSeverity().nn))
3940
assertEquals(expected, actual, s"Expected [${expected.mkString(", ")}] but got [${actual.mkString(", ")}]")
4041
additionalChecks(diagnostics.toList)
4142

@@ -77,8 +78,8 @@ class DiagnosticProviderSuite extends PcAssertions {
7778
),
7879
diags =>
7980
val action = diags.head.getData().asInstanceOf[java.util.List[CodeAction]].asScala.head
80-
assertWithDiff("Remove repeated modifier: \"private\"", action.getTitle(), false)
81-
assertEquals(1, action.getEdit().getChanges().size(), "There should be one change")
81+
assertWithDiff("Remove repeated modifier: \"private\"", action.getTitle().nn, false)
82+
assertEquals(1, action.getEdit().nn.getChanges().nn.size(), "There should be one change")
8283
)
8384

8485
}

0 commit comments

Comments
 (0)