groovysh: Minor style fixes and rename consistent with jline2.13
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/6f14c6fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/6f14c6fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/6f14c6fd Branch: refs/heads/master Commit: 6f14c6fd9100f3a050bed125f445cd49b9d1906f Parents: cc0c85f Author: Thibault Kruse <thibault.kr...@gmx.de> Authored: Wed Aug 19 14:41:14 2015 +0200 Committer: pascalschumacher <pascalschumac...@gmx.net> Committed: Tue Sep 1 20:20:50 2015 +0200 ---------------------------------------------------------------------- .../tools/shell/commands/DocCommand.groovy | 7 ++--- .../shell/completion/FileNameCompleter.groovy | 30 +++++++++++++------- .../completion/PatchedStringsCompleter.groovy | 1 - 3 files changed, 21 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/6f14c6fd/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy index a264b69..ec35299 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy @@ -18,10 +18,7 @@ */ package org.codehaus.groovy.tools.shell.commands -import jline.console.completer.AggregateCompleter -import jline.console.completer.ArgumentCompleter import jline.console.completer.Completer -import jline.console.completer.StringsCompleter import org.codehaus.groovy.tools.shell.CommandSupport import org.codehaus.groovy.tools.shell.Groovysh @@ -112,9 +109,9 @@ class DocCommand extends CommandSupport { } else if (hasAWTDesktopPlatformSupport) { browseWithAWT(urls) } else { - fail "Browser could not be opened caused by missing platform support for 'java.awt.Desktop'. Please set " + + fail 'Browser could not be opened caused by missing platform support for 'java.awt.Desktop'. Please set ' + "a $ENV_BROWSER_GROOVYSH or $ENV_BROWSER environment variable referring to the browser binary to " + - "solve this issue." + 'solve this issue.' } } http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/6f14c6fd/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy index 9a7b99a..926f9e4 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy @@ -66,9 +66,17 @@ implements Completer private static final boolean OS_IS_WINDOWS; - private final boolean blankSuffix = true; + private boolean printSpaceAfterFullCompletion = true; - private final handleLeadingHyphen = false; + private boolean handleLeadingHyphen = false; + + public boolean getPrintSpaceAfterFullCompletion() { + return printSpaceAfterFullCompletion; + } + + public void setPrintSpaceAfterFullCompletion(boolean printSpaceAfterFullCompletion) { + this.printSpaceAfterFullCompletion = printSpaceAfterFullCompletion; + } static { String os = Configuration.getOsName(); @@ -78,8 +86,8 @@ implements Completer public FileNameCompleter() { } - public FileNameCompleter(boolean blankSuffix) { - this.blankSuffix = blankSuffix; + public FileNameCompleter(boolean printSpaceAfterFullCompletion) { + this.printSpaceAfterFullCompletion = printSpaceAfterFullCompletion; } @@ -136,19 +144,19 @@ implements Completer return matchFiles(buffer, translated, entries, candidates, hyphenChar); } - protected String separator() { + protected static String separator() { return File.separator; } - protected File getUserHome() { + protected static File getUserHome() { return Configuration.getUserHome(); } - protected File getUserDir() { + protected static File getUserDir() { return new File("."); } - protected int matchFiles(final String buffer, final String translated, final File[] files, final List<CharSequence> candidates, hyphenChar) { + protected int matchFiles(final String buffer, final String translated, final File[] files, final List<CharSequence> candidates, final String hyphenChar) { if (files == null) { return -1; } @@ -168,7 +176,7 @@ implements Completer if (file.isDirectory()) { name += separator(); } else { - if (blankSuffix && !hyphenChar) { + if (printSpaceAfterFullCompletion && !hyphenChar) { name += ' '; } } @@ -192,8 +200,8 @@ implements Completer return name; } - private String escapedNameInHyphens(String name, String hyphen) { + private String escapedNameInHyphens(final CharSequence name, String hyphen) { // need to escape every instance of chartoEscape, and every instance of the escape char backslash - return hyphen + name.replace('\\', '\\\\').replace(hyphen, '\\' + hyphen) + hyphen + return hyphen + name.toString().replace('\\', '\\\\').replace(hyphen, '\\' + hyphen) + hyphen } } http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/6f14c6fd/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/PatchedStringsCompleter.groovy ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/PatchedStringsCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/PatchedStringsCompleter.groovy index 2ecafec..65c9ed7 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/PatchedStringsCompleter.groovy +++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/PatchedStringsCompleter.groovy @@ -1,6 +1,5 @@ package org.codehaus.groovy.tools.shell.completion -import jline.console.completer.Completer import jline.console.completer.StringsCompleter import static jline.internal.Preconditions.checkNotNull
