Skip to content

Use JLine 3 in the REPL #4680

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 18 commits into from
Jun 29, 2018
Merged

Use JLine 3 in the REPL #4680

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
97acdfd
Use JLine 3 in the REPL
allanrenucci May 28, 2018
a437b74
Cleanup SourceFile API
allanrenucci Jun 18, 2018
801c761
Take cursor position into account when inserting a new line
allanrenucci Jun 18, 2018
94b2d81
Use JGit in the build instead of shell and bat scripts
allanrenucci Jun 19, 2018
8fd65ac
Add dependency on jline-terminal-jna for Windows
allanrenucci Jun 19, 2018
d9c0c54
Polishing
allanrenucci Jun 19, 2018
f247799
Fix tests: add jline to test classpath
allanrenucci Jun 19, 2018
de2a214
In REPL, ENTER means SUBMIT when:
allanrenucci Jun 20, 2018
a0c3203
Fail early if not able to create a terminal
allanrenucci Jun 20, 2018
7ff9103
Simplify REPL tests
allanrenucci Jun 22, 2018
995ae34
Simplify compiler run creation in REPL
allanrenucci Jun 22, 2018
3fd7a06
REPL state now store a Context instead of a Run
allanrenucci Jun 22, 2018
5af8f55
More cleanup
allanrenucci Jun 22, 2018
b055bc4
Workaround #4709
allanrenucci Jun 22, 2018
e8fb849
Fix dotr script: add JLine jars to the classpath
allanrenucci Jun 23, 2018
329d2a4
Tweak JLine configurations
allanrenucci Jun 25, 2018
77ea7a7
Polishing
allanrenucci Jun 25, 2018
926d426
Address review comments
allanrenucci Jun 29, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
In REPL, ENTER means SUBMIT when: 
- cursor is at end (discarding whitespaces) - and, input line is complete
  • Loading branch information
@allanrenucci
allanrenucci committed Jun 29, 2018
commit de2a214381a8e10c79359767fbca1bd30baf033e
10 changes: 6 additions & 4 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 @@ -92,11 +92,13 @@ final class JLineTerminal extends java.io.Closeable {

context match {
case ParseContext.ACCEPT_LINE =>
val lastLineOffset = line.lastIndexOfSlice(System.lineSeparator)
if (cursor <= lastLineOffset || ParseResult.isIncomplete(line)) incomplete()
// ENTER means SUBMIT when
// - cursor is at end (discarding whitespaces)
// - and, input line is complete
val cursorIsAtEnd = line.indexWhere(!_.isWhitespace, from = cursor) >= 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be called cursorNotAtEnd no? In any case, it's a bit confusing that the comment above describes the conditions for submitting, but the code checks the conditions for not submitting, either the code logic or the comment should be changed.
if (cursorIsAtEnd || ParseResult.isIncomplete(line)) incomplete()
else parsedLine("", 0)
// using dummy values,
// resulting parsed line is probably unused
// using dummy values, resulting parsed line is probably unused

case ParseContext.COMPLETE =>
// Parse to find completions (typically after a Tab).
Expand Down