jdk-sandbox: comparison langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java

equal deleted inserted replaced

-:8b372e28f106
+:8a8f52a733dd
 import jdk.jshell.JShell.Subscription;
 import static java.nio.file.StandardOpenOption.CREATE;
 import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
 import static java.nio.file.StandardOpenOption.WRITE;
-import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.Optional;
 import java.util.ResourceBundle;
+import java.util.Spliterators;
+import java.util.function.Supplier;
 import static java.util.stream.Collectors.toList;
 /**
 * Command line REPL tool for Java using the JShell API.
 * @author Robert Field
 }
 }
 private static final CompletionProvider EMPTY_COMPLETION_PROVIDER = new FixedCompletionProvider();
+private static final CompletionProvider KEYWORD_COMPLETION_PROVIDER = new FixedCompletionProvider("all ", "start ", "history ");
 private static final CompletionProvider FILE_COMPLETION_PROVIDER = fileCompletions(p -> true);
 private final Map<String, Command> commands = new LinkedHashMap<>();
 private void registerCommand(Command cmd) {
 commands.put(cmd.command, cmd);
 }
 .map(k -> new Suggestion(k, false))
 .collect(Collectors.toList());
 };
 }
+private CompletionProvider editKeywordCompletion() {
+return (code, cursor, anchor) -> {
+List<Suggestion> result = new ArrayList<>();
+result.addAll(KEYWORD_COMPLETION_PROVIDER.completionSuggestions(code, cursor, anchor));
+result.addAll(editCompletion().completionSuggestions(code, cursor, anchor));
+return result;
+};
+}
 private static CompletionProvider saveCompletion() {
-CompletionProvider keyCompletion = new FixedCompletionProvider("all ", "history ", "start ");
 return (code, cursor, anchor) -> {
 List<Suggestion> result = new ArrayList<>();
 int space = code.indexOf(' ');
 if (space == (-1)) {
-result.addAll(keyCompletion.completionSuggestions(code, cursor, anchor));
+result.addAll(KEYWORD_COMPLETION_PROVIDER.completionSuggestions(code, cursor, anchor));
 }
 result.addAll(FILE_COMPLETION_PROVIDER.completionSuggestions(code.substring(space + 1), cursor - space - 1, anchor));
 anchor[0] += space + 1;
 return result;
 };
 }
 // Table of commands -- with command forms, argument kinds, help message, implementation, ...
 {
-registerCommand(new Command("/list", "[all]", "list the source you have typed",
+registerCommand(new Command("/list", "[all|start|history|<name or id>]", "list the source you have typed",
 arg -> cmdList(arg),
-new FixedCompletionProvider("all")));
+editKeywordCompletion()));
 registerCommand(new Command("/seteditor", "<executable>", "set the external editor command to use",
 arg -> cmdSetEditor(arg),
 EMPTY_COMPLETION_PROVIDER));
 registerCommand(new Command("/edit", "<name or id>", "edit a source entry referenced by name or id",
 arg -> cmdEdit(arg),
 cmdout.printf("%s\n", s);
 }
 }
 /**
-* Convert a user argument to a list of snippets referenced by that
+* Avoid parameterized varargs possible heap pollution warning.
-* argument (or lack of argument).
-* @param arg The user's argument to the command
-* @return a list of referenced snippets
 */
-private List<Snippet> argToSnippets(String arg) {
+private interface SnippetPredicate extends Predicate<Snippet> { }
-List<Snippet> snippets = new ArrayList<>();
-if (arg.isEmpty()) {
+/**
-// Default is all user snippets
+* Apply filters to a stream until one that is non-empty is found.
-for (Snippet sn : state.snippets()) {
+* Adapted from Stuart Marks
-if (notInStartUp(sn)) {
+*
-snippets.add(sn);
+* @param supplier Supply the Snippet stream to filter
-}
+* @param filters Filters to attempt
-}
+* @return The non-empty filtered Stream, or null
+*/
+private static Stream<Snippet> nonEmptyStream(Supplier<Stream<Snippet>> supplier,
+SnippetPredicate... filters) {
+for (SnippetPredicate filt : filters) {
+Iterator<Snippet> iterator = supplier.get().filter(filt).iterator();
+if (iterator.hasNext()) {
+return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, 0), false);
+}
+}
+return null;
+}
+private boolean mainActive(Snippet sn) {
+return notInStartUp(sn) && state.status(sn).isActive;
+}
+private boolean matchingDeclaration(Snippet sn, String name) {
+return sn instanceof DeclarationSnippet
+&& ((DeclarationSnippet) sn).name().equals(name);
+}
+/**
+* Convert a user argument to a Stream of snippets referenced by that argument
+* (or lack of argument).
+*
+* @param arg The user's argument to the command, maybe be the empty string
+* @return a Stream of referenced snippets or null if no matches to specific arg
+*/
+private Stream<Snippet> argToSnippets(String arg, boolean allowAll) {
+List<Snippet> snippets = state.snippets();
+if (allowAll && arg.equals("all")) {
+// all snippets including start-up, failed, and overwritten
+return snippets.stream();
+} else if (arg.isEmpty()) {
+// Default is all active user snippets
+return snippets.stream()
+.filter(this::mainActive);
 } else {
-// Look for all declarations with matching names
+Stream<Snippet> result =
-for (Snippet key : state.snippets()) {
+nonEmptyStream(
-switch (key.kind()) {
+() -> snippets.stream(),
-case METHOD:
+// look for active user declarations matching the name
-case VAR:
+sn -> mainActive(sn) && matchingDeclaration(sn, arg),
-case TYPE_DECL:
+// else, look for any declarations matching the name
-if (((DeclarationSnippet) key).name().equals(arg)) {
+sn -> matchingDeclaration(sn, arg),
-snippets.add(key);
+// else, look for an id of this name
-}
+sn -> sn.id().equals(arg)
-break;
+);
-}
+return result;
 }
-// If no declarations found, look for an id of this name
-if (snippets.isEmpty()) {
-for (Snippet sn : state.snippets()) {
-if (sn.id().equals(arg)) {
-snippets.add(sn);
-break;
-}
-}
-}
-// If still no matches found, give an error
-if (snippets.isEmpty()) {
-hard("No definition or id named %s found.  See /classes /methods /vars or /list", arg);
-return null;
-}
-}
-return snippets;
 }
 private void cmdDrop(String arg) {
 if (arg.isEmpty()) {
 hard("In the /drop argument, please specify an import, variable, method, or class to drop.");
 hard("Specify by id or name. Use /list to see ids. Use /reset to reset all state.");
 return;
 }
-List<Snippet> snippetSet = argToSnippets(arg);
+Stream<Snippet> stream = argToSnippets(arg, false);
-if (snippetSet == null) {
+if (stream == null) {
+hard("No definition or id named %s found.  See /classes, /methods, /vars, or /list", arg);
 return;
 }
-snippetSet = snippetSet.stream()
+List<Snippet> snippets = stream
-.filter(sn -> state.status(sn).isActive)
+.filter(sn -> state.status(sn).isActive && sn instanceof PersistentSnippet)
 .collect(toList());
-snippetSet.removeIf(sn -> !(sn instanceof PersistentSnippet));
+if (snippets.isEmpty()) {
-if (snippetSet.isEmpty()) {
+hard("The argument did not specify an active import, variable, method, or class to drop.");
-hard("The argument did not specify an import, variable, method, or class to drop.");
 return;
 }
-if (snippetSet.size() > 1) {
+if (snippets.size() > 1) {
 hard("The argument references more than one import, variable, method, or class.");
 hard("Try again with one of the ids below:");
-for (Snippet sn : snippetSet) {
+for (Snippet sn : snippets) {
 cmdout.printf("%4s : %s\n", sn.id(), sn.source().replace("\n", "\n       "));
 }
 return;
 }
-PersistentSnippet psn = (PersistentSnippet) snippetSet.iterator().next();
+PersistentSnippet psn = (PersistentSnippet) snippets.get(0);
 state.drop(psn).forEach(this::handleEvent);
 }
 private void cmdEdit(String arg) {
-List<Snippet> snippetSet = argToSnippets(arg);
+Stream<Snippet> stream = argToSnippets(arg, true);
-if (snippetSet == null) {
+if (stream == null) {
+hard("No definition or id named %s found.  See /classes, /methods, /vars, or /list", arg);
 return;
 }
 Set<String> srcSet = new LinkedHashSet<>();
-for (Snippet key : snippetSet) {
+stream.forEachOrdered(sn -> {
-String src = key.source();
+String src = sn.source();
-switch (key.subKind()) {
+switch (sn.subKind()) {
 case VAR_VALUE_SUBKIND:
 break;
 case ASSIGNMENT_SUBKIND:
 case OTHER_EXPRESSION_SUBKIND:
 case TEMP_VAR_EXPRESSION_SUBKIND:
 break;
 default:
 srcSet.add(src);
 break;
 }
-}
+});
 StringBuilder sb = new StringBuilder();
 for (String s : srcSet) {
 sb.append(s);
 sb.append('\n');
 }
 return s.substring(b, e + 1);
 }
 }
 private void cmdList(String arg) {
-boolean all = false;
+if (arg.equals("history")) {
-switch (arg) {
+cmdHistory();
-case "all":
+return;
-all = true;
+}
-break;
+Stream<Snippet> stream = argToSnippets(arg, true);
-case "history":
+if (stream == null) {
-cmdHistory();
+// Check if there are any definitions at all
-return;
+if (argToSnippets("", false).iterator().hasNext()) {
-case "":
+hard("No definition or id named %s found.  Try /list without arguments.", arg);
-break;
+} else {
-default:
+hard("No definition or id named %s found.  There are no active definitions.", arg);
-hard("Invalid /list argument: %s", arg);
+}
 return;
 }
-boolean hasOutput = false;
-for (Snippet sn : state.snippets()) {
+// prevent double newline on empty list
-if (all || (notInStartUp(sn) && state.status(sn).isActive)) {
+boolean[] hasOutput = new boolean[1];
-if (!hasOutput) {
+stream.forEachOrdered(sn -> {
-cmdout.println();
+if (!hasOutput[0]) {
-hasOutput = true;
+cmdout.println();
-}
+hasOutput[0] = true;
-cmdout.printf("%4s : %s\n", sn.id(), sn.source().replace("\n", "\n       "));
+}
+cmdout.printf("%4s : %s\n", sn.id(), sn.source().replace("\n", "\n       "));
-}
+});
-}
 }
 private void cmdOpen(String filename) {
 if (filename.isEmpty()) {
 hard("The /open command requires a filename argument.");
 if (!mat.find()) {
 hard("Malformed argument to the /save command: %s", arg_filename);
 return;
 }
 boolean useHistory = false;
-boolean saveAll = false;
+String saveAll = "";
 boolean saveStart = false;
 String cmd = mat.group("cmd");
 if (cmd != null) switch (cmd) {
 case "all":
-saveAll = true;
+saveAll = "all";
 break;
 case "history":
 useHistory = true;
 break;
 case "start":
 writer.write("\n");
 }
 } else if (saveStart) {
 writer.append(DEFAULT_STARTUP);
 } else {
-for (Snippet sn : state.snippets()) {
+Stream<Snippet> stream = argToSnippets(saveAll, true);
-if (saveAll || notInStartUp(sn)) {
+if (stream != null) {
+for (Snippet sn : stream.collect(toList())) {
 writer.write(sn.source());
 writer.write("\n");
 }
 }
 }

changeset 34570	8a8f52a733dd
parent 34477	64001b0533a2
child 34999	aacf94dab449