Skip to content

Upgrade sbt to 1.3.12 #9080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 2, 2020
Merged

Upgrade sbt to 1.3.12 #9080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
378c66c
Upgrade sbt to 1.3.12
smarter May 29, 2020
ff7673c
Upgrade JLine to 3.15.0
smarter Jun 1, 2020
e5ccd70
Finer grained word boundaries for the REPL's line editor
smarter Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions compiler/src/dotty/tools/repl/JLineTerminal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import dotty.tools.dotc.util.SourceFile
import org.jline.reader
import org.jline.reader.Parser.ParseContext
import org.jline.reader._
import org.jline.reader.impl.LineReaderImpl
import org.jline.reader.impl.history.DefaultHistory
import org.jline.terminal.TerminalBuilder
import org.jline.utils.AttributedString
Expand Down Expand Up @@ -60,6 +61,8 @@ final class JLineTerminal extends java.io.Closeable {
// this is supplied from the EOFError.getMissing() method
.variable(LIST_MAX, 400) // Ask user when number of completions exceed this limit (default is 100).
.variable(BLINK_MATCHING_PAREN, 0L) // Don't blink the opening paren after typing a closing paren.
.variable(WORDCHARS,
LineReaderImpl.DEFAULT_WORDCHARS.filterNot("*?.[]~=/&;!#%^(){}<>".toSet)) // Finer grained word boundaries
.option(INSERT_TAB, true) // At the beginning of the line, insert tab instead of completing.
.option(AUTO_FRESH_LINE, true) // if not at start of line before prompt, move to new line.
.option(DISABLE_EVENT_EXPANSION, true) // don't process escape sequences in input
Expand All @@ -76,6 +79,8 @@ final class JLineTerminal extends java.io.Closeable {
val highlighted = SyntaxHighlighting.highlight(buffer)
AttributedString.fromAnsi(highlighted)
}
def setErrorPattern(errorPattern: java.util.regex.Pattern): Unit = {}
def setErrorIndex(errorIndex: Int): Unit = {}
}

/** Provide multi-line editing support */
Expand Down
6 changes: 3 additions & 3 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,9 +493,9 @@ object Build {
libraryDependencies ++= Seq(
"org.scala-lang.modules" % "scala-asm" % "7.3.1-scala-1", // used by the backend
Dependencies.`compiler-interface`,
"org.jline" % "jline-reader" % "3.9.0", // used by the REPL
"org.jline" % "jline-terminal" % "3.9.0",
"org.jline" % "jline-terminal-jna" % "3.9.0" // needed for Windows
"org.jline" % "jline-reader" % "3.15.0", // used by the REPL
"org.jline" % "jline-terminal" % "3.15.0",
"org.jline" % "jline-terminal-jna" % "3.15.0" // needed for Windows
),

// For convenience, change the baseDirectory when running the compiler
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.8
sbt.version=1.3.12