luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JLine completion integration now considers a suggestion with a newline to be preformatted

This commit is contained in:
Mark Harrah 2012-07-13 13:41:00 -04:00
parent 2a6ad35502
commit 72e05309c5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/complete/JLineCompletion.scala
View File

@ -64,11 +64,11 @@ object JLineCompletion
{ {
val (insert, display) = val (insert, display) =
( (Set.empty[String], Set.empty[String]) /: cs) { case ( t @ (insert,display), comp) => ( (Set.empty[String], Set.empty[String]) /: cs) { case ( t @ (insert,display), comp) =>
if(comp.isEmpty) t else (insert + comp.append, appendNonEmpty(display, comp.display.trim)) if(comp.isEmpty) t else (insert + comp.append, appendNonEmpty(display, comp.display))
} }
(insert.toSeq, display.toSeq.sorted) (insert.toSeq, display.toSeq.sorted)
} }
def appendNonEmpty(set: Set[String], add: String) = if(add.isEmpty) set else set + add def appendNonEmpty(set: Set[String], add: String) = if(add.trim.isEmpty) set else set + add
def customCompletor(f: (String, Int) => (Seq[String], Seq[String])): (ConsoleReader, Int) => Boolean = def customCompletor(f: (String, Int) => (Seq[String], Seq[String])): (ConsoleReader, Int) => Boolean =
(reader, level) => { (reader, level) => {
@ -128,9 +128,10 @@ object JLineCompletion
val (lines, columns) = cs partition hasNewline val (lines, columns) = cs partition hasNewline
for(line <- lines) { for(line <- lines) {
reader.printString(line) reader.printString(line)
reader.printNewline() if(line.charAt(line.length - 1) != '\n')
reader.printNewline()
} }
reader.printColumns(JavaConversions.asJavaList(columns)) reader.printColumns(JavaConversions.asJavaList(columns.map(_.trim)))
} }
def hasNewline(s: String): Boolean = s.indexOf('\n') >= 0 def hasNewline(s: String): Boolean = s.indexOf('\n') >= 0
def shouldPrint(cs: Seq[String], reader: ConsoleReader): Boolean = def shouldPrint(cs: Seq[String], reader: ConsoleReader): Boolean =