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

equal deleted inserted replaced

-:563b42fc70ba
+:36468b5fa7f4
 }
 <T> void hardPairs(Stream<T> stream, Function<T, String> a, Function<T, String> b) {
 Map<String, String> a2b = stream.collect(toMap(a, b,
 (m1, m2) -> m1,
-() -> new LinkedHashMap<>()));
+LinkedHashMap::new));
 for (Entry<String, String> e : a2b.entrySet()) {
 hard("%s", e.getKey());
 rawout(prefix(e.getValue(), feedback.getPre() + "\t", feedback.getPost()));
 }
 }
 return commands.values()
 .stream()
 .filter(filter)
 .filter(command -> command.command.startsWith(cmd))
-.toArray(size -> new Command[size]);
+.toArray(Command[]::new);
 }
 private static Path toPathResolvingUserHome(String pathString) {
 if (pathString.replace(File.separatorChar, '/').startsWith("~/"))
 return Paths.get(System.getProperty("user.home"), pathString.substring(2));
 || !prior.contains(((DeclarationSnippet) k).name())))
 .flatMap(k -> (k instanceof DeclarationSnippet)
 ? Stream.of(String.valueOf(k.id()) + " ", ((DeclarationSnippet) k).name() + " ")
 : Stream.of(String.valueOf(k.id()) + " "))
 .filter(k -> k.startsWith(argPrefix))
-.map(k -> new ArgSuggestion(k))
+.map(ArgSuggestion::new)
 .collect(Collectors.toList());
 };
 }
 // Completion based on snippet supplier with -all -start (and sometimes -history) options
 int pastSpace = code.indexOf(' ') + 1; // zero if no space
 if (pastSpace == 0) {
 result = new FixedCompletionProvider(commands.values().stream()
 .filter(cmd -> cmd.kind.showInHelp || cmd.kind == CommandKind.HELP_SUBJECT)
 .map(c -> c.command + " ")
-.toArray(size -> new String[size]))
+.toArray(String[]::new))
 .completionSuggestions(code, cursor, anchor);
 } else if (code.startsWith("/se")) {
 result = new FixedCompletionProvider(SET_SUBCOMMANDS)
 .completionSuggestions(code.substring(pastSpace), cursor - pastSpace, anchor);
 } else {
 // Table of commands -- with command forms, argument kinds, helpKey message, implementation, ...
 {
 registerCommand(new Command("/list",
-arg -> cmdList(arg),
+this::cmdList,
 snippetWithOptionCompletion(SNIPPET_HISTORY_OPTION_COMPLETION_PROVIDER,
 this::allSnippets)));
 registerCommand(new Command("/edit",
-arg -> cmdEdit(arg),
+this::cmdEdit,
 snippetWithOptionCompletion(SNIPPET_OPTION_COMPLETION_PROVIDER,
 this::allSnippets)));
 registerCommand(new Command("/drop",
-arg -> cmdDrop(arg),
+this::cmdDrop,
 snippetCompletion(this::dropableSnippets),
 CommandKind.REPLAY));
 registerCommand(new Command("/save",
-arg -> cmdSave(arg),
+this::cmdSave,
 saveCompletion()));
 registerCommand(new Command("/open",
-arg -> cmdOpen(arg),
+this::cmdOpen,
 FILE_COMPLETION_PROVIDER));
 registerCommand(new Command("/vars",
-arg -> cmdVars(arg),
+this::cmdVars,
 snippetWithOptionCompletion(SNIPPET_OPTION_COMPLETION_PROVIDER,
 this::allVarSnippets)));
 registerCommand(new Command("/methods",
-arg -> cmdMethods(arg),
+this::cmdMethods,
 snippetWithOptionCompletion(SNIPPET_OPTION_COMPLETION_PROVIDER,
 this::allMethodSnippets)));
 registerCommand(new Command("/types",
-arg -> cmdTypes(arg),
+this::cmdTypes,
 snippetWithOptionCompletion(SNIPPET_OPTION_COMPLETION_PROVIDER,
 this::allTypeSnippets)));
 registerCommand(new Command("/imports",
 arg -> cmdImports(),
 EMPTY_COMPLETION_PROVIDER));
 EMPTY_COMPLETION_PROVIDER));
 registerCommand(new Command("/reset",
 arg -> cmdReset(),
 EMPTY_COMPLETION_PROVIDER));
 registerCommand(new Command("/reload",
-arg -> cmdReload(arg),
+this::cmdReload,
 reloadCompletion()));
 registerCommand(new Command("/classpath",
-arg -> cmdClasspath(arg),
+this::cmdClasspath,
 classPathCompletion(),
 CommandKind.REPLAY));
 registerCommand(new Command("/history",
 arg -> cmdHistory(),
 EMPTY_COMPLETION_PROVIDER));
 registerCommand(new Command("/debug",
-arg -> cmdDebug(arg),
+this::cmdDebug,
 EMPTY_COMPLETION_PROVIDER,
 CommandKind.HIDDEN));
 registerCommand(new Command("/help",
-arg -> cmdHelp(arg),
+this::cmdHelp,
 helpCompletion()));
 registerCommand(new Command("/set",
-arg -> cmdSet(arg),
+this::cmdSet,
 new ContinuousCompletionProvider(Map.of(
 // need more completion for format for usability
 "format", feedback.modeCompletions(),
 "truncation", feedback.modeCompletions(),
 "feedback", feedback.modeCompletions(),
 "editor", fileCompletions(Files::isExecutable),
 "start", FILE_COMPLETION_PROVIDER),
 STARTSWITH_MATCHER)));
 registerCommand(new Command("/?",
 "help.quest",
-arg -> cmdHelp(arg),
+this::cmdHelp,
 helpCompletion(),
 CommandKind.NORMAL));
 registerCommand(new Command("/!",
 "help.bang",
 arg -> cmdUseHistoryEntry(-1),
 ? "_retain"
 : "_blank";
 }
 String[] matches = Arrays.stream(subs)
 .filter(s -> s.startsWith(sub))
-.toArray(size -> new String[size]);
+.toArray(String[]::new);
 if (matches.length == 0) {
 // There are no matching sub-commands
 errormsg("jshell.err.arg", cmd, sub);
 fluffmsg("jshell.msg.use.one.of", Arrays.stream(subs)
 .collect(Collectors.joining(", "))
 ArgTokenizer at = new ArgTokenizer("/help", arg);
 String subject = at.next();
 if (subject != null) {
 Command[] matches = commands.values().stream()
 .filter(c -> c.command.startsWith(subject))
-.toArray(size -> new Command[size]);
+.toArray(Command[]::new);
 if (matches.length == 1) {
 String cmd = matches[0].command;
 if (cmd.equals("/set")) {
 // Print the help doc for the specified sub-command
 String which = subCommand(cmd, at, SET_SUBCOMMANDS);
 * @param diagnostics input list
 * @return filtered list
 */
 List<Diag> errorsOnly(List<Diag> diagnostics) {
 return diagnostics.stream()
-.filter(d -> d.isError())
+.filter(Diag::isError)
 .collect(toList());
 }
 void displayDiagnostics(String source, Diag diag, List<String> toDisplay) {
 for (String line : diag.getMessage(null).split("\\r?\\n")) { // TODO: Internationalize

changeset 42827	36468b5fa7f4
parent 42415	85388bae723d
child 42843	a8d83044a192