diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-09-21 21:46:07 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-09-21 21:46:49 +1000 |
| commit | d8d8ba71236bc18d0b4c74f9ebead2973dc6e435 (patch) | |
| tree | 659f7291a5f42a0c98e532892e6742165d0dfcec /src/repl | |
| parent | 01103764ef576395dc6201d1d2b5a700a28bdd2a (diff) | |
| download | scala-d8d8ba71236bc18d0b4c74f9ebead2973dc6e435.tar.gz scala-d8d8ba71236bc18d0b4c74f9ebead2973dc6e435.tar.bz2 scala-d8d8ba71236bc18d0b4c74f9ebead2973dc6e435.zip | |
Remove used param and document positionDelta
Diffstat (limited to 'src/repl')
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/IMain.scala | 2 | ||||
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/PresentationCompilerCompleter.scala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala index f6f391600b..ef6ab4063a 100644 --- a/src/repl/scala/tools/nsc/interpreter/IMain.scala +++ b/src/repl/scala/tools/nsc/interpreter/IMain.scala @@ -1180,7 +1180,7 @@ class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Set case class Incomplete(trees: List[Tree]) extends Result case class Success(trees: List[Tree]) extends Result - def apply(line: String, forPresentation: Boolean = false): Result = debugging(s"""parse("$line")""") { + def apply(line: String): Result = debugging(s"""parse("$line")""") { var isIncomplete = false def parse = { reporter.reset() diff --git a/src/repl/scala/tools/nsc/interpreter/PresentationCompilerCompleter.scala b/src/repl/scala/tools/nsc/interpreter/PresentationCompilerCompleter.scala index 01735aed3a..0fb3236966 100644 --- a/src/repl/scala/tools/nsc/interpreter/PresentationCompilerCompleter.scala +++ b/src/repl/scala/tools/nsc/interpreter/PresentationCompilerCompleter.scala @@ -97,14 +97,14 @@ class PresentationCompilerCompleter(intp: IMain) extends Completion with ScalaCo || CompletionResult.camelMatch(r.name)(r.name.newName(StringOps.longestCommonPrefix(memberCompletions))) ) if (memberCompletions.isEmpty) Completion.NoCandidates - else if (allowCompletion) Candidates(cursor + r.positionDelta, memberCompletions) + else if (allowCompletion) Candidates(cursor - r.positionDelta, memberCompletions) else Candidates(cursor, "" :: memberCompletions) } else if (matching.nonEmpty && matching.forall(_.symNameDropLocal == r.name)) Completion.NoCandidates // don't offer completion if the only option has been fully typed already else { // regular completion val memberCompletions: List[String] = matching.map(_.symNameDropLocal.decoded).distinct.sorted - Candidates(cursor + r.positionDelta, memberCompletions) + Candidates(cursor - r.positionDelta, memberCompletions) } } lastCommonPrefixCompletion = |