Skip to content

Commit e4bb383

Browse files
Merge pull request #9080 from dotty-staging/upgrade/sbt-1.3.11
Upgrade sbt to 1.3.12
2 parents 1ef1765 + e5ccd70 commit e4bb383

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import dotty.tools.dotc.util.SourceFile
99
import org.jline.reader
1010
import org.jline.reader.Parser.ParseContext
1111
import org.jline.reader._
12+
import org.jline.reader.impl.LineReaderImpl
1213
import org.jline.reader.impl.history.DefaultHistory
1314
import org.jline.terminal.TerminalBuilder
1415
import org.jline.utils.AttributedString
@@ -60,6 +61,8 @@ final class JLineTerminal extends java.io.Closeable {
6061
// this is supplied from the EOFError.getMissing() method
6162
.variable(LIST_MAX, 400) // Ask user when number of completions exceed this limit (default is 100).
6263
.variable(BLINK_MATCHING_PAREN, 0L) // Don't blink the opening paren after typing a closing paren.
64+
.variable(WORDCHARS,
65+
LineReaderImpl.DEFAULT_WORDCHARS.filterNot("*?.[]~=/&;!#%^(){}<>".toSet)) // Finer grained word boundaries
6366
.option(INSERT_TAB, true) // At the beginning of the line, insert tab instead of completing.
6467
.option(AUTO_FRESH_LINE, true) // if not at start of line before prompt, move to new line.
6568
.option(DISABLE_EVENT_EXPANSION, true) // don't process escape sequences in input
@@ -76,6 +79,8 @@ final class JLineTerminal extends java.io.Closeable {
7679
val highlighted = SyntaxHighlighting.highlight(buffer)
7780
AttributedString.fromAnsi(highlighted)
7881
}
82+
def setErrorPattern(errorPattern: java.util.regex.Pattern): Unit = {}
83+
def setErrorIndex(errorIndex: Int): Unit = {}
7984
}
8085

8186
/** Provide multi-line editing support */

project/Build.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -493,9 +493,9 @@ object Build {
493493
libraryDependencies ++= Seq(
494494
"org.scala-lang.modules" % "scala-asm" % "7.3.1-scala-1", // used by the backend
495495
Dependencies.`compiler-interface`,
496-
"org.jline" % "jline-reader" % "3.9.0", // used by the REPL
497-
"org.jline" % "jline-terminal" % "3.9.0",
498-
"org.jline" % "jline-terminal-jna" % "3.9.0" // needed for Windows
496+
"org.jline" % "jline-reader" % "3.15.0", // used by the REPL
497+
"org.jline" % "jline-terminal" % "3.15.0",
498+
"org.jline" % "jline-terminal-jna" % "3.15.0" // needed for Windows
499499
),
500500

501501
// For convenience, change the baseDirectory when running the compiler

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.8
1+
sbt.version=1.3.12

0 commit comments

Comments
 (0)