From b33eb4f01beae34f14d83ec53625efc56fb8d376 Mon Sep 17 00:00:00 2001 From: rochala Date: Thu, 12 Sep 2024 20:24:38 +0200 Subject: [PATCH] Fix accidentaly removed .nn call and remove -release from forbidden options [Cherry-picked 3078860c15ef937d1f846a5318aeaccae9904f32] --- compiler/src/dotty/tools/dotc/interactive/Completion.scala | 2 +- .../src/main/dotty/tools/pc/ScalaPresentationCompiler.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala index 9a9f7aa78d49..af27a4006140 100644 --- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala +++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala @@ -250,7 +250,7 @@ object Completion: // https://github.com/scalameta/metals/blob/main/mtags/src/main/scala/scala/meta/internal/mtags/KeywordWrapper.scala // https://github.com/com-lihaoyi/Ammonite/blob/73a874173cd337f953a3edc9fb8cb96556638fdd/amm/util/src/main/scala/ammonite/util/Model.scala private def needsBacktick(s: String) = - val chunks = s.split("_", -1) + val chunks = s.split("_", -1).nn val validChunks = chunks.zipWithIndex.forall { case (chunk, index) => chunk.nn.forall(Chars.isIdentifierPart) || diff --git a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala index e6da8b79164f..218d92c38ffa 100644 --- a/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala +++ b/presentation-compiler/src/main/dotty/tools/pc/ScalaPresentationCompiler.scala @@ -60,7 +60,7 @@ case class ScalaPresentationCompiler( val scalaVersion = BuildInfo.scalaVersion private val forbiddenOptions = Set("-print-lines", "-print-tasty") - private val forbiddenDoubleOptions = Set("-release") + private val forbiddenDoubleOptions = Set.empty[String] given ReportContext = folderPath