src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
author rfield
Fri, 23 Feb 2018 10:25:22 -0800
changeset 48939 ba545e52b932
parent 48543 7067fe4e054e
child 49515 083318155ad1
permissions -rw-r--r--
8166232: jshell tool: cannot access previous history Reviewed-by: jlahoda
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
     1
/*
48543
7067fe4e054e 8189102: All tools should support -?, -h and --help
goetz
parents: 48349
diff changeset
     2
 * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
     4
 *
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    10
 *
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    15
 * accompanied this code).
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    16
 *
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    20
 *
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    23
 * questions.
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    24
 */
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    25
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    26
package jdk.internal.jshell.tool;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    27
42972
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
    28
import java.io.BufferedReader;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    29
import java.io.BufferedWriter;
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
    30
import java.io.EOFException;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    31
import java.io.File;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    32
import java.io.FileNotFoundException;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    33
import java.io.FileReader;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    34
import java.io.IOException;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    35
import java.io.InputStream;
42972
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
    36
import java.io.InputStreamReader;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    37
import java.io.PrintStream;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    38
import java.io.Reader;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    39
import java.io.StringReader;
47837
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
    40
import java.lang.module.ModuleDescriptor;
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
    41
import java.lang.module.ModuleFinder;
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
    42
import java.lang.module.ModuleReference;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    43
import java.nio.charset.Charset;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    44
import java.nio.file.FileSystems;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    45
import java.nio.file.Files;
48259
c0bf7d8af037 8191636: [Windows] jshell tool: Wrong character in /env class-path command crashes jshell
jlahoda
parents: 47931
diff changeset
    46
import java.nio.file.InvalidPathException;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    47
import java.nio.file.Path;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    48
import java.nio.file.Paths;
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
    49
import java.text.MessageFormat;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    50
import java.util.ArrayList;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    51
import java.util.Arrays;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
    52
import java.util.Collection;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    53
import java.util.Collections;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
    54
import java.util.HashMap;
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
    55
import java.util.HashSet;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    56
import java.util.Iterator;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    57
import java.util.LinkedHashMap;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    58
import java.util.LinkedHashSet;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    59
import java.util.List;
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
    60
import java.util.Locale;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    61
import java.util.Map;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    62
import java.util.Map.Entry;
47837
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
    63
import java.util.Optional;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    64
import java.util.Scanner;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    65
import java.util.Set;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    66
import java.util.function.Consumer;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    67
import java.util.function.Predicate;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    68
import java.util.prefs.Preferences;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    69
import java.util.regex.Matcher;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    70
import java.util.regex.Pattern;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    71
import java.util.stream.Collectors;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    72
import java.util.stream.Stream;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    73
import java.util.stream.StreamSupport;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    74
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    75
import jdk.internal.jshell.debug.InternalDebugControl;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    76
import jdk.internal.jshell.tool.IOContext.InputInterruptedException;
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
    77
import jdk.jshell.DeclarationSnippet;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    78
import jdk.jshell.Diag;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    79
import jdk.jshell.EvalException;
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
    80
import jdk.jshell.ExpressionSnippet;
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
    81
import jdk.jshell.ImportSnippet;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    82
import jdk.jshell.JShell;
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
    83
import jdk.jshell.JShell.Subscription;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    84
import jdk.jshell.MethodSnippet;
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
    85
import jdk.jshell.Snippet;
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
    86
import jdk.jshell.Snippet.Kind;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    87
import jdk.jshell.Snippet.Status;
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
    88
import jdk.jshell.SnippetEvent;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    89
import jdk.jshell.SourceCodeAnalysis;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    90
import jdk.jshell.SourceCodeAnalysis.CompletionInfo;
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
    91
import jdk.jshell.SourceCodeAnalysis.Completeness;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    92
import jdk.jshell.SourceCodeAnalysis.Suggestion;
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
    93
import jdk.jshell.TypeDeclSnippet;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    94
import jdk.jshell.UnresolvedReferenceException;
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
    95
import jdk.jshell.VarSnippet;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    96
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    97
import static java.nio.file.StandardOpenOption.CREATE;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    98
import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
    99
import static java.nio.file.StandardOpenOption.WRITE;
47931
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
   100
import java.util.AbstractMap.SimpleEntry;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   101
import java.util.MissingResourceException;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   102
import java.util.ResourceBundle;
41934
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
   103
import java.util.ServiceLoader;
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
   104
import java.util.Spliterators;
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
   105
import java.util.function.Function;
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
   106
import java.util.function.Supplier;
40588
b5c32bfa9710 8160089: jshell tool: use new double-dash long-form command-line options
rfield
parents: 40516
diff changeset
   107
import jdk.internal.joptsimple.*;
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   108
import jdk.internal.jshell.tool.Feedback.FormatAction;
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   109
import jdk.internal.jshell.tool.Feedback.FormatCase;
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   110
import jdk.internal.jshell.tool.Feedback.FormatErrors;
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   111
import jdk.internal.jshell.tool.Feedback.FormatResolve;
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   112
import jdk.internal.jshell.tool.Feedback.FormatUnresolved;
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   113
import jdk.internal.jshell.tool.Feedback.FormatWhen;
41934
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
   114
import jdk.internal.editor.spi.BuildInEditorProvider;
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
   115
import jdk.internal.editor.external.ExternalEditor;
40588
b5c32bfa9710 8160089: jshell tool: use new double-dash long-form command-line options
rfield
parents: 40516
diff changeset
   116
import static java.util.Arrays.asList;
b5c32bfa9710 8160089: jshell tool: use new double-dash long-form command-line options
rfield
parents: 40516
diff changeset
   117
import static java.util.Arrays.stream;
48275
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
   118
import static java.util.Collections.singletonList;
40588
b5c32bfa9710 8160089: jshell tool: use new double-dash long-form command-line options
rfield
parents: 40516
diff changeset
   119
import static java.util.stream.Collectors.joining;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   120
import static java.util.stream.Collectors.toList;
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   121
import static jdk.jshell.Snippet.SubKind.TEMP_VAR_EXPRESSION_SUBKIND;
38535
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 38531
diff changeset
   122
import static jdk.jshell.Snippet.SubKind.VAR_VALUE_SUBKIND;
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   123
import static java.util.stream.Collectors.toMap;
38535
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 38531
diff changeset
   124
import static jdk.internal.jshell.debug.InternalDebugControl.DBG_COMPA;
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 38531
diff changeset
   125
import static jdk.internal.jshell.debug.InternalDebugControl.DBG_DEP;
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 38531
diff changeset
   126
import static jdk.internal.jshell.debug.InternalDebugControl.DBG_EVNT;
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 38531
diff changeset
   127
import static jdk.internal.jshell.debug.InternalDebugControl.DBG_FMGR;
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 38531
diff changeset
   128
import static jdk.internal.jshell.debug.InternalDebugControl.DBG_GEN;
43134
006808ae5f6e 8171981: JShell: Fails compilation: new Object().getClass().getSuperclass()
rfield
parents: 43038
diff changeset
   129
import static jdk.internal.jshell.debug.InternalDebugControl.DBG_WRAP;
40765
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
   130
import static jdk.internal.jshell.tool.ContinuousCompletionProvider.STARTSWITH_MATCHER;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   131
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   132
/**
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   133
 * Command line REPL tool for Java using the JShell API.
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   134
 * @author Robert Field
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   135
 */
37745
4b6b59f8e327 8150382: JShell API: Allow setting remote JVM arguments
rfield
parents: 37389
diff changeset
   136
public class JShellTool implements MessageHandler {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   137
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   138
    private static final Pattern LINEBREAK = Pattern.compile("\\R");
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
   139
    private static final Pattern ID = Pattern.compile("[se]?\\d+([-\\s].*)?");
48275
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
   140
    private static final Pattern RERUN_ID = Pattern.compile("/" + ID.pattern());
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
   141
    private static final Pattern RERUN_PREVIOUS = Pattern.compile("/\\-\\d+( .*)?");
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
   142
    private static final Pattern SET_SUB = Pattern.compile("/?set .*");
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   143
            static final String RECORD_SEPARATOR = "\u241E";
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   144
    private static final String RB_NAME_PREFIX  = "jdk.internal.jshell.tool.resources";
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   145
    private static final String VERSION_RB_NAME = RB_NAME_PREFIX + ".version";
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   146
    private static final String L10N_RB_NAME    = RB_NAME_PREFIX + ".l10n";
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   147
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   148
    final InputStream cmdin;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   149
    final PrintStream cmdout;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   150
    final PrintStream cmderr;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   151
    final PrintStream console;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   152
    final InputStream userin;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   153
    final PrintStream userout;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   154
    final PrintStream usererr;
42843
a8d83044a192 8170162: jshell tool: no mechanism to programmatically launch
rfield
parents: 42827
diff changeset
   155
    final PersistentStorage prefs;
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   156
    final Map<String, String> envvars;
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   157
    final Locale locale;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   158
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   159
    final Feedback feedback = new Feedback();
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   160
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   161
    /**
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   162
     * The complete constructor for the tool (used by test harnesses).
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   163
     * @param cmdin command line input -- snippets and commands
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   164
     * @param cmdout command line output, feedback including errors
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   165
     * @param cmderr start-up errors and debugging info
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   166
     * @param console console control interaction
40767
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
   167
     * @param userin code execution input, or null to use IOContext
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   168
     * @param userout code execution output  -- System.out.printf("hi")
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   169
     * @param usererr code execution error stream  -- System.err.printf("Oops")
42843
a8d83044a192 8170162: jshell tool: no mechanism to programmatically launch
rfield
parents: 42827
diff changeset
   170
     * @param prefs persistence implementation to use
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   171
     * @param envvars environment variable mapping to use
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   172
     * @param locale locale to use
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   173
     */
42843
a8d83044a192 8170162: jshell tool: no mechanism to programmatically launch
rfield
parents: 42827
diff changeset
   174
    JShellTool(InputStream cmdin, PrintStream cmdout, PrintStream cmderr,
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   175
            PrintStream console,
36715
ae6fa9280e0b 8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents: 36499
diff changeset
   176
            InputStream userin, PrintStream userout, PrintStream usererr,
42843
a8d83044a192 8170162: jshell tool: no mechanism to programmatically launch
rfield
parents: 42827
diff changeset
   177
            PersistentStorage prefs, Map<String, String> envvars, Locale locale) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   178
        this.cmdin = cmdin;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   179
        this.cmdout = cmdout;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   180
        this.cmderr = cmderr;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   181
        this.console = console;
40767
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
   182
        this.userin = userin != null ? userin : new InputStream() {
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
   183
            @Override
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
   184
            public int read() throws IOException {
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
   185
                return input.readUserInput();
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
   186
            }
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
   187
        };
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   188
        this.userout = userout;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   189
        this.usererr = usererr;
36715
ae6fa9280e0b 8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents: 36499
diff changeset
   190
        this.prefs = prefs;
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   191
        this.envvars = envvars;
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   192
        this.locale = locale;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   193
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   194
36992
ddebebe611a1 8153417: jshell tool: use test passed locale to retrieve ResourceBundle
rfield
parents: 36990
diff changeset
   195
    private ResourceBundle versionRB = null;
ddebebe611a1 8153417: jshell tool: use test passed locale to retrieve ResourceBundle
rfield
parents: 36990
diff changeset
   196
    private ResourceBundle outputRB  = null;
ddebebe611a1 8153417: jshell tool: use test passed locale to retrieve ResourceBundle
rfield
parents: 36990
diff changeset
   197
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   198
    private IOContext input = null;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   199
    private boolean regenerateOnDeath = true;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   200
    private boolean live = false;
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   201
    private boolean interactiveModeBegun = false;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   202
    private Options options;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   203
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   204
    SourceCodeAnalysis analysis;
44188
3f2047e62102 8176412: jshell tool: automatic imports are excluded on /reload causing it to fail
rfield
parents: 44065
diff changeset
   205
    private JShell state = null;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   206
    Subscription shutdownSubscription = null;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   207
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   208
    static final EditorSetting BUILT_IN_EDITOR = new EditorSetting(null, false);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   209
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   210
    private boolean debug = false;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   211
    public boolean testPrompt = false;
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   212
    private Startup startup = null;
44065
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
   213
    private boolean isCurrentlyRunningStartup = false;
42969
a48d4f74d322 8168615: JShell API: jdk.jshell.spi should be a pluggable ServiceLoader SPI
rfield
parents: 42843
diff changeset
   214
    private String executionControlSpec = null;
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   215
    private EditorSetting editor = BUILT_IN_EDITOR;
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   216
    private int exitCode = 0;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   217
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   218
    private static final String[] EDITOR_ENV_VARS = new String[] {
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   219
        "JSHELLEDITOR", "VISUAL", "EDITOR"};
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   220
43564
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   221
    // Commands and snippets which can be replayed
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   222
    private ReplayableHistory replayableHistory;
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   223
    private ReplayableHistory replayableHistoryPrevious;
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
   224
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
   225
    static final String STARTUP_KEY  = "STARTUP";
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
   226
    static final String EDITOR_KEY   = "EDITOR";
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
   227
    static final String FEEDBACK_KEY = "FEEDBACK";
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
   228
    static final String MODE_KEY     = "MODE";
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
   229
    static final String REPLAY_RESTORE_KEY = "REPLAY_RESTORE";
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   230
42972
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
   231
    static final Pattern BUILTIN_FILE_PATTERN = Pattern.compile("\\w+");
43136
24d62ba7ad5e 8172414: jshell not working in exploded JDK build
jlahoda
parents: 43134
diff changeset
   232
    static final String BUILTIN_FILE_PATH_FORMAT = "/jdk/jshell/tool/resources/%s.jsh";
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   233
    static final String INT_PREFIX = "int $$exit$$ = ";
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   234
48273
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
   235
    static final int OUTPUT_WIDTH = 72;
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
   236
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   237
    // match anything followed by whitespace
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   238
    private static final Pattern OPTION_PRE_PATTERN =
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   239
            Pattern.compile("\\s*(\\S+\\s+)*?");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   240
    // match a (possibly incomplete) option flag with optional double-dash and/or internal dashes
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   241
    private static final Pattern OPTION_PATTERN =
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   242
            Pattern.compile(OPTION_PRE_PATTERN.pattern() + "(?<dd>-??)(?<flag>-([a-z][a-z\\-]*)?)");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   243
    // match an option flag and a (possibly missing or incomplete) value
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   244
    private static final Pattern OPTION_VALUE_PATTERN =
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   245
            Pattern.compile(OPTION_PATTERN.pattern() + "\\s+(?<val>\\S*)");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   246
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
   247
    // Tool id (tid) mapping: the three name spaces
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   248
    NameSpace mainNamespace;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   249
    NameSpace startNamespace;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   250
    NameSpace errorNamespace;
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
   251
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
   252
    // Tool id (tid) mapping: the current name spaces
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   253
    NameSpace currentNameSpace;
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
   254
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   255
    Map<Snippet, SnippetInfo> mapSnippet;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   256
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   257
    // Kinds of compiler/runtime init options
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   258
    private enum OptionKind {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   259
        CLASS_PATH("--class-path", true),
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   260
        MODULE_PATH("--module-path", true),
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   261
        ADD_MODULES("--add-modules", false),
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   262
        ADD_EXPORTS("--add-exports", false),
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   263
        TO_COMPILER("-C", false, false, true, false),
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   264
        TO_REMOTE_VM("-R", false, false, false, true),;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   265
        final String optionFlag;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   266
        final boolean onlyOne;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   267
        final boolean passFlag;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   268
        final boolean toCompiler;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   269
        final boolean toRemoteVm;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   270
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   271
        private OptionKind(String optionFlag, boolean onlyOne) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   272
            this(optionFlag, onlyOne, true, true, true);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   273
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   274
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   275
        private OptionKind(String optionFlag, boolean onlyOne, boolean passFlag,
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   276
                boolean toCompiler, boolean toRemoteVm) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   277
            this.optionFlag = optionFlag;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   278
            this.onlyOne = onlyOne;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   279
            this.passFlag = passFlag;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   280
            this.toCompiler = toCompiler;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   281
            this.toRemoteVm = toRemoteVm;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   282
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   283
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   284
    }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   285
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   286
    // compiler/runtime init option values
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   287
    private static class Options {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   288
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   289
        private final Map<OptionKind, List<String>> optMap;
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   290
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   291
        // New blank Options
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   292
        Options() {
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   293
            optMap = new HashMap<>();
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   294
        }
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   295
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   296
        // Options as a copy
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   297
        private Options(Options opts) {
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   298
            optMap = new HashMap<>(opts.optMap);
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   299
        }
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   300
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   301
        private String[] selectOptions(Predicate<Entry<OptionKind, List<String>>> pred) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   302
            return optMap.entrySet().stream()
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   303
                    .filter(pred)
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   304
                    .flatMap(e -> e.getValue().stream())
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   305
                    .toArray(String[]::new);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   306
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   307
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   308
        String[] remoteVmOptions() {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   309
            return selectOptions(e -> e.getKey().toRemoteVm);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   310
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   311
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   312
        String[] compilerOptions() {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   313
            return selectOptions(e -> e.getKey().toCompiler);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   314
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   315
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   316
        String[] commonOptions() {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   317
            return selectOptions(e -> e.getKey().passFlag);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   318
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   319
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   320
        void addAll(OptionKind kind, Collection<String> vals) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   321
            optMap.computeIfAbsent(kind, k -> new ArrayList<>())
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   322
                    .addAll(vals);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   323
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   324
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   325
        // return a new Options, with parameter options overriding receiver options
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   326
        Options override(Options newer) {
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   327
            Options result = new Options(this);
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   328
            newer.optMap.entrySet().stream()
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   329
                    .forEach(e -> {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   330
                        if (e.getKey().onlyOne) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   331
                            // Only one allowed, override last
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   332
                            result.optMap.put(e.getKey(), e.getValue());
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   333
                        } else {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   334
                            // Additive
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   335
                            result.addAll(e.getKey(), e.getValue());
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   336
                        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   337
                    });
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   338
            return result;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   339
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   340
    }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   341
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   342
    // base option parsing of /env, /reload, and /reset and command-line options
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   343
    private class OptionParserBase {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   344
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   345
        final OptionParser parser = new OptionParser();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   346
        private final OptionSpec<String> argClassPath = parser.accepts("class-path").withRequiredArg();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   347
        private final OptionSpec<String> argModulePath = parser.accepts("module-path").withRequiredArg();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   348
        private final OptionSpec<String> argAddModules = parser.accepts("add-modules").withRequiredArg();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   349
        private final OptionSpec<String> argAddExports = parser.accepts("add-exports").withRequiredArg();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   350
        private final NonOptionArgumentSpec<String> argNonOptions = parser.nonOptions();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   351
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   352
        private Options opts = new Options();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   353
        private List<String> nonOptions;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   354
        private boolean failed = false;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   355
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   356
        List<String> nonOptions() {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   357
            return nonOptions;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   358
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   359
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   360
        void msg(String key, Object... args) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   361
            errormsg(key, args);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   362
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   363
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   364
        Options parse(String[] args) throws OptionException {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   365
            try {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   366
                OptionSet oset = parser.parse(args);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   367
                nonOptions = oset.valuesOf(argNonOptions);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   368
                return parse(oset);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   369
            } catch (OptionException ex) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   370
                if (ex.options().isEmpty()) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   371
                    msg("jshell.err.opt.invalid", stream(args).collect(joining(", ")));
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   372
                } else {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   373
                    boolean isKnown = parser.recognizedOptions().containsKey(ex.options().iterator().next());
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   374
                    msg(isKnown
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   375
                            ? "jshell.err.opt.arg"
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   376
                            : "jshell.err.opt.unknown",
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   377
                            ex.options()
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   378
                            .stream()
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   379
                            .collect(joining(", ")));
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   380
                }
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   381
                exitCode = 1;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   382
                return null;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   383
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   384
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   385
43856
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   386
        // check that the supplied string represent valid class/module paths
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   387
        // converting any ~/ to user home
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   388
        private Collection<String> validPaths(Collection<String> vals, String context, boolean isModulePath) {
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   389
            Stream<String> result = vals.stream()
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   390
                    .map(s -> Arrays.stream(s.split(File.pathSeparator))
48259
c0bf7d8af037 8191636: [Windows] jshell tool: Wrong character in /env class-path command crashes jshell
jlahoda
parents: 47931
diff changeset
   391
                        .flatMap(sp -> toPathImpl(sp, context))
43856
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   392
                        .filter(p -> checkValidPathEntry(p, context, isModulePath))
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   393
                        .map(p -> p.toString())
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   394
                        .collect(Collectors.joining(File.pathSeparator)));
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   395
            if (failed) {
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   396
                return Collections.emptyList();
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   397
            } else {
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   398
                return result.collect(toList());
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   399
            }
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   400
        }
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   401
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   402
        // Adapted from compiler method Locations.checkValidModulePathEntry
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   403
        private boolean checkValidPathEntry(Path p, String context, boolean isModulePath) {
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   404
            if (!Files.exists(p)) {
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   405
                msg("jshell.err.file.not.found", context, p);
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   406
                failed = true;
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   407
                return false;
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   408
            }
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   409
            if (Files.isDirectory(p)) {
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   410
                // if module-path, either an exploded module or a directory of modules
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   411
                return true;
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   412
            }
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   413
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   414
            String name = p.getFileName().toString();
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   415
            int lastDot = name.lastIndexOf(".");
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   416
            if (lastDot > 0) {
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   417
                switch (name.substring(lastDot)) {
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   418
                    case ".jar":
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   419
                        return true;
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   420
                    case ".jmod":
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   421
                        if (isModulePath) {
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   422
                            return true;
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   423
                        }
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   424
                }
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   425
            }
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   426
            msg("jshell.err.arg", context, p);
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   427
            failed = true;
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   428
            return false;
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   429
        }
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   430
48259
c0bf7d8af037 8191636: [Windows] jshell tool: Wrong character in /env class-path command crashes jshell
jlahoda
parents: 47931
diff changeset
   431
        private Stream<Path> toPathImpl(String path, String context) {
c0bf7d8af037 8191636: [Windows] jshell tool: Wrong character in /env class-path command crashes jshell
jlahoda
parents: 47931
diff changeset
   432
            try {
c0bf7d8af037 8191636: [Windows] jshell tool: Wrong character in /env class-path command crashes jshell
jlahoda
parents: 47931
diff changeset
   433
                return Stream.of(toPathResolvingUserHome(path));
c0bf7d8af037 8191636: [Windows] jshell tool: Wrong character in /env class-path command crashes jshell
jlahoda
parents: 47931
diff changeset
   434
            } catch (InvalidPathException ex) {
c0bf7d8af037 8191636: [Windows] jshell tool: Wrong character in /env class-path command crashes jshell
jlahoda
parents: 47931
diff changeset
   435
                msg("jshell.err.file.not.found", context, path);
c0bf7d8af037 8191636: [Windows] jshell tool: Wrong character in /env class-path command crashes jshell
jlahoda
parents: 47931
diff changeset
   436
                failed = true;
c0bf7d8af037 8191636: [Windows] jshell tool: Wrong character in /env class-path command crashes jshell
jlahoda
parents: 47931
diff changeset
   437
                return Stream.empty();
c0bf7d8af037 8191636: [Windows] jshell tool: Wrong character in /env class-path command crashes jshell
jlahoda
parents: 47931
diff changeset
   438
            }
c0bf7d8af037 8191636: [Windows] jshell tool: Wrong character in /env class-path command crashes jshell
jlahoda
parents: 47931
diff changeset
   439
        }
c0bf7d8af037 8191636: [Windows] jshell tool: Wrong character in /env class-path command crashes jshell
jlahoda
parents: 47931
diff changeset
   440
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   441
        Options parse(OptionSet options) {
43856
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   442
            addOptions(OptionKind.CLASS_PATH,
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   443
                    validPaths(options.valuesOf(argClassPath), "--class-path", false));
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   444
            addOptions(OptionKind.MODULE_PATH,
fcdebb803c62 8174797: jshell tool: invalid module path crashes tool
rfield
parents: 43759
diff changeset
   445
                    validPaths(options.valuesOf(argModulePath), "--module-path", true));
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   446
            addOptions(OptionKind.ADD_MODULES, options.valuesOf(argAddModules));
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   447
            addOptions(OptionKind.ADD_EXPORTS, options.valuesOf(argAddExports).stream()
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   448
                    .map(mp -> mp.contains("=") ? mp : mp + "=ALL-UNNAMED")
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   449
                    .collect(toList())
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   450
            );
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   451
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   452
            if (failed) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   453
                exitCode = 1;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   454
                return null;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   455
            } else {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   456
                return opts;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   457
            }
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   458
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   459
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   460
        void addOptions(OptionKind kind, Collection<String> vals) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   461
            if (!vals.isEmpty()) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   462
                if (kind.onlyOne && vals.size() > 1) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   463
                    msg("jshell.err.opt.one", kind.optionFlag);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   464
                    failed = true;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   465
                    return;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   466
                }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   467
                if (kind.passFlag) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   468
                    vals = vals.stream()
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   469
                            .flatMap(mp -> Stream.of(kind.optionFlag, mp))
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   470
                            .collect(toList());
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   471
                }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   472
                opts.addAll(kind, vals);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   473
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   474
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   475
    }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   476
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   477
    // option parsing for /reload (adds -restore -quiet)
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   478
    private class OptionParserReload extends OptionParserBase {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   479
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   480
        private final OptionSpecBuilder argRestore = parser.accepts("restore");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   481
        private final OptionSpecBuilder argQuiet   = parser.accepts("quiet");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   482
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   483
        private boolean restore = false;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   484
        private boolean quiet = false;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   485
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   486
        boolean restore() {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   487
            return restore;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   488
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   489
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   490
        boolean quiet() {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   491
            return quiet;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   492
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   493
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   494
        @Override
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   495
        Options parse(OptionSet options) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   496
            if (options.has(argRestore)) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   497
                restore = true;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   498
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   499
            if (options.has(argQuiet)) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   500
                quiet = true;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   501
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   502
            return super.parse(options);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   503
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   504
    }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   505
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   506
    // option parsing for command-line
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   507
    private class OptionParserCommandLine extends OptionParserBase {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   508
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   509
        private final OptionSpec<String> argStart = parser.accepts("startup").withRequiredArg();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   510
        private final OptionSpecBuilder argNoStart = parser.acceptsAll(asList("n", "no-startup"));
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   511
        private final OptionSpec<String> argFeedback = parser.accepts("feedback").withRequiredArg();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   512
        private final OptionSpec<String> argExecution = parser.accepts("execution").withRequiredArg();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   513
        private final OptionSpecBuilder argQ = parser.accepts("q");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   514
        private final OptionSpecBuilder argS = parser.accepts("s");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   515
        private final OptionSpecBuilder argV = parser.accepts("v");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   516
        private final OptionSpec<String> argR = parser.accepts("R").withRequiredArg();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   517
        private final OptionSpec<String> argC = parser.accepts("C").withRequiredArg();
48543
7067fe4e054e 8189102: All tools should support -?, -h and --help
goetz
parents: 48349
diff changeset
   518
        private final OptionSpecBuilder argHelp = parser.acceptsAll(asList("?", "h", "help"));
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   519
        private final OptionSpecBuilder argVersion = parser.accepts("version");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   520
        private final OptionSpecBuilder argFullVersion = parser.accepts("full-version");
43367
7797472a9ed5 8171343: jshell tool: missing options: --help-extra --show-version
rfield
parents: 43274
diff changeset
   521
        private final OptionSpecBuilder argShowVersion = parser.accepts("show-version");
7797472a9ed5 8171343: jshell tool: missing options: --help-extra --show-version
rfield
parents: 43274
diff changeset
   522
        private final OptionSpecBuilder argHelpExtra = parser.acceptsAll(asList("X", "help-extra"));
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   523
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   524
        private String feedbackMode = null;
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   525
        private Startup initialStartup = null;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   526
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   527
        String feedbackMode() {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   528
            return feedbackMode;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   529
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   530
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   531
        Startup startup() {
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   532
            return initialStartup;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   533
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   534
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   535
        @Override
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   536
        void msg(String key, Object... args) {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   537
            errormsg(key, args);
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   538
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   539
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   540
        /**
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   541
         * Parse the command line options.
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   542
         * @return the options as an Options object, or null if error
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   543
         */
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   544
        @Override
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   545
        Options parse(OptionSet options) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   546
            if (options.has(argHelp)) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   547
                printUsage();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   548
                return null;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   549
            }
43367
7797472a9ed5 8171343: jshell tool: missing options: --help-extra --show-version
rfield
parents: 43274
diff changeset
   550
            if (options.has(argHelpExtra)) {
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   551
                printUsageX();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   552
                return null;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   553
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   554
            if (options.has(argVersion)) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   555
                cmdout.printf("jshell %s\n", version());
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   556
                return null;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   557
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   558
            if (options.has(argFullVersion)) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   559
                cmdout.printf("jshell %s\n", fullVersion());
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   560
                return null;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   561
            }
43367
7797472a9ed5 8171343: jshell tool: missing options: --help-extra --show-version
rfield
parents: 43274
diff changeset
   562
            if (options.has(argShowVersion)) {
7797472a9ed5 8171343: jshell tool: missing options: --help-extra --show-version
rfield
parents: 43274
diff changeset
   563
                cmdout.printf("jshell %s\n", version());
7797472a9ed5 8171343: jshell tool: missing options: --help-extra --show-version
rfield
parents: 43274
diff changeset
   564
            }
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   565
            if ((options.valuesOf(argFeedback).size() +
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   566
                    (options.has(argQ) ? 1 : 0) +
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   567
                    (options.has(argS) ? 1 : 0) +
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   568
                    (options.has(argV) ? 1 : 0)) > 1) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   569
                msg("jshell.err.opt.feedback.one");
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   570
                exitCode = 1;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   571
                return null;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   572
            } else if (options.has(argFeedback)) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   573
                feedbackMode = options.valueOf(argFeedback);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   574
            } else if (options.has("q")) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   575
                feedbackMode = "concise";
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   576
            } else if (options.has("s")) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   577
                feedbackMode = "silent";
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   578
            } else if (options.has("v")) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   579
                feedbackMode = "verbose";
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   580
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   581
            if (options.has(argStart)) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   582
                List<String> sts = options.valuesOf(argStart);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   583
                if (options.has("no-startup")) {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   584
                    msg("jshell.err.opt.startup.conflict");
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   585
                    exitCode = 1;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   586
                    return null;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   587
                }
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   588
                initialStartup = Startup.fromFileList(sts, "--startup", new InitMessageHandler());
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   589
                if (initialStartup == null) {
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   590
                    exitCode = 1;
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   591
                    return null;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   592
                }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   593
            } else if (options.has(argNoStart)) {
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   594
                initialStartup = Startup.noStartup();
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   595
            } else {
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   596
                String packedStartup = prefs.get(STARTUP_KEY);
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   597
                initialStartup = Startup.unpack(packedStartup, new InitMessageHandler());
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   598
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   599
            if (options.has(argExecution)) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   600
                executionControlSpec = options.valueOf(argExecution);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   601
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   602
            addOptions(OptionKind.TO_REMOTE_VM, options.valuesOf(argR));
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   603
            addOptions(OptionKind.TO_COMPILER, options.valuesOf(argC));
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   604
            return super.parse(options);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   605
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   606
    }
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   607
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   608
    /**
43564
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   609
     * Encapsulate a history of snippets and commands which can be replayed.
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   610
     */
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   611
    private static class ReplayableHistory {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   612
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   613
        // the history
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   614
        private List<String> hist;
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   615
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   616
        // the length of the history as of last save
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   617
        private int lastSaved;
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   618
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   619
        private ReplayableHistory(List<String> hist) {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   620
            this.hist = hist;
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   621
            this.lastSaved = 0;
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   622
        }
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   623
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   624
        // factory for empty histories
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   625
        static ReplayableHistory emptyHistory() {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   626
            return new ReplayableHistory(new ArrayList<>());
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   627
        }
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   628
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   629
        // factory for history stored in persistent storage
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   630
        static ReplayableHistory fromPrevious(PersistentStorage prefs) {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   631
            // Read replay history from last jshell session
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   632
            String prevReplay = prefs.get(REPLAY_RESTORE_KEY);
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   633
            if (prevReplay == null) {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   634
                return null;
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   635
            } else {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   636
                return new ReplayableHistory(Arrays.asList(prevReplay.split(RECORD_SEPARATOR)));
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   637
            }
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   638
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   639
        }
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   640
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   641
        // store the history in persistent storage
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   642
        void storeHistory(PersistentStorage prefs) {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   643
            if (hist.size() > lastSaved) {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   644
                // Prevent history overflow by calculating what will fit, starting
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   645
                // with most recent
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   646
                int sepLen = RECORD_SEPARATOR.length();
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   647
                int length = 0;
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   648
                int first = hist.size();
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   649
                while (length < Preferences.MAX_VALUE_LENGTH && --first >= 0) {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   650
                    length += hist.get(first).length() + sepLen;
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   651
                }
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   652
                if (first >= 0) {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   653
                    hist = hist.subList(first + 1, hist.size());
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   654
                }
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   655
                String shist = String.join(RECORD_SEPARATOR, hist);
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   656
                prefs.put(REPLAY_RESTORE_KEY, shist);
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   657
                markSaved();
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   658
            }
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   659
            prefs.flush();
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   660
        }
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   661
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   662
        // add a snippet or command to the history
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   663
        void add(String s) {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   664
            hist.add(s);
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   665
        }
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   666
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   667
        // return history to reloaded
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   668
        Iterable<String> iterable() {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   669
            return hist;
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   670
        }
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   671
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   672
        // mark that persistent storage and current history are in sync
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   673
        void markSaved() {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   674
            lastSaved = hist.size();
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   675
        }
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   676
    }
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   677
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   678
    /**
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   679
     * Is the input/output currently interactive
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   680
     *
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   681
     * @return true if console
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   682
     */
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   683
    boolean interactive() {
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   684
        return input != null && input.interactiveOutput();
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   685
    }
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   686
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   687
    void debug(String format, Object... args) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   688
        if (debug) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   689
            cmderr.printf(format + "\n", args);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   690
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   691
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   692
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   693
    /**
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   694
     * Must show command output
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   695
     *
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   696
     * @param format printf format
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   697
     * @param args printf args
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   698
     */
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   699
    @Override
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   700
    public void hard(String format, Object... args) {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   701
        cmdout.printf(prefix(format), args);
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   702
    }
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   703
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   704
   /**
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   705
     * Error command output
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   706
     *
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   707
     * @param format printf format
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   708
     * @param args printf args
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   709
     */
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   710
    void error(String format, Object... args) {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   711
        (interactiveModeBegun? cmdout : cmderr).printf(prefixError(format), args);
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   712
    }
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   713
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   714
    /**
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   715
     * Should optional informative be displayed?
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   716
     * @return true if they should be displayed
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   717
     */
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   718
    @Override
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   719
    public boolean showFluff() {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   720
        return feedback.shouldDisplayCommandFluff() && interactive();
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   721
    }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   722
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   723
    /**
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   724
     * Optional output
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   725
     *
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   726
     * @param format printf format
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   727
     * @param args printf args
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   728
     */
37745
4b6b59f8e327 8150382: JShell API: Allow setting remote JVM arguments
rfield
parents: 37389
diff changeset
   729
    @Override
4b6b59f8e327 8150382: JShell API: Allow setting remote JVM arguments
rfield
parents: 37389
diff changeset
   730
    public void fluff(String format, Object... args) {
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   731
        if (showFluff()) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   732
            hard(format, args);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   733
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   734
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   735
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   736
    /**
41934
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
   737
     * Resource bundle look-up
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   738
     *
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   739
     * @param key the resource key
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   740
     */
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   741
    String getResourceString(String key) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   742
        if (outputRB == null) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   743
            try {
36992
ddebebe611a1 8153417: jshell tool: use test passed locale to retrieve ResourceBundle
rfield
parents: 36990
diff changeset
   744
                outputRB = ResourceBundle.getBundle(L10N_RB_NAME, locale);
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   745
            } catch (MissingResourceException mre) {
36992
ddebebe611a1 8153417: jshell tool: use test passed locale to retrieve ResourceBundle
rfield
parents: 36990
diff changeset
   746
                error("Cannot find ResourceBundle: %s for locale: %s", L10N_RB_NAME, locale);
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   747
                return "";
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   748
            }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   749
        }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   750
        String s;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   751
        try {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   752
            s = outputRB.getString(key);
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   753
        } catch (MissingResourceException mre) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   754
            error("Missing resource: %s in %s", key, L10N_RB_NAME);
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   755
            return "";
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   756
        }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   757
        return s;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   758
    }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   759
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   760
    /**
42412
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   761
     * Add normal prefixing/postfixing to embedded newlines in a string,
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   762
     * bracketing with normal prefix/postfix
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   763
     *
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   764
     * @param s the string to prefix
42412
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   765
     * @return the pre/post-fixed and bracketed string
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   766
     */
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   767
    String prefix(String s) {
42412
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   768
         return prefix(s, feedback.getPre(), feedback.getPost());
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   769
    }
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   770
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   771
    /**
42412
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   772
     * Add error prefixing/postfixing to embedded newlines in a string,
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   773
     * bracketing with error prefix/postfix
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   774
     *
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   775
     * @param s the string to prefix
42412
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   776
     * @return the pre/post-fixed and bracketed string
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   777
     */
42412
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   778
    String prefixError(String s) {
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   779
         return prefix(s, feedback.getErrorPre(), feedback.getErrorPost());
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   780
    }
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   781
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   782
    /**
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   783
     * Add prefixing/postfixing to embedded newlines in a string,
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   784
     * bracketing with prefix/postfix.  No prefixing when non-interactive.
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   785
     * Result is expected to be the format for a printf.
42412
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   786
     *
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   787
     * @param s the string to prefix
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   788
     * @param pre the string to prepend to each line
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   789
     * @param post the string to append to each line (replacing newline)
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   790
     * @return the pre/post-fixed and bracketed string
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   791
     */
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   792
    String prefix(String s, String pre, String post) {
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   793
        if (s == null) {
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   794
            return "";
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   795
        }
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   796
        if (!interactiveModeBegun) {
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   797
            // messages expect to be new-line terminated (even when not prefixed)
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   798
            return s + "%n";
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   799
        }
42412
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   800
        String pp = s.replaceAll("\\R", post + pre);
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   801
        if (pp.endsWith(post + pre)) {
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   802
            // prevent an extra prefix char and blank line when the string
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   803
            // already terminates with newline
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   804
            pp = pp.substring(0, pp.length() - (post + pre).length());
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
   805
        }
42412
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   806
        return pre + pp + post;
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   807
    }
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   808
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   809
    /**
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   810
     * Print using resource bundle look-up and adding prefix and postfix
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   811
     *
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   812
     * @param key the resource key
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   813
     */
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   814
    void hardrb(String key) {
42412
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   815
        hard(getResourceString(key));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   816
    }
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   817
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   818
    /**
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   819
     * Format using resource bundle look-up using MessageFormat
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   820
     *
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   821
     * @param key the resource key
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   822
     * @param args
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   823
     */
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   824
    String messageFormat(String key, Object... args) {
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   825
        String rs = getResourceString(key);
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   826
        return MessageFormat.format(rs, args);
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   827
    }
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   828
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   829
    /**
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   830
     * Print using resource bundle look-up, MessageFormat, and add prefix and
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   831
     * postfix
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   832
     *
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   833
     * @param key the resource key
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   834
     * @param args
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   835
     */
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   836
    @Override
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   837
    public void hardmsg(String key, Object... args) {
42412
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   838
        hard(messageFormat(key, args));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   839
    }
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   840
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   841
    /**
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   842
     * Print error using resource bundle look-up, MessageFormat, and add prefix
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   843
     * and postfix
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   844
     *
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   845
     * @param key the resource key
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   846
     * @param args
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   847
     */
37745
4b6b59f8e327 8150382: JShell API: Allow setting remote JVM arguments
rfield
parents: 37389
diff changeset
   848
    @Override
4b6b59f8e327 8150382: JShell API: Allow setting remote JVM arguments
rfield
parents: 37389
diff changeset
   849
    public void errormsg(String key, Object... args) {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   850
        error(messageFormat(key, args));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   851
    }
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   852
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   853
    /**
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   854
     * Print (fluff) using resource bundle look-up, MessageFormat, and add
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   855
     * prefix and postfix
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   856
     *
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   857
     * @param key the resource key
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   858
     * @param args
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   859
     */
37745
4b6b59f8e327 8150382: JShell API: Allow setting remote JVM arguments
rfield
parents: 37389
diff changeset
   860
    @Override
4b6b59f8e327 8150382: JShell API: Allow setting remote JVM arguments
rfield
parents: 37389
diff changeset
   861
    public void fluffmsg(String key, Object... args) {
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
   862
        if (showFluff()) {
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   863
            hardmsg(key, args);
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   864
        }
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   865
    }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
   866
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   867
    <T> void hardPairs(Stream<T> stream, Function<T, String> a, Function<T, String> b) {
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   868
        Map<String, String> a2b = stream.collect(toMap(a, b,
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   869
                (m1, m2) -> m1,
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
   870
                LinkedHashMap::new));
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   871
        for (Entry<String, String> e : a2b.entrySet()) {
42412
ca6f4f1914b2 8169828: jdk/jshell/ExternalEditorTest.java testStatementMush() fails frequently on all platform
rfield
parents: 42265
diff changeset
   872
            hard("%s", e.getKey());
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   873
            cmdout.printf(prefix(e.getValue(), feedback.getPre() + "\t", feedback.getPost()));
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   874
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   875
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   876
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   877
    /**
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   878
     * Trim whitespace off end of string
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
   879
     *
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   880
     * @param s
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   881
     * @return
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   882
     */
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   883
    static String trimEnd(String s) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   884
        int last = s.length() - 1;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   885
        int i = last;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   886
        while (i >= 0 && Character.isWhitespace(s.charAt(i))) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   887
            --i;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   888
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   889
        if (i != last) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   890
            return s.substring(0, i + 1);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   891
        } else {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   892
            return s;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   893
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   894
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   895
43757
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   896
    /**
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   897
     * The entry point into the JShell tool.
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   898
     *
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   899
     * @param args the command-line arguments
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   900
     * @throws Exception catastrophic fatal exception
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   901
     * @return the exit code
43757
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   902
     */
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   903
    public int start(String[] args) throws Exception {
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   904
        OptionParserCommandLine commandLineArgs = new OptionParserCommandLine();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   905
        options = commandLineArgs.parse(args);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   906
        if (options == null) {
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   907
            // A null means end immediately, this may be an error or because
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   908
            // of options like --version.  Exit code has been set.
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   909
            return exitCode;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   910
        }
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   911
        startup = commandLineArgs.startup();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   912
        // initialize editor settings
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   913
        configEditor();
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   914
        // initialize JShell instance
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   915
        try {
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   916
            resetState();
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   917
        } catch (IllegalStateException ex) {
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   918
            // Display just the cause (not a exception backtrace)
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   919
            cmderr.println(ex.getMessage());
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   920
            //abort
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   921
            return 1;
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
   922
        }
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
   923
        // Read replay history from last jshell session into previous history
43564
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   924
        replayableHistoryPrevious = ReplayableHistory.fromPrevious(prefs);
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   925
        // load snippet/command files given on command-line
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   926
        for (String loadFile : commandLineArgs.nonOptions()) {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   927
            if (!runFile(loadFile, "jshell")) {
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   928
                // Load file failed -- abort
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   929
                return 1;
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   930
            }
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   931
        }
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   932
        // if we survived that...
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   933
        if (regenerateOnDeath) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   934
            // initialize the predefined feedback modes
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   935
            initFeedback(commandLineArgs.feedbackMode());
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   936
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   937
        // check again, as feedback setting could have failed
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   938
        if (regenerateOnDeath) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   939
            // if we haven't died, and the feedback mode wants fluff, print welcome
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
   940
            interactiveModeBegun = true;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   941
            if (feedback.shouldDisplayCommandFluff()) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   942
                hardmsg("jshell.msg.welcome", version());
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   943
            }
43564
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   944
            // Be sure history is always saved so that user code isn't lost
43757
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   945
            Thread shutdownHook = new Thread() {
43564
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   946
                @Override
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   947
                public void run() {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   948
                    replayableHistory.storeHistory(prefs);
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
   949
                }
43757
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   950
            };
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   951
            Runtime.getRuntime().addShutdownHook(shutdownHook);
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   952
            // execute from user input
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   953
            try (IOContext in = new ConsoleIOContext(this, cmdin, console)) {
43757
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   954
                while (regenerateOnDeath) {
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   955
                    if (!live) {
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   956
                        resetState();
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   957
                    }
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   958
                    run(in);
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   959
                }
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   960
            } finally {
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   961
                replayableHistory.storeHistory(prefs);
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   962
                closeState();
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   963
                try {
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   964
                    Runtime.getRuntime().removeShutdownHook(shutdownHook);
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   965
                } catch (Exception ex) {
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   966
                    // ignore, this probably caused by VM aready being shutdown
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   967
                    // and this is the last act anyhow
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   968
                }
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   969
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
   970
        }
43757
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
   971
        closeState();
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
   972
        return exitCode;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   973
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   974
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   975
    private EditorSetting configEditor() {
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   976
        // Read retained editor setting (if any)
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   977
        editor = EditorSetting.fromPrefs(prefs);
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   978
        if (editor != null) {
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   979
            return editor;
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   980
        }
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   981
        // Try getting editor setting from OS environment variables
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   982
        for (String envvar : EDITOR_ENV_VARS) {
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   983
            String v = envvars.get(envvar);
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   984
            if (v != null) {
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   985
                return editor = new EditorSetting(v.split("\\s+"), false);
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   986
            }
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   987
        }
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   988
        // Default to the built-in editor
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   989
        return editor = BUILT_IN_EDITOR;
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   990
    }
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
   991
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   992
    private void printUsage() {
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
   993
        cmdout.print(getResourceString("help.usage"));
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   994
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
   995
41248
2a3e74c5ad8a 8154714: jshell tool: add exports support
shinyafox
parents: 40767
diff changeset
   996
    private void printUsageX() {
2a3e74c5ad8a 8154714: jshell tool: add exports support
shinyafox
parents: 40767
diff changeset
   997
        cmdout.print(getResourceString("help.usage.x"));
2a3e74c5ad8a 8154714: jshell tool: add exports support
shinyafox
parents: 40767
diff changeset
   998
    }
2a3e74c5ad8a 8154714: jshell tool: add exports support
shinyafox
parents: 40767
diff changeset
   999
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1000
    /**
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1001
     * Message handler to use during initial start-up.
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1002
     */
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1003
    private class InitMessageHandler implements MessageHandler {
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1004
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1005
        @Override
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1006
        public void fluff(String format, Object... args) {
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1007
            //ignore
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1008
        }
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1009
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1010
        @Override
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1011
        public void fluffmsg(String messageKey, Object... args) {
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1012
            //ignore
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1013
        }
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1014
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1015
        @Override
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1016
        public void hard(String format, Object... args) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1017
            //ignore
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1018
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1019
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1020
        @Override
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1021
        public void hardmsg(String messageKey, Object... args) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1022
            //ignore
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1023
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1024
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1025
        @Override
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1026
        public void errormsg(String messageKey, Object... args) {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  1027
            JShellTool.this.errormsg(messageKey, args);
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1028
        }
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1029
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1030
        @Override
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1031
        public boolean showFluff() {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1032
            return false;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1033
        }
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1034
    }
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1035
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1036
    private void resetState() {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1037
        closeState();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1038
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1039
        // Initialize tool id mapping
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1040
        mainNamespace = new NameSpace("main", "");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1041
        startNamespace = new NameSpace("start", "s");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1042
        errorNamespace = new NameSpace("error", "e");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1043
        mapSnippet = new LinkedHashMap<>();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1044
        currentNameSpace = startNamespace;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1045
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  1046
        // Reset the replayable history, saving the old for restore
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  1047
        replayableHistoryPrevious = replayableHistory;
43564
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
  1048
        replayableHistory = ReplayableHistory.emptyHistory();
42969
a48d4f74d322 8168615: JShell API: jdk.jshell.spi should be a pluggable ServiceLoader SPI
rfield
parents: 42843
diff changeset
  1049
        JShell.Builder builder =
a48d4f74d322 8168615: JShell API: jdk.jshell.spi should be a pluggable ServiceLoader SPI
rfield
parents: 42843
diff changeset
  1050
               JShell.builder()
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1051
                .in(userin)
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1052
                .out(userout)
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1053
                .err(usererr)
42969
a48d4f74d322 8168615: JShell API: jdk.jshell.spi should be a pluggable ServiceLoader SPI
rfield
parents: 42843
diff changeset
  1054
                .tempVariableNameGenerator(() -> "$" + currentNameSpace.tidNext())
38908
f0c186d76c8a 8139829: JShell API: No use of fields to return information from public types
rfield
parents: 38613
diff changeset
  1055
                .idGenerator((sn, i) -> (currentNameSpace == startNamespace || state.status(sn).isActive())
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1056
                        ? currentNameSpace.tid(sn)
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1057
                        : errorNamespace.tid(sn))
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1058
                .remoteVMOptions(options.remoteVmOptions())
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1059
                .compilerOptions(options.compilerOptions());
42969
a48d4f74d322 8168615: JShell API: jdk.jshell.spi should be a pluggable ServiceLoader SPI
rfield
parents: 42843
diff changeset
  1060
        if (executionControlSpec != null) {
a48d4f74d322 8168615: JShell API: jdk.jshell.spi should be a pluggable ServiceLoader SPI
rfield
parents: 42843
diff changeset
  1061
            builder.executionEngine(executionControlSpec);
a48d4f74d322 8168615: JShell API: jdk.jshell.spi should be a pluggable ServiceLoader SPI
rfield
parents: 42843
diff changeset
  1062
        }
a48d4f74d322 8168615: JShell API: jdk.jshell.spi should be a pluggable ServiceLoader SPI
rfield
parents: 42843
diff changeset
  1063
        state = builder.build();
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1064
        shutdownSubscription = state.onShutdown((JShell deadState) -> {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1065
            if (deadState == state) {
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1066
                hardmsg("jshell.msg.terminated");
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  1067
                fluffmsg("jshell.msg.terminated.restore");
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1068
                live = false;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1069
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1070
        });
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1071
        analysis = state.sourceCodeAnalysis();
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1072
        live = true;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1073
44065
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
  1074
        // Run the start-up script.
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
  1075
        // Avoid an infinite loop running start-up while running start-up.
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
  1076
        // This could, otherwise, occur when /env /reset or /reload commands are
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
  1077
        // in the start-up script.
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
  1078
        if (!isCurrentlyRunningStartup) {
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
  1079
            try {
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
  1080
                isCurrentlyRunningStartup = true;
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
  1081
                startUpRun(startup.toString());
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
  1082
            } finally {
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
  1083
                isCurrentlyRunningStartup = false;
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
  1084
            }
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
  1085
        }
d0a8a4c41c85 8175304: JShell tool: The /reset command hangs after setting a startup script
rfield
parents: 43856
diff changeset
  1086
        // Record subsequent snippets in the main namespace.
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1087
        currentNameSpace = mainNamespace;
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1088
    }
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  1089
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1090
    //where -- one-time per run initialization of feedback modes
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1091
    private void initFeedback(String initMode) {
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1092
        // No fluff, no prefix, for init failures
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1093
        MessageHandler initmh = new InitMessageHandler();
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1094
        // Execute the feedback initialization code in the resource file
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1095
        startUpRun(getResourceString("startup.feedback"));
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1096
        // These predefined modes are read-only
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1097
        feedback.markModesReadOnly();
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1098
        // Restore user defined modes retained on previous run with /set mode -retain
42843
a8d83044a192 8170162: jshell tool: no mechanism to programmatically launch
rfield
parents: 42827
diff changeset
  1099
        String encoded = prefs.get(MODE_KEY);
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  1100
        if (encoded != null && !encoded.isEmpty()) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  1101
            if (!feedback.restoreEncodedModes(initmh, encoded)) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  1102
                // Catastrophic corruption -- remove the retained modes
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  1103
                prefs.remove(MODE_KEY);
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  1104
            }
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1105
        }
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1106
        if (initMode != null) {
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1107
            // The feedback mode to use was specified on the command line, use it
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1108
            if (!setFeedback(initmh, new ArgTokenizer("--feedback", initMode))) {
37745
4b6b59f8e327 8150382: JShell API: Allow setting remote JVM arguments
rfield
parents: 37389
diff changeset
  1109
                regenerateOnDeath = false;
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1110
                exitCode = 1;
37745
4b6b59f8e327 8150382: JShell API: Allow setting remote JVM arguments
rfield
parents: 37389
diff changeset
  1111
            }
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1112
        } else {
42843
a8d83044a192 8170162: jshell tool: no mechanism to programmatically launch
rfield
parents: 42827
diff changeset
  1113
            String fb = prefs.get(FEEDBACK_KEY);
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1114
            if (fb != null) {
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1115
                // Restore the feedback mode to use that was retained
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1116
                // on a previous run with /set feedback -retain
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1117
                setFeedback(initmh, new ArgTokenizer("previous retain feedback", "-retain " + fb));
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1118
            }
37745
4b6b59f8e327 8150382: JShell API: Allow setting remote JVM arguments
rfield
parents: 37389
diff changeset
  1119
        }
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1120
    }
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1121
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1122
    //where
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1123
    private void startUpRun(String start) {
42972
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  1124
        try (IOContext suin = new ScannerIOContext(new StringReader(start))) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1125
            run(suin);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1126
        } catch (Exception ex) {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  1127
            errormsg("jshell.err.startup.unexpected.exception", ex);
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  1128
            ex.printStackTrace(cmderr);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1129
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1130
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1131
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1132
    private void closeState() {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1133
        live = false;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1134
        JShell oldState = state;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1135
        if (oldState != null) {
43757
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
  1136
            state = null;
7193f6ef25db 8173893: JShell: reduce memory leaks
rfield
parents: 43564
diff changeset
  1137
            analysis = null;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1138
            oldState.unsubscribe(shutdownSubscription); // No notification
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1139
            oldState.close();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1140
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1141
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1142
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1143
    /**
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1144
     * Main loop
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1145
     *
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1146
     * @param in the line input/editing context
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1147
     */
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1148
    private void run(IOContext in) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1149
        IOContext oldInput = input;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1150
        input = in;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1151
        try {
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1152
            // remaining is the source left after one snippet is evaluated
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1153
            String remaining = "";
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1154
            while (live) {
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1155
                // Get a line(s) of input
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1156
                String src = getInput(remaining);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1157
                // Process the snippet or command, returning the remaining source
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1158
                remaining = processInput(src);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1159
            }
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1160
        } catch (EOFException ex) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1161
            // Just exit loop
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1162
        } catch (IOException ex) {
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1163
            errormsg("jshell.err.unexpected.exception", ex);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1164
        } finally {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1165
            input = oldInput;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1166
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1167
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1168
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1169
    /**
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1170
     * Process an input command or snippet.
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1171
     *
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1172
     * @param src the source to process
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1173
     * @return any remaining input to processed
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1174
     */
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1175
    private String processInput(String src) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1176
        if (isCommand(src)) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1177
            // It is a command
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1178
            processCommand(src.trim());
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1179
            // No remaining input after a command
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1180
            return "";
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1181
        } else {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1182
            // It is a snipet. Separate the source from the remaining. Evaluate
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1183
            // the source
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1184
            CompletionInfo an = analysis.analyzeCompletion(src);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1185
            if (processSourceCatchingReset(trimEnd(an.source()))) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1186
                // Snippet was successful use any leftover source
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1187
                return an.remaining();
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1188
            } else {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1189
                // Snippet failed, throw away any remaining source
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1190
                return "";
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1191
            }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1192
        }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1193
    }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1194
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1195
    /**
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1196
     * Get the input line (or, if incomplete, lines).
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1197
     *
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1198
     * @param initial leading input (left over after last snippet)
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1199
     * @return the complete input snippet or command
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1200
     * @throws IOException on unexpected I/O error
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1201
     */
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1202
    private String getInput(String initial) throws IOException{
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1203
        String src = initial;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1204
        while (live) { // loop while incomplete (and live)
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1205
            if (!src.isEmpty()) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1206
                // We have some source, see if it is complete, if so, use it
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1207
                String check;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1208
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1209
                if (isCommand(src)) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1210
                    // A command can only be incomplete if it is a /exit with
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1211
                    // an argument
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1212
                    int sp = src.indexOf(" ");
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1213
                    if (sp < 0) return src;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1214
                    check = src.substring(sp).trim();
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1215
                    if (check.isEmpty()) return src;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1216
                    String cmd = src.substring(0, sp);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1217
                    Command[] match = findCommand(cmd, c -> c.kind.isRealCommand);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1218
                    if (match.length != 1 || !match[0].command.equals("/exit")) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1219
                        // A command with no snippet arg, so no multi-line input
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1220
                        return src;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1221
                    }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1222
                } else {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1223
                    // For a snippet check the whole source
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1224
                    check = src;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1225
                }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1226
                Completeness comp = analysis.analyzeCompletion(check).completeness();
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1227
                if (comp.isComplete() || comp == Completeness.EMPTY) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1228
                    return src;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1229
                }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1230
            }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1231
            String prompt = interactive()
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1232
                    ? testPrompt
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1233
                            ? src.isEmpty()
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1234
                                    ? "\u0005" //ENQ -- test prompt
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1235
                                    : "\u0006" //ACK -- test continuation prompt
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1236
                            : src.isEmpty()
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1237
                                    ? feedback.getPrompt(currentNameSpace.tidNext())
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1238
                                    : feedback.getContinuationPrompt(currentNameSpace.tidNext())
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1239
                    : "" // Non-interactive -- no prompt
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1240
                    ;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1241
            String line;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1242
            try {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1243
                line = input.readLine(prompt, src);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1244
            } catch (InputInterruptedException ex) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1245
                //input interrupted - clearing current state
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1246
                src = "";
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1247
                continue;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1248
            }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1249
            if (line == null) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1250
                //EOF
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1251
                if (input.interactiveOutput()) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1252
                    // End after user ctrl-D
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1253
                    regenerateOnDeath = false;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1254
                }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1255
                throw new EOFException(); // no more input
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1256
            }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1257
            src = src.isEmpty()
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1258
                    ? line
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1259
                    : src + "\n" + line;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1260
        }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1261
        throw new EOFException(); // not longer live
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1262
    }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1263
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1264
    private boolean isCommand(String line) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1265
        return line.startsWith("/") && !line.startsWith("//") && !line.startsWith("/*");
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1266
    }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1267
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  1268
    private void addToReplayHistory(String s) {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  1269
        if (!isCurrentlyRunningStartup) {
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  1270
            replayableHistory.add(s);
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  1271
        }
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  1272
    }
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  1273
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1274
    /**
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1275
     * Process a source snippet.
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1276
     *
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1277
     * @param src the snippet source to process
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1278
     * @return true on success, false on failure
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1279
     */
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1280
    private boolean processSourceCatchingReset(String src) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1281
        try {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1282
            input.beforeUserCode();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1283
            return processSource(src);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1284
        } catch (IllegalStateException ex) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1285
            hard("Resetting...");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1286
            live = false; // Make double sure
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1287
            return false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1288
        } finally {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1289
            input.afterUserCode();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1290
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1291
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1292
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1293
    /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1294
     * Process a command (as opposed to a snippet) -- things that start with
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1295
     * slash.
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1296
     *
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1297
     * @param input
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1298
     */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1299
    private void processCommand(String input) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1300
        if (input.startsWith("/-")) {
34477
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  1301
            try {
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  1302
                //handle "/-[number]"
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1303
                cmdUseHistoryEntry(Integer.parseInt(input.substring(1)));
34477
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  1304
                return ;
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  1305
            } catch (NumberFormatException ex) {
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  1306
                //ignore
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  1307
            }
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1308
        }
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1309
        String cmd;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1310
        String arg;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1311
        int idx = input.indexOf(' ');
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1312
        if (idx > 0) {
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1313
            arg = input.substring(idx + 1).trim();
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1314
            cmd = input.substring(0, idx);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1315
        } else {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1316
            cmd = input;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1317
            arg = "";
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1318
        }
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1319
        // find the command as a "real command", not a pseudo-command or doc subject
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1320
        Command[] candidates = findCommand(cmd, c -> c.kind.isRealCommand);
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1321
        switch (candidates.length) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1322
            case 0:
48275
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1323
                // not found, it is either a rerun-ID command or an error
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1324
                if (RERUN_ID.matcher(cmd).matches()) {
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1325
                    // it is in the form of a snipppet id, see if it is a valid history reference
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1326
                    rerunHistoryEntriesById(input);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1327
                } else {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1328
                    errormsg("jshell.err.invalid.command", cmd);
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1329
                    fluffmsg("jshell.msg.help.for.help");
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1330
                }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1331
                break;
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1332
            case 1:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1333
                Command command = candidates[0];
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1334
                // If comand was successful and is of a replayable kind, add it the replayable history
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1335
                if (command.run.apply(arg) && command.kind == CommandKind.REPLAY) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1336
                    addToReplayHistory((command.command + " " + arg).trim());
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1337
                }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1338
                break;
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1339
            default:
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1340
                // command if too short (ambigous), show the possibly matches
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1341
                errormsg("jshell.err.command.ambiguous", cmd,
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1342
                        Arrays.stream(candidates).map(c -> c.command).collect(Collectors.joining(", ")));
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1343
                fluffmsg("jshell.msg.help.for.help");
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1344
                break;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1345
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1346
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1347
34475
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1348
    private Command[] findCommand(String cmd, Predicate<Command> filter) {
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1349
        Command exact = commands.get(cmd);
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1350
        if (exact != null)
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1351
            return new Command[] {exact};
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1352
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1353
        return commands.values()
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1354
                       .stream()
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1355
                       .filter(filter)
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1356
                       .filter(command -> command.command.startsWith(cmd))
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1357
                       .toArray(Command[]::new);
34475
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1358
    }
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1359
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  1360
    static Path toPathResolvingUserHome(String pathString) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1361
        if (pathString.replace(File.separatorChar, '/').startsWith("~/"))
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1362
            return Paths.get(System.getProperty("user.home"), pathString.substring(2));
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1363
        else
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1364
            return Paths.get(pathString);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1365
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1366
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1367
    static final class Command {
34475
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1368
        public final String command;
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1369
        public final String helpKey;
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  1370
        public final Function<String,Boolean> run;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1371
        public final CompletionProvider completions;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1372
        public final CommandKind kind;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1373
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1374
        // NORMAL Commands
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1375
        public Command(String command, Function<String,Boolean> run, CompletionProvider completions) {
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1376
            this(command, run, completions, CommandKind.NORMAL);
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1377
        }
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1378
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1379
        // Special kinds of Commands
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1380
        public Command(String command, Function<String,Boolean> run, CompletionProvider completions, CommandKind kind) {
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1381
            this(command, "help." + command.substring(1),
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1382
                    run, completions, kind);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1383
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1384
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1385
        // Documentation pseudo-commands
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1386
        public Command(String command, String helpKey, CommandKind kind) {
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1387
            this(command, helpKey,
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1388
                    arg -> { throw new IllegalStateException(); },
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1389
                    EMPTY_COMPLETION_PROVIDER,
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1390
                    kind);
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1391
        }
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1392
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1393
        public Command(String command, String helpKey, Function<String,Boolean> run, CompletionProvider completions, CommandKind kind) {
34475
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1394
            this.command = command;
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1395
            this.helpKey = helpKey;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1396
            this.run = run;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1397
            this.completions = completions;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1398
            this.kind = kind;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1399
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1400
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1401
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1402
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1403
    interface CompletionProvider {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1404
        List<Suggestion> completionSuggestions(String input, int cursor, int[] anchor);
40765
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1405
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1406
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1407
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1408
    enum CommandKind {
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1409
        NORMAL(true, true, true),
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1410
        REPLAY(true, true, true),
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1411
        HIDDEN(true, false, false),
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1412
        HELP_ONLY(false, true, false),
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1413
        HELP_SUBJECT(false, false, false);
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1414
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1415
        final boolean isRealCommand;
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1416
        final boolean showInHelp;
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1417
        final boolean shouldSuggestCompletions;
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1418
        private CommandKind(boolean isRealCommand, boolean showInHelp, boolean shouldSuggestCompletions) {
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1419
            this.isRealCommand = isRealCommand;
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1420
            this.showInHelp = showInHelp;
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1421
            this.shouldSuggestCompletions = shouldSuggestCompletions;
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1422
        }
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1423
    }
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1424
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1425
    static final class FixedCompletionProvider implements CompletionProvider {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1426
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1427
        private final String[] alternatives;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1428
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1429
        public FixedCompletionProvider(String... alternatives) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1430
            this.alternatives = alternatives;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1431
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1432
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1433
        // Add more options to an existing provider
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1434
        public FixedCompletionProvider(FixedCompletionProvider base, String... alternatives) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1435
            List<String> l = new ArrayList<>(Arrays.asList(base.alternatives));
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1436
            l.addAll(Arrays.asList(alternatives));
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1437
            this.alternatives = l.toArray(new String[l.size()]);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1438
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1439
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1440
        @Override
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1441
        public List<Suggestion> completionSuggestions(String input, int cursor, int[] anchor) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1442
            List<Suggestion> result = new ArrayList<>();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1443
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1444
            for (String alternative : alternatives) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1445
                if (alternative.startsWith(input)) {
40498
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  1446
                    result.add(new ArgSuggestion(alternative));
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1447
                }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1448
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1449
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1450
            anchor[0] = 0;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1451
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1452
            return result;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1453
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1454
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1455
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1456
40765
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1457
    static final CompletionProvider EMPTY_COMPLETION_PROVIDER = new FixedCompletionProvider();
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1458
    private static final CompletionProvider SNIPPET_HISTORY_OPTION_COMPLETION_PROVIDER = new FixedCompletionProvider("-all", "-start ", "-history");
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1459
    private static final CompletionProvider SAVE_OPTION_COMPLETION_PROVIDER = new FixedCompletionProvider("-all ", "-start ", "-history ");
48939
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  1460
    private static final CompletionProvider HISTORY_OPTION_COMPLETION_PROVIDER = new FixedCompletionProvider("-all");
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1461
    private static final CompletionProvider SNIPPET_OPTION_COMPLETION_PROVIDER = new FixedCompletionProvider("-all", "-start " );
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1462
    private static final FixedCompletionProvider COMMAND_LINE_LIKE_OPTIONS_COMPLETION_PROVIDER = new FixedCompletionProvider(
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1463
            "-class-path ", "-module-path ", "-add-modules ", "-add-exports ");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1464
    private static final CompletionProvider RELOAD_OPTIONS_COMPLETION_PROVIDER = new FixedCompletionProvider(
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1465
            COMMAND_LINE_LIKE_OPTIONS_COMPLETION_PROVIDER,
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1466
            "-restore ", "-quiet ");
40765
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1467
    private static final CompletionProvider SET_MODE_OPTIONS_COMPLETION_PROVIDER = new FixedCompletionProvider("-command", "-quiet", "-delete");
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1468
    private static final CompletionProvider FILE_COMPLETION_PROVIDER = fileCompletions(p -> true);
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1469
    private static final Map<String, CompletionProvider> ARG_OPTIONS = new HashMap<>();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1470
    static {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1471
        ARG_OPTIONS.put("-class-path", classPathCompletion());
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1472
        ARG_OPTIONS.put("-module-path", fileCompletions(Files::isDirectory));
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1473
        ARG_OPTIONS.put("-add-modules", EMPTY_COMPLETION_PROVIDER);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1474
        ARG_OPTIONS.put("-add-exports", EMPTY_COMPLETION_PROVIDER);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1475
    }
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1476
    private final Map<String, Command> commands = new LinkedHashMap<>();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1477
    private void registerCommand(Command cmd) {
34475
7af94fd75ede 8143037: JShell should determine commands by prefix
jlahoda
parents: 33714
diff changeset
  1478
        commands.put(cmd.command, cmd);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1479
    }
40765
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1480
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1481
    private static CompletionProvider skipWordThenCompletion(CompletionProvider completionProvider) {
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1482
        return (input, cursor, anchor) -> {
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1483
            List<Suggestion> result = Collections.emptyList();
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1484
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1485
            int space = input.indexOf(' ');
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1486
            if (space != -1) {
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1487
                String rest = input.substring(space + 1);
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1488
                result = completionProvider.completionSuggestions(rest, cursor - space - 1, anchor);
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1489
                anchor[0] += space + 1;
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1490
            }
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1491
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1492
            return result;
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1493
        };
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1494
    }
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1495
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1496
    private static CompletionProvider fileCompletions(Predicate<Path> accept) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1497
        return (code, cursor, anchor) -> {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1498
            int lastSlash = code.lastIndexOf('/');
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1499
            String path = code.substring(0, lastSlash + 1);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1500
            String prefix = lastSlash != (-1) ? code.substring(lastSlash + 1) : code;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1501
            Path current = toPathResolvingUserHome(path);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1502
            List<Suggestion> result = new ArrayList<>();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1503
            try (Stream<Path> dir = Files.list(current)) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1504
                dir.filter(f -> accept.test(f) && f.getFileName().toString().startsWith(prefix))
40498
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  1505
                   .map(f -> new ArgSuggestion(f.getFileName() + (Files.isDirectory(f) ? "/" : "")))
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1506
                   .forEach(result::add);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1507
            } catch (IOException ex) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1508
                //ignore...
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1509
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1510
            if (path.isEmpty()) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1511
                StreamSupport.stream(FileSystems.getDefault().getRootDirectories().spliterator(), false)
42415
85388bae723d 8165564: langtools\test\jdk\jshell\CommandCompletionTest.java fails on some windows
jlahoda
parents: 42412
diff changeset
  1512
                             .filter(root -> Files.exists(root))
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1513
                             .filter(root -> accept.test(root) && root.toString().startsWith(prefix))
40498
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  1514
                             .map(root -> new ArgSuggestion(root.toString()))
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1515
                             .forEach(result::add);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1516
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1517
            anchor[0] = path.length();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1518
            return result;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1519
        };
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1520
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1521
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1522
    private static CompletionProvider classPathCompletion() {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1523
        return fileCompletions(p -> Files.isDirectory(p) ||
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1524
                                    p.getFileName().toString().endsWith(".zip") ||
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1525
                                    p.getFileName().toString().endsWith(".jar"));
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1526
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1527
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1528
    // Completion based on snippet supplier
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  1529
    private CompletionProvider snippetCompletion(Supplier<Stream<? extends Snippet>> snippetsSupplier) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1530
        return (prefix, cursor, anchor) -> {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1531
            anchor[0] = 0;
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1532
            int space = prefix.lastIndexOf(' ');
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1533
            Set<String> prior = new HashSet<>(Arrays.asList(prefix.split(" ")));
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1534
            if (prior.contains("-all") || prior.contains("-history")) {
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1535
                return Collections.emptyList();
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1536
            }
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1537
            String argPrefix = prefix.substring(space + 1);
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  1538
            return snippetsSupplier.get()
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1539
                        .filter(k -> !prior.contains(String.valueOf(k.id()))
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1540
                                && (!(k instanceof DeclarationSnippet)
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1541
                                     || !prior.contains(((DeclarationSnippet) k).name())))
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1542
                        .flatMap(k -> (k instanceof DeclarationSnippet)
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1543
                                ? Stream.of(String.valueOf(k.id()) + " ", ((DeclarationSnippet) k).name() + " ")
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1544
                                : Stream.of(String.valueOf(k.id()) + " "))
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1545
                        .filter(k -> k.startsWith(argPrefix))
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1546
                        .map(ArgSuggestion::new)
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1547
                        .collect(Collectors.toList());
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1548
        };
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1549
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1550
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1551
    // Completion based on snippet supplier with -all -start (and sometimes -history) options
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1552
    private CompletionProvider snippetWithOptionCompletion(CompletionProvider optionProvider,
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1553
            Supplier<Stream<? extends Snippet>> snippetsSupplier) {
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  1554
        return (code, cursor, anchor) -> {
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  1555
            List<Suggestion> result = new ArrayList<>();
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1556
            int pastSpace = code.lastIndexOf(' ') + 1; // zero if no space
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1557
            if (pastSpace == 0) {
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1558
                result.addAll(optionProvider.completionSuggestions(code, cursor, anchor));
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1559
            }
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1560
            result.addAll(snippetCompletion(snippetsSupplier).completionSuggestions(code, cursor, anchor));
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1561
            anchor[0] += pastSpace;
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1562
            return result;
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1563
        };
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1564
    }
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1565
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1566
    // Completion of help, commands and subjects
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1567
    private CompletionProvider helpCompletion() {
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1568
        return (code, cursor, anchor) -> {
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1569
            List<Suggestion> result;
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1570
            int pastSpace = code.indexOf(' ') + 1; // zero if no space
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1571
            if (pastSpace == 0) {
44454
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  1572
                // initially suggest commands (with slash) and subjects,
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  1573
                // however, if their subject starts without slash, include
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  1574
                // commands without slash
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  1575
                boolean noslash = code.length() > 0 && !code.startsWith("/");
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1576
                result = new FixedCompletionProvider(commands.values().stream()
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1577
                        .filter(cmd -> cmd.kind.showInHelp || cmd.kind == CommandKind.HELP_SUBJECT)
44454
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  1578
                        .map(c -> ((noslash && c.command.startsWith("/"))
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  1579
                                ? c.command.substring(1)
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  1580
                                : c.command) + " ")
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1581
                        .toArray(String[]::new))
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1582
                        .completionSuggestions(code, cursor, anchor);
44569
b1accf8b2aed 8178013: Finetuning of merged tab and shift tab completion
jlahoda
parents: 44459
diff changeset
  1583
            } else if (code.startsWith("/se") || code.startsWith("se")) {
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1584
                result = new FixedCompletionProvider(SET_SUBCOMMANDS)
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1585
                        .completionSuggestions(code.substring(pastSpace), cursor - pastSpace, anchor);
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1586
            } else {
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1587
                result = Collections.emptyList();
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1588
            }
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1589
            anchor[0] += pastSpace;
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  1590
            return result;
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  1591
        };
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  1592
    }
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  1593
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1594
    private static CompletionProvider saveCompletion() {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1595
        return (code, cursor, anchor) -> {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1596
            List<Suggestion> result = new ArrayList<>();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1597
            int space = code.indexOf(' ');
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1598
            if (space == (-1)) {
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1599
                result.addAll(SAVE_OPTION_COMPLETION_PROVIDER.completionSuggestions(code, cursor, anchor));
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1600
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1601
            result.addAll(FILE_COMPLETION_PROVIDER.completionSuggestions(code.substring(space + 1), cursor - space - 1, anchor));
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1602
            anchor[0] += space + 1;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1603
            return result;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1604
        };
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1605
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1606
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1607
    // command-line-like option completion -- options with values
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1608
    private static CompletionProvider optionCompletion(CompletionProvider provider) {
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  1609
        return (code, cursor, anchor) -> {
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1610
            Matcher ovm = OPTION_VALUE_PATTERN.matcher(code);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1611
            if (ovm.matches()) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1612
                String flag = ovm.group("flag");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1613
                List<CompletionProvider> ps = ARG_OPTIONS.entrySet().stream()
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1614
                        .filter(es -> es.getKey().startsWith(flag))
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1615
                        .map(es -> es.getValue())
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1616
                        .collect(toList());
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1617
                if (ps.size() == 1) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1618
                    int pastSpace = ovm.start("val");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1619
                    List<Suggestion> result = ps.get(0).completionSuggestions(
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1620
                            ovm.group("val"), cursor - pastSpace, anchor);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1621
                    anchor[0] += pastSpace;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1622
                    return result;
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1623
                }
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1624
            }
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1625
            Matcher om = OPTION_PATTERN.matcher(code);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1626
            if (om.matches()) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1627
                int pastSpace = om.start("flag");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1628
                List<Suggestion> result = provider.completionSuggestions(
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1629
                        om.group("flag"), cursor - pastSpace, anchor);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1630
                if (!om.group("dd").isEmpty()) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1631
                    result = result.stream()
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1632
                            .map(sug -> new Suggestion() {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1633
                                @Override
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1634
                                public String continuation() {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1635
                                    return "-" + sug.continuation();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1636
                                }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1637
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1638
                                @Override
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1639
                                public boolean matchesType() {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1640
                                    return false;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1641
                                }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1642
                            })
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1643
                            .collect(toList());
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1644
                    --pastSpace;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1645
                }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1646
                anchor[0] += pastSpace;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1647
                return result;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1648
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1649
            Matcher opp = OPTION_PRE_PATTERN.matcher(code);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1650
            if (opp.matches()) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1651
                int pastSpace = opp.end();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1652
                List<Suggestion> result = provider.completionSuggestions(
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1653
                        "", cursor - pastSpace, anchor);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1654
                anchor[0] += pastSpace;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1655
                return result;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1656
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1657
            return Collections.emptyList();
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  1658
        };
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  1659
    }
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  1660
48939
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  1661
    // /history command completion
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  1662
    private static CompletionProvider historyCompletion() {
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  1663
        return optionCompletion(HISTORY_OPTION_COMPLETION_PROVIDER);
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  1664
    }
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  1665
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1666
    // /reload command completion
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1667
    private static CompletionProvider reloadCompletion() {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1668
        return optionCompletion(RELOAD_OPTIONS_COMPLETION_PROVIDER);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1669
    }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1670
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1671
    // /env command completion
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1672
    private static CompletionProvider envCompletion() {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1673
        return optionCompletion(COMMAND_LINE_LIKE_OPTIONS_COMPLETION_PROVIDER);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1674
    }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1675
40765
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1676
    private static CompletionProvider orMostSpecificCompletion(
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1677
            CompletionProvider left, CompletionProvider right) {
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1678
        return (code, cursor, anchor) -> {
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1679
            int[] leftAnchor = {-1};
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1680
            int[] rightAnchor = {-1};
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1681
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1682
            List<Suggestion> leftSuggestions = left.completionSuggestions(code, cursor, leftAnchor);
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1683
            List<Suggestion> rightSuggestions = right.completionSuggestions(code, cursor, rightAnchor);
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1684
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1685
            List<Suggestion> suggestions = new ArrayList<>();
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1686
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1687
            if (leftAnchor[0] >= rightAnchor[0]) {
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1688
                anchor[0] = leftAnchor[0];
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1689
                suggestions.addAll(leftSuggestions);
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1690
            }
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1691
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1692
            if (leftAnchor[0] <= rightAnchor[0]) {
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1693
                anchor[0] = rightAnchor[0];
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1694
                suggestions.addAll(rightSuggestions);
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1695
            }
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1696
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1697
            return suggestions;
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1698
        };
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1699
    }
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1700
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1701
    // Snippet lists
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1702
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  1703
    Stream<Snippet> allSnippets() {
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1704
        return state.snippets();
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1705
    }
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1706
41514
a75c2b869d8d 8167128: JShell: /drop of statement gives confusing output
rfield
parents: 41248
diff changeset
  1707
    Stream<Snippet> dropableSnippets() {
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  1708
        return state.snippets()
41514
a75c2b869d8d 8167128: JShell: /drop of statement gives confusing output
rfield
parents: 41248
diff changeset
  1709
                .filter(sn -> state.status(sn).isActive());
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1710
    }
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1711
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  1712
    Stream<VarSnippet> allVarSnippets() {
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  1713
        return state.snippets()
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1714
                .filter(sn -> sn.kind() == Snippet.Kind.VAR)
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  1715
                .map(sn -> (VarSnippet) sn);
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1716
    }
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1717
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  1718
    Stream<MethodSnippet> allMethodSnippets() {
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  1719
        return state.snippets()
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1720
                .filter(sn -> sn.kind() == Snippet.Kind.METHOD)
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  1721
                .map(sn -> (MethodSnippet) sn);
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1722
    }
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1723
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  1724
    Stream<TypeDeclSnippet> allTypeSnippets() {
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  1725
        return state.snippets()
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1726
                .filter(sn -> sn.kind() == Snippet.Kind.TYPE_DECL)
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  1727
                .map(sn -> (TypeDeclSnippet) sn);
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1728
    }
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1729
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1730
    // Table of commands -- with command forms, argument kinds, helpKey message, implementation, ...
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1731
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1732
    {
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1733
        registerCommand(new Command("/list",
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1734
                this::cmdList,
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1735
                snippetWithOptionCompletion(SNIPPET_HISTORY_OPTION_COMPLETION_PROVIDER,
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1736
                        this::allSnippets)));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1737
        registerCommand(new Command("/edit",
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1738
                this::cmdEdit,
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1739
                snippetWithOptionCompletion(SNIPPET_OPTION_COMPLETION_PROVIDER,
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1740
                        this::allSnippets)));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1741
        registerCommand(new Command("/drop",
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1742
                this::cmdDrop,
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1743
                snippetCompletion(this::dropableSnippets),
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1744
                CommandKind.REPLAY));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1745
        registerCommand(new Command("/save",
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1746
                this::cmdSave,
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1747
                saveCompletion()));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1748
        registerCommand(new Command("/open",
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1749
                this::cmdOpen,
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1750
                FILE_COMPLETION_PROVIDER));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1751
        registerCommand(new Command("/vars",
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1752
                this::cmdVars,
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1753
                snippetWithOptionCompletion(SNIPPET_OPTION_COMPLETION_PROVIDER,
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1754
                        this::allVarSnippets)));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1755
        registerCommand(new Command("/methods",
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1756
                this::cmdMethods,
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1757
                snippetWithOptionCompletion(SNIPPET_OPTION_COMPLETION_PROVIDER,
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1758
                        this::allMethodSnippets)));
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  1759
        registerCommand(new Command("/types",
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1760
                this::cmdTypes,
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1761
                snippetWithOptionCompletion(SNIPPET_OPTION_COMPLETION_PROVIDER,
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1762
                        this::allTypeSnippets)));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1763
        registerCommand(new Command("/imports",
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1764
                arg -> cmdImports(),
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1765
                EMPTY_COMPLETION_PROVIDER));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1766
        registerCommand(new Command("/exit",
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1767
                arg -> cmdExit(arg),
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1768
                (sn, c, a) -> {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1769
                    if (analysis == null || sn.isEmpty()) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1770
                        // No completions if uninitialized or snippet not started
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1771
                        return Collections.emptyList();
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1772
                    } else {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1773
                        // Give exit code an int context by prefixing the arg
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1774
                        List<Suggestion> suggestions = analysis.completionSuggestions(INT_PREFIX + sn,
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1775
                                INT_PREFIX.length() + c, a);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1776
                        a[0] -= INT_PREFIX.length();
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1777
                        return suggestions;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1778
                    }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  1779
                }));
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1780
        registerCommand(new Command("/env",
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1781
                arg -> cmdEnv(arg),
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1782
                envCompletion()));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1783
        registerCommand(new Command("/reset",
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1784
                arg -> cmdReset(arg),
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1785
                envCompletion()));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1786
        registerCommand(new Command("/reload",
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1787
                this::cmdReload,
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1788
                reloadCompletion()));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1789
        registerCommand(new Command("/history",
48939
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  1790
                this::cmdHistory,
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  1791
                historyCompletion()));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1792
        registerCommand(new Command("/debug",
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1793
                this::cmdDebug,
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1794
                EMPTY_COMPLETION_PROVIDER,
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1795
                CommandKind.HIDDEN));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1796
        registerCommand(new Command("/help",
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1797
                this::cmdHelp,
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1798
                helpCompletion()));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1799
        registerCommand(new Command("/set",
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1800
                this::cmdSet,
40765
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1801
                new ContinuousCompletionProvider(Map.of(
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1802
                        // need more completion for format for usability
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1803
                        "format", feedback.modeCompletions(),
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1804
                        "truncation", feedback.modeCompletions(),
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1805
                        "feedback", feedback.modeCompletions(),
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1806
                        "mode", skipWordThenCompletion(orMostSpecificCompletion(
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1807
                                feedback.modeCompletions(SET_MODE_OPTIONS_COMPLETION_PROVIDER),
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1808
                                SET_MODE_OPTIONS_COMPLETION_PROVIDER)),
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1809
                        "prompt", feedback.modeCompletions(),
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1810
                        "editor", fileCompletions(Files::isExecutable),
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1811
                        "start", FILE_COMPLETION_PROVIDER),
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1812
                        STARTSWITH_MATCHER)));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1813
        registerCommand(new Command("/?",
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1814
                "help.quest",
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1815
                this::cmdHelp,
42265
b36ad5a64e75 8153402: jshell tool: completion provider for /help
rfield
parents: 42259
diff changeset
  1816
                helpCompletion(),
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1817
                CommandKind.NORMAL));
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1818
        registerCommand(new Command("/!",
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1819
                "help.bang",
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1820
                arg -> cmdUseHistoryEntry(-1),
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1821
                EMPTY_COMPLETION_PROVIDER,
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1822
                CommandKind.NORMAL));
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1823
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1824
        // Documentation pseudo-commands
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1825
        registerCommand(new Command("/<id>",
48349
3d4e8f5a2a69 8179858: jshell tool: sync nomenclature from reference to online /help
rfield
parents: 48292
diff changeset
  1826
                "help.slashID",
45602
7aeef976cb06 8180510: jshell tool: crash on entering pseudo-commands: /<id> or /-<n>
rfield
parents: 45215
diff changeset
  1827
                arg -> cmdHelp("rerun"),
7aeef976cb06 8180510: jshell tool: crash on entering pseudo-commands: /<id> or /-<n>
rfield
parents: 45215
diff changeset
  1828
                EMPTY_COMPLETION_PROVIDER,
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1829
                CommandKind.HELP_ONLY));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1830
        registerCommand(new Command("/-<n>",
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1831
                "help.previous",
45602
7aeef976cb06 8180510: jshell tool: crash on entering pseudo-commands: /<id> or /-<n>
rfield
parents: 45215
diff changeset
  1832
                arg -> cmdHelp("rerun"),
7aeef976cb06 8180510: jshell tool: crash on entering pseudo-commands: /<id> or /-<n>
rfield
parents: 45215
diff changeset
  1833
                EMPTY_COMPLETION_PROVIDER,
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1834
                CommandKind.HELP_ONLY));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1835
        registerCommand(new Command("intro",
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1836
                "help.intro",
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1837
                CommandKind.HELP_SUBJECT));
48349
3d4e8f5a2a69 8179858: jshell tool: sync nomenclature from reference to online /help
rfield
parents: 48292
diff changeset
  1838
        registerCommand(new Command("id",
3d4e8f5a2a69 8179858: jshell tool: sync nomenclature from reference to online /help
rfield
parents: 48292
diff changeset
  1839
                "help.id",
3d4e8f5a2a69 8179858: jshell tool: sync nomenclature from reference to online /help
rfield
parents: 48292
diff changeset
  1840
                CommandKind.HELP_SUBJECT));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1841
        registerCommand(new Command("shortcuts",
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1842
                "help.shortcuts",
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  1843
                CommandKind.HELP_SUBJECT));
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1844
        registerCommand(new Command("context",
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1845
                "help.context",
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  1846
                CommandKind.HELP_SUBJECT));
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1847
        registerCommand(new Command("rerun",
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1848
                "help.rerun",
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  1849
                CommandKind.HELP_SUBJECT));
40765
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1850
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1851
        commandCompletions = new ContinuousCompletionProvider(
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1852
                commands.values().stream()
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1853
                        .filter(c -> c.kind.shouldSuggestCompletions)
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1854
                        .collect(toMap(c -> c.command, c -> c.completions)),
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1855
                STARTSWITH_MATCHER);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1856
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1857
40765
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1858
    private ContinuousCompletionProvider commandCompletions;
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1859
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1860
    public List<Suggestion> commandCompletionSuggestions(String code, int cursor, int[] anchor) {
40765
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  1861
        return commandCompletions.completionSuggestions(code, cursor, anchor);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1862
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1863
44459
5224425af378 8177076: jshell tool: usability of completion
jlahoda
parents: 44454
diff changeset
  1864
    public List<String> commandDocumentation(String code, int cursor, boolean shortDescription) {
47931
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1865
        code = code.substring(0, cursor).replaceAll("\\h+", " ");
48275
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1866
        String stripped = code.replaceFirst("/(he(lp?)?|\\?) ", "");
47931
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1867
        boolean inHelp = !code.equals(stripped);
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1868
        int space = stripped.indexOf(' ');
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1869
        String prefix = space != (-1) ? stripped.substring(0, space) : stripped;
44459
5224425af378 8177076: jshell tool: usability of completion
jlahoda
parents: 44454
diff changeset
  1870
        List<String> result = new ArrayList<>();
5224425af378 8177076: jshell tool: usability of completion
jlahoda
parents: 44454
diff changeset
  1871
47931
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1872
        List<Entry<String, String>> toShow;
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1873
48275
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1874
        if (SET_SUB.matcher(stripped).matches()) {
47931
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1875
            String setSubcommand = stripped.replaceFirst("/?set ([^ ]*)($| .*)", "$1");
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1876
            toShow =
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1877
                Arrays.stream(SET_SUBCOMMANDS)
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1878
                       .filter(s -> s.startsWith(setSubcommand))
48275
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1879
                        .map(s -> new SimpleEntry<>("/set " + s, "help.set." + s))
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1880
                        .collect(toList());
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1881
        } else if (RERUN_ID.matcher(stripped).matches()) {
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1882
            toShow =
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1883
                singletonList(new SimpleEntry<>("/<id>", "help.rerun"));
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1884
        } else if (RERUN_PREVIOUS.matcher(stripped).matches()) {
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1885
            toShow =
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1886
                singletonList(new SimpleEntry<>("/-<n>", "help.rerun"));
47931
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1887
        } else {
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1888
            toShow =
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1889
                commands.values()
44459
5224425af378 8177076: jshell tool: usability of completion
jlahoda
parents: 44454
diff changeset
  1890
                        .stream()
47931
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1891
                        .filter(c -> c.command.startsWith(prefix)
48275
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1892
                                  || c.command.substring(1).startsWith(prefix))
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1893
                        .filter(c -> c.kind.showInHelp
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1894
                                  || (inHelp && c.kind == CommandKind.HELP_SUBJECT))
47931
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1895
                        .sorted((c1, c2) -> c1.command.compareTo(c2.command))
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1896
                        .map(c -> new SimpleEntry<>(c.command, c.helpKey))
48275
b2190c70a1ac 8192863: jshell tool: /<id><tab> gives "No such command"
rfield
parents: 48273
diff changeset
  1897
                        .collect(toList());
47931
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1898
        }
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1899
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1900
        if (toShow.size() == 1 && !inHelp) {
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1901
            result.add(getResourceString(toShow.get(0).getValue() + (shortDescription ? ".summary" : "")));
44459
5224425af378 8177076: jshell tool: usability of completion
jlahoda
parents: 44454
diff changeset
  1902
        } else {
47931
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1903
            for (Entry<String, String> e : toShow) {
b7ae1437111b 8178109: More useful documentation on /help
jlahoda
parents: 47840
diff changeset
  1904
                result.add(e.getKey() + "\n" + getResourceString(e.getValue() + (shortDescription ? ".summary" : "")));
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1905
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1906
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1907
44459
5224425af378 8177076: jshell tool: usability of completion
jlahoda
parents: 44454
diff changeset
  1908
        return result;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1909
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1910
44188
3f2047e62102 8176412: jshell tool: automatic imports are excluded on /reload causing it to fail
rfield
parents: 44065
diff changeset
  1911
    // Attempt to stop currently running evaluation
3f2047e62102 8176412: jshell tool: automatic imports are excluded on /reload causing it to fail
rfield
parents: 44065
diff changeset
  1912
    void stop() {
3f2047e62102 8176412: jshell tool: automatic imports are excluded on /reload causing it to fail
rfield
parents: 44065
diff changeset
  1913
        state.stop();
3f2047e62102 8176412: jshell tool: automatic imports are excluded on /reload causing it to fail
rfield
parents: 44065
diff changeset
  1914
    }
3f2047e62102 8176412: jshell tool: automatic imports are excluded on /reload causing it to fail
rfield
parents: 44065
diff changeset
  1915
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1916
    // --- Command implementations ---
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1917
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  1918
    private static final String[] SET_SUBCOMMANDS = new String[]{
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  1919
        "format", "truncation", "feedback", "mode", "prompt", "editor", "start"};
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1920
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1921
    final boolean cmdSet(String arg) {
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1922
        String cmd = "/set";
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  1923
        ArgTokenizer at = new ArgTokenizer(cmd, arg.trim());
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1924
        String which = subCommand(cmd, at, SET_SUBCOMMANDS);
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1925
        if (which == null) {
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  1926
            return false;
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1927
        }
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1928
        switch (which) {
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1929
            case "_retain": {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1930
                errormsg("jshell.err.setting.to.retain.must.be.specified", at.whole());
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1931
                return false;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1932
            }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1933
            case "_blank": {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1934
                // show top-level settings
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1935
                new SetEditor().set();
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1936
                showSetStart();
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1937
                setFeedback(this, at); // no args so shows feedback setting
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1938
                hardmsg("jshell.msg.set.show.mode.settings");
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1939
                return true;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1940
            }
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1941
            case "format":
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1942
                return feedback.setFormat(this, at);
38513
0ae85633d035 8154812: jshell tool: value printing truncation
rfield
parents: 37745
diff changeset
  1943
            case "truncation":
0ae85633d035 8154812: jshell tool: value printing truncation
rfield
parents: 37745
diff changeset
  1944
                return feedback.setTruncation(this, at);
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1945
            case "feedback":
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1946
                return setFeedback(this, at);
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  1947
            case "mode":
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1948
                return feedback.setMode(this, at,
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1949
                        retained -> prefs.put(MODE_KEY, retained));
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1950
            case "prompt":
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1951
                return feedback.setPrompt(this, at);
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  1952
            case "editor":
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1953
                return new SetEditor(at).set();
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  1954
            case "start":
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1955
                return setStart(at);
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1956
            default:
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1957
                errormsg("jshell.err.arg", cmd, at.val());
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1958
                return false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1959
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1960
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  1961
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1962
    boolean setFeedback(MessageHandler messageHandler, ArgTokenizer at) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1963
        return feedback.setFeedback(messageHandler, at,
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1964
                fb -> prefs.put(FEEDBACK_KEY, fb));
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1965
    }
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1966
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1967
    // Find which, if any, sub-command matches.
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1968
    // Return null on error
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1969
    String subCommand(String cmd, ArgTokenizer at, String[] subs) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1970
        at.allowedOptions("-retain");
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1971
        String sub = at.next();
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1972
        if (sub == null) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1973
            // No sub-command was given
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1974
            return at.hasOption("-retain")
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1975
                    ? "_retain"
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1976
                    : "_blank";
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1977
        }
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1978
        String[] matches = Arrays.stream(subs)
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1979
                .filter(s -> s.startsWith(sub))
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  1980
                .toArray(String[]::new);
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1981
        if (matches.length == 0) {
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1982
            // There are no matching sub-commands
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1983
            errormsg("jshell.err.arg", cmd, sub);
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1984
            fluffmsg("jshell.msg.use.one.of", Arrays.stream(subs)
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1985
                    .collect(Collectors.joining(", "))
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1986
            );
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1987
            return null;
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1988
        }
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1989
        if (matches.length > 1) {
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  1990
            // More than one sub-command matches the initial characters provided
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  1991
            errormsg("jshell.err.sub.ambiguous", cmd, sub);
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  1992
            fluffmsg("jshell.msg.use.one.of", Arrays.stream(matches)
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1993
                    .collect(Collectors.joining(", "))
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1994
            );
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1995
            return null;
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1996
        }
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1997
        return matches[0];
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1998
    }
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  1999
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2000
    static class EditorSetting {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2001
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2002
        static String BUILT_IN_REP = "-default";
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2003
        static char WAIT_PREFIX = '-';
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2004
        static char NORMAL_PREFIX = '*';
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2005
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2006
        final String[] cmd;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2007
        final boolean wait;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2008
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2009
        EditorSetting(String[] cmd, boolean wait) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2010
            this.wait = wait;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2011
            this.cmd = cmd;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2012
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2013
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2014
        // returns null if not stored in preferences
42843
a8d83044a192 8170162: jshell tool: no mechanism to programmatically launch
rfield
parents: 42827
diff changeset
  2015
        static EditorSetting fromPrefs(PersistentStorage prefs) {
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2016
            // Read retained editor setting (if any)
42843
a8d83044a192 8170162: jshell tool: no mechanism to programmatically launch
rfield
parents: 42827
diff changeset
  2017
            String editorString = prefs.get(EDITOR_KEY);
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2018
            if (editorString == null || editorString.isEmpty()) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2019
                return null;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2020
            } else if (editorString.equals(BUILT_IN_REP)) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2021
                return BUILT_IN_EDITOR;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2022
            } else {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2023
                boolean wait = false;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2024
                char waitMarker = editorString.charAt(0);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2025
                if (waitMarker == WAIT_PREFIX || waitMarker == NORMAL_PREFIX) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2026
                    wait = waitMarker == WAIT_PREFIX;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2027
                    editorString = editorString.substring(1);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2028
                }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2029
                String[] cmd = editorString.split(RECORD_SEPARATOR);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2030
                return new EditorSetting(cmd, wait);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2031
            }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2032
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2033
42843
a8d83044a192 8170162: jshell tool: no mechanism to programmatically launch
rfield
parents: 42827
diff changeset
  2034
        static void removePrefs(PersistentStorage prefs) {
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2035
            prefs.remove(EDITOR_KEY);
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2036
        }
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2037
42843
a8d83044a192 8170162: jshell tool: no mechanism to programmatically launch
rfield
parents: 42827
diff changeset
  2038
        void toPrefs(PersistentStorage prefs) {
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2039
            prefs.put(EDITOR_KEY, (this == BUILT_IN_EDITOR)
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2040
                    ? BUILT_IN_REP
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2041
                    : (wait ? WAIT_PREFIX : NORMAL_PREFIX) + String.join(RECORD_SEPARATOR, cmd));
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2042
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2043
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2044
        @Override
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2045
        public boolean equals(Object o) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2046
            if (o instanceof EditorSetting) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2047
                EditorSetting ed = (EditorSetting) o;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2048
                return Arrays.equals(cmd, ed.cmd) && wait == ed.wait;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2049
            } else {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2050
                return false;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2051
            }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2052
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2053
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2054
        @Override
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2055
        public int hashCode() {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2056
            int hash = 7;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2057
            hash = 71 * hash + Arrays.deepHashCode(this.cmd);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2058
            hash = 71 * hash + (this.wait ? 1 : 0);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2059
            return hash;
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2060
        }
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2061
    }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2062
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2063
    class SetEditor {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2064
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2065
        private final ArgTokenizer at;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2066
        private final String[] command;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2067
        private final boolean hasCommand;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2068
        private final boolean defaultOption;
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2069
        private final boolean deleteOption;
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2070
        private final boolean waitOption;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2071
        private final boolean retainOption;
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2072
        private final int primaryOptionCount;
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2073
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2074
        SetEditor(ArgTokenizer at) {
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2075
            at.allowedOptions("-default", "-wait", "-retain", "-delete");
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2076
            String prog = at.next();
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2077
            List<String> ed = new ArrayList<>();
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2078
            while (at.val() != null) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2079
                ed.add(at.val());
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2080
                at.nextToken();  // so that options are not interpreted as jshell options
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2081
            }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2082
            this.at = at;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2083
            this.command = ed.toArray(new String[ed.size()]);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2084
            this.hasCommand = command.length > 0;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2085
            this.defaultOption = at.hasOption("-default");
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2086
            this.deleteOption = at.hasOption("-delete");
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2087
            this.waitOption = at.hasOption("-wait");
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2088
            this.retainOption = at.hasOption("-retain");
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2089
            this.primaryOptionCount = (hasCommand? 1 : 0) + (defaultOption? 1 : 0) + (deleteOption? 1 : 0);
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2090
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2091
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2092
        SetEditor() {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2093
            this(new ArgTokenizer("", ""));
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2094
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2095
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2096
        boolean set() {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2097
            if (!check()) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2098
                return false;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2099
            }
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2100
            if (primaryOptionCount == 0 && !retainOption) {
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2101
                // No settings or -retain, so this is a query
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2102
                EditorSetting retained = EditorSetting.fromPrefs(prefs);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2103
                if (retained != null) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2104
                    // retained editor is set
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2105
                    hard("/set editor -retain %s", format(retained));
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2106
                }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2107
                if (retained == null || !retained.equals(editor)) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2108
                    // editor is not retained or retained is different from set
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2109
                    hard("/set editor %s", format(editor));
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2110
                }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2111
                return true;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2112
            }
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2113
            if (retainOption && deleteOption) {
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2114
                EditorSetting.removePrefs(prefs);
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2115
            }
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2116
            install();
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2117
            if (retainOption && !deleteOption) {
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2118
                editor.toPrefs(prefs);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2119
                fluffmsg("jshell.msg.set.editor.retain", format(editor));
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2120
            }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2121
            return true;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2122
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2123
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2124
        private boolean check() {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2125
            if (!checkOptionsAndRemainingInput(at)) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2126
                return false;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2127
            }
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2128
            if (primaryOptionCount > 1) {
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2129
                errormsg("jshell.err.default.option.or.program", at.whole());
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2130
                return false;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2131
            }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2132
            if (waitOption && !hasCommand) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2133
                errormsg("jshell.err.wait.applies.to.external.editor", at.whole());
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2134
                return false;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2135
            }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2136
            return true;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2137
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2138
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2139
        private void install() {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2140
            if (hasCommand) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2141
                editor = new EditorSetting(command, waitOption);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2142
            } else if (defaultOption) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2143
                editor = BUILT_IN_EDITOR;
41641
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2144
            } else if (deleteOption) {
a628785b9dd9 8167637: jshell tool: /edit should use EDITOR setting
rfield
parents: 41635
diff changeset
  2145
                configEditor();
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2146
            } else {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2147
                return;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2148
            }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2149
            fluffmsg("jshell.msg.set.editor.set", format(editor));
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2150
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2151
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2152
        private String format(EditorSetting ed) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2153
            if (ed == BUILT_IN_EDITOR) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2154
                return "-default";
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2155
            } else {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2156
                Stream<String> elems = Arrays.stream(ed.cmd);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2157
                if (ed.wait) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2158
                    elems = Stream.concat(Stream.of("-wait"), elems);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2159
                }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2160
                return elems.collect(joining(" "));
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2161
            }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2162
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2163
    }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2164
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2165
    // The sub-command:  /set start <start-file>
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2166
    boolean setStart(ArgTokenizer at) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2167
        at.allowedOptions("-default", "-none", "-retain");
42972
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  2168
        List<String> fns = new ArrayList<>();
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  2169
        while (at.next() != null) {
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  2170
            fns.add(at.val());
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  2171
        }
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2172
        if (!checkOptionsAndRemainingInput(at)) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2173
            return false;
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  2174
        }
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2175
        boolean defaultOption = at.hasOption("-default");
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2176
        boolean noneOption = at.hasOption("-none");
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2177
        boolean retainOption = at.hasOption("-retain");
42972
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  2178
        boolean hasFile = !fns.isEmpty();
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2179
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2180
        int argCount = (defaultOption ? 1 : 0) + (noneOption ? 1 : 0) + (hasFile ? 1 : 0);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2181
        if (argCount > 1) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2182
            errormsg("jshell.err.option.or.filename", at.whole());
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2183
            return false;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2184
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2185
        if (argCount == 0 && !retainOption) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2186
            // no options or filename, show current setting
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2187
            showSetStart();
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2188
            return true;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2189
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2190
        if (hasFile) {
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2191
            startup = Startup.fromFileList(fns, "/set start", this);
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2192
            if (startup == null) {
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2193
                return false;
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2194
            }
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2195
        } else if (defaultOption) {
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2196
            startup = Startup.defaultStartup(this);
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2197
        } else if (noneOption) {
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2198
            startup = Startup.noStartup();
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2199
        }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2200
        if (retainOption) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2201
            // retain startup setting
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2202
            prefs.put(STARTUP_KEY, startup.storedForm());
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2203
        }
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  2204
        return true;
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  2205
    }
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  2206
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2207
    // show the "/set start" settings (retained and, if different, current)
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2208
    // as commands (and file contents).  All commands first, then contents.
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2209
    void showSetStart() {
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2210
        StringBuilder sb = new StringBuilder();
42843
a8d83044a192 8170162: jshell tool: no mechanism to programmatically launch
rfield
parents: 42827
diff changeset
  2211
        String retained = prefs.get(STARTUP_KEY);
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2212
        if (retained != null) {
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2213
            Startup retainedStart = Startup.unpack(retained, this);
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2214
            boolean currentDifferent = !startup.equals(retainedStart);
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2215
            sb.append(retainedStart.show(true));
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2216
            if (currentDifferent) {
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2217
                sb.append(startup.show(false));
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2218
            }
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2219
            sb.append(retainedStart.showDetail());
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2220
            if (currentDifferent) {
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2221
                sb.append(startup.showDetail());
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2222
            }
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2223
        } else {
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2224
            sb.append(startup.show(false));
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2225
            sb.append(startup.showDetail());
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  2226
        }
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  2227
        hard(sb.toString());
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  2228
    }
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  2229
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2230
    boolean cmdDebug(String arg) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2231
        if (arg.isEmpty()) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2232
            debug = !debug;
38535
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 38531
diff changeset
  2233
            InternalDebugControl.setDebugFlags(state, debug ? DBG_GEN : 0);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2234
            fluff("Debugging %s", debug ? "on" : "off");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2235
        } else {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2236
            int flags = 0;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2237
            for (char ch : arg.toCharArray()) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2238
                switch (ch) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2239
                    case '0':
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2240
                        flags = 0;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2241
                        debug = false;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2242
                        fluff("Debugging off");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2243
                        break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2244
                    case 'r':
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2245
                        debug = true;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2246
                        fluff("REPL tool debugging on");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2247
                        break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2248
                    case 'g':
38535
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 38531
diff changeset
  2249
                        flags |= DBG_GEN;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2250
                        fluff("General debugging on");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2251
                        break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2252
                    case 'f':
38535
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 38531
diff changeset
  2253
                        flags |= DBG_FMGR;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2254
                        fluff("File manager debugging on");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2255
                        break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2256
                    case 'c':
38535
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 38531
diff changeset
  2257
                        flags |= DBG_COMPA;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2258
                        fluff("Completion analysis debugging on");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2259
                        break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2260
                    case 'd':
38535
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 38531
diff changeset
  2261
                        flags |= DBG_DEP;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2262
                        fluff("Dependency debugging on");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2263
                        break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2264
                    case 'e':
38535
4a25025e0b0d 8156101: JShell SPI: Provide a pluggable execution control SPI
rfield
parents: 38531
diff changeset
  2265
                        flags |= DBG_EVNT;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2266
                        fluff("Event debugging on");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2267
                        break;
43134
006808ae5f6e 8171981: JShell: Fails compilation: new Object().getClass().getSuperclass()
rfield
parents: 43038
diff changeset
  2268
                    case 'w':
006808ae5f6e 8171981: JShell: Fails compilation: new Object().getClass().getSuperclass()
rfield
parents: 43038
diff changeset
  2269
                        flags |= DBG_WRAP;
006808ae5f6e 8171981: JShell: Fails compilation: new Object().getClass().getSuperclass()
rfield
parents: 43038
diff changeset
  2270
                        fluff("Wrap debugging on");
006808ae5f6e 8171981: JShell: Fails compilation: new Object().getClass().getSuperclass()
rfield
parents: 43038
diff changeset
  2271
                        break;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2272
                    default:
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2273
                        error("Unknown debugging option: %c", ch);
43134
006808ae5f6e 8171981: JShell: Fails compilation: new Object().getClass().getSuperclass()
rfield
parents: 43038
diff changeset
  2274
                        fluff("Use: 0 r g f c d e w");
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2275
                        return false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2276
                }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2277
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2278
            InternalDebugControl.setDebugFlags(state, flags);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2279
        }
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2280
        return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2281
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2282
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2283
    private boolean cmdExit(String arg) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2284
        if (!arg.trim().isEmpty()) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2285
            debug("Compiling exit: %s", arg);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2286
            List<SnippetEvent> events = state.eval(arg);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2287
            for (SnippetEvent e : events) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2288
                // Only care about main snippet
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2289
                if (e.causeSnippet() == null) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2290
                    Snippet sn = e.snippet();
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2291
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2292
                    // Show any diagnostics
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2293
                    List<Diag> diagnostics = state.diagnostics(sn).collect(toList());
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2294
                    String source = sn.source();
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2295
                    displayDiagnostics(source, diagnostics);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2296
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2297
                    // Show any exceptions
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2298
                    if (e.exception() != null && e.status() != Status.REJECTED) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2299
                        if (displayException(e.exception())) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2300
                            // Abort: an exception occurred (reported)
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2301
                            return false;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2302
                        }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2303
                    }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2304
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2305
                    if (e.status() != Status.VALID) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2306
                        // Abort: can only use valid snippets, diagnostics have been reported (above)
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2307
                        return false;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2308
                    }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2309
                    String typeName;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2310
                    if (sn.kind() == Kind.EXPRESSION) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2311
                        typeName = ((ExpressionSnippet) sn).typeName();
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2312
                    } else if (sn.subKind() == TEMP_VAR_EXPRESSION_SUBKIND) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2313
                        typeName = ((VarSnippet) sn).typeName();
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2314
                    } else {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2315
                        // Abort: not an expression
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2316
                        errormsg("jshell.err.exit.not.expression", arg);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2317
                        return false;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2318
                    }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2319
                    switch (typeName) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2320
                        case "int":
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2321
                        case "Integer":
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2322
                        case "byte":
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2323
                        case "Byte":
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2324
                        case "short":
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2325
                        case "Short":
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2326
                            try {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2327
                                int i = Integer.parseInt(e.value());
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2328
                                /**
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2329
                                addToReplayHistory("/exit " + arg);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2330
                                replayableHistory.storeHistory(prefs);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2331
                                closeState();
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2332
                                try {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2333
                                    input.close();
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2334
                                } catch (Exception exc) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2335
                                    // ignore
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2336
                                }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2337
                                * **/
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2338
                                exitCode = i;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2339
                                break;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2340
                            } catch (NumberFormatException exc) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2341
                                // Abort: bad value
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2342
                                errormsg("jshell.err.exit.bad.value", arg, e.value());
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2343
                                return false;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2344
                            }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2345
                        default:
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2346
                            // Abort: bad type
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2347
                            errormsg("jshell.err.exit.bad.type", arg, typeName);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2348
                            return false;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2349
                    }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2350
                }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2351
            }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2352
        }
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2353
        regenerateOnDeath = false;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2354
        live = false;
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2355
        if (exitCode == 0) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2356
            fluffmsg("jshell.msg.goodbye");
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2357
        } else {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2358
            fluffmsg("jshell.msg.goodbye.value", exitCode);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2359
        }
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2360
        return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2361
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2362
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2363
    boolean cmdHelp(String arg) {
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2364
        ArgTokenizer at = new ArgTokenizer("/help", arg);
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2365
        String subject = at.next();
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2366
        if (subject != null) {
44454
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2367
            // check if the requested subject is a help subject or
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2368
            // a command, with or without slash
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2369
            Command[] matches = commands.values().stream()
44454
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2370
                    .filter(c -> c.command.startsWith(subject)
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2371
                              || c.command.substring(1).startsWith(subject))
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  2372
                    .toArray(Command[]::new);
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2373
            if (matches.length == 1) {
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  2374
                String cmd = matches[0].command;
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2375
                if (cmd.equals("/set")) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2376
                    // Print the help doc for the specified sub-command
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2377
                    String which = subCommand(cmd, at, SET_SUBCOMMANDS);
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2378
                    if (which == null) {
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2379
                        return false;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2380
                    }
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2381
                    if (!which.equals("_blank")) {
48273
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
  2382
                        printHelp("/set " + which, "help.set." + which);
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2383
                        return true;
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2384
                    }
38531
c449daa25b45 8157200: jshell tool: Add /retain command to persist settings
rfield
parents: 38520
diff changeset
  2385
                }
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2386
            }
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2387
            if (matches.length > 0) {
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2388
                for (Command c : matches) {
48273
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
  2389
                    printHelp(c.command, c.helpKey);
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2390
                }
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2391
                return true;
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2392
            } else {
44454
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2393
                // failing everything else, check if this is the start of
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2394
                // a /set sub-command name
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2395
                String[] subs = Arrays.stream(SET_SUBCOMMANDS)
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2396
                        .filter(s -> s.startsWith(subject))
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2397
                        .toArray(String[]::new);
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2398
                if (subs.length > 0) {
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2399
                    for (String sub : subs) {
48273
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
  2400
                        printHelp("/set " + sub, "help.set." + sub);
44454
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2401
                    }
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2402
                    return true;
74af976d6798 8177079: jshell tool: usability of /help for commands and sub-commands
rfield
parents: 44188
diff changeset
  2403
                }
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2404
                errormsg("jshell.err.help.arg", arg);
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2405
            }
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2406
        }
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2407
        hardmsg("jshell.msg.help.begin");
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2408
        hardPairs(commands.values().stream()
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2409
                .filter(cmd -> cmd.kind.showInHelp),
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2410
                cmd -> cmd.command + " " + getResourceString(cmd.helpKey + ".args"),
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2411
                cmd -> getResourceString(cmd.helpKey + ".summary")
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2412
        );
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2413
        hardmsg("jshell.msg.help.subject");
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2414
        hardPairs(commands.values().stream()
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2415
                .filter(cmd -> cmd.kind == CommandKind.HELP_SUBJECT),
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2416
                cmd -> cmd.command,
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2417
                cmd -> getResourceString(cmd.helpKey + ".summary")
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  2418
        );
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2419
        return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2420
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2421
48273
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
  2422
    private void printHelp(String name, String key) {
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
  2423
        int len = name.length();
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
  2424
        String centered = "%" + ((OUTPUT_WIDTH + len) / 2) + "s";
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
  2425
        hard("");
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
  2426
        hard(centered, name);
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
  2427
        hard(centered, Stream.generate(() -> "=").limit(len).collect(Collectors.joining()));
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
  2428
        hard("");
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
  2429
        hardrb(key);
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
  2430
    }
e2065f7505eb 8192979: jshell tool: Online help text for commands is confusing
rfield
parents: 47931
diff changeset
  2431
48939
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  2432
    private boolean cmdHistory(String rawArgs) {
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  2433
        ArgTokenizer at = new ArgTokenizer("/history", rawArgs.trim());
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  2434
        at.allowedOptions("-all");
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  2435
        if (!checkOptionsAndRemainingInput(at)) {
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  2436
            return false;
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  2437
        }
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2438
        cmdout.println();
48939
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  2439
        for (String s : input.history(!at.hasOption("-all"))) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2440
            // No number prefix, confusing with snippet ids
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2441
            cmdout.printf("%s\n", s);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2442
        }
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2443
        return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2444
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2445
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2446
    /**
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2447
     * Avoid parameterized varargs possible heap pollution warning.
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2448
     */
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2449
    private interface SnippetPredicate<T extends Snippet> extends Predicate<T> { }
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2450
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2451
    /**
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2452
     * Apply filters to a stream until one that is non-empty is found.
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2453
     * Adapted from Stuart Marks
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2454
     *
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2455
     * @param supplier Supply the Snippet stream to filter
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2456
     * @param filters Filters to attempt
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2457
     * @return The non-empty filtered Stream, or null
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2458
     */
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2459
    @SafeVarargs
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2460
    private static <T extends Snippet> Stream<T> nonEmptyStream(Supplier<Stream<T>> supplier,
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2461
            SnippetPredicate<T>... filters) {
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2462
        for (SnippetPredicate<T> filt : filters) {
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2463
            Iterator<T> iterator = supplier.get().filter(filt).iterator();
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2464
            if (iterator.hasNext()) {
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2465
                return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, 0), false);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2466
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2467
        }
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2468
        return null;
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2469
    }
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2470
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  2471
    private boolean inStartUp(Snippet sn) {
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  2472
        return mapSnippet.get(sn).space == startNamespace;
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  2473
    }
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  2474
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  2475
    private boolean isActive(Snippet sn) {
38908
f0c186d76c8a 8139829: JShell API: No use of fields to return information from public types
rfield
parents: 38613
diff changeset
  2476
        return state.status(sn).isActive();
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  2477
    }
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  2478
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2479
    private boolean mainActive(Snippet sn) {
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  2480
        return !inStartUp(sn) && isActive(sn);
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2481
    }
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2482
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2483
    private boolean matchingDeclaration(Snippet sn, String name) {
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2484
        return sn instanceof DeclarationSnippet
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2485
                && ((DeclarationSnippet) sn).name().equals(name);
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2486
    }
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2487
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2488
    /**
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2489
     * Convert user arguments to a Stream of snippets referenced by those
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2490
     * arguments (or lack of arguments).
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2491
     *
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2492
     * @param snippets the base list of possible snippets
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2493
     * @param defFilter the filter to apply to the arguments if no argument
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2494
     * @param rawargs the user's argument to the command, maybe be the empty
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2495
     * string
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2496
     * @return a Stream of referenced snippets or null if no matches are found
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2497
     */
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  2498
    private <T extends Snippet> Stream<T> argsOptionsToSnippets(Supplier<Stream<T>> snippetSupplier,
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2499
            Predicate<Snippet> defFilter, String rawargs, String cmd) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2500
        ArgTokenizer at = new ArgTokenizer(cmd, rawargs.trim());
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2501
        at.allowedOptions("-all", "-start");
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2502
        return argsOptionsToSnippets(snippetSupplier, defFilter, at);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2503
    }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2504
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2505
    /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2506
     * Convert user arguments to a Stream of snippets referenced by those
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2507
     * arguments (or lack of arguments).
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2508
     *
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2509
     * @param snippets the base list of possible snippets
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2510
     * @param defFilter the filter to apply to the arguments if no argument
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2511
     * @param at the ArgTokenizer, with allowed options set
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2512
     * @return
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2513
     */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2514
    private <T extends Snippet> Stream<T> argsOptionsToSnippets(Supplier<Stream<T>> snippetSupplier,
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2515
            Predicate<Snippet> defFilter, ArgTokenizer at) {
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2516
        List<String> args = new ArrayList<>();
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2517
        String s;
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2518
        while ((s = at.next()) != null) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2519
            args.add(s);
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2520
        }
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2521
        if (!checkOptionsAndRemainingInput(at)) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2522
            return null;
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2523
        }
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2524
        if (at.optionCount() > 0 && args.size() > 0) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2525
            errormsg("jshell.err.may.not.specify.options.and.snippets", at.whole());
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2526
            return null;
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2527
        }
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2528
        if (at.optionCount() > 1) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2529
            errormsg("jshell.err.conflicting.options", at.whole());
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2530
            return null;
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2531
        }
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2532
        if (at.isAllowedOption("-all") && at.hasOption("-all")) {
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2533
            // all snippets including start-up, failed, and overwritten
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  2534
            return snippetSupplier.get();
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2535
        }
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2536
        if (at.isAllowedOption("-start") && at.hasOption("-start")) {
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  2537
            // start-up snippets
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  2538
            return snippetSupplier.get()
35812
6a6ca0bd3c14 8146138: jshell tool: add /help <command>
rfield
parents: 35000
diff changeset
  2539
                    .filter(this::inStartUp);
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2540
        }
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2541
        if (args.isEmpty()) {
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2542
            // Default is all active user snippets
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  2543
            return snippetSupplier.get()
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2544
                    .filter(defFilter);
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2545
        }
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2546
        return new ArgToSnippets<>(snippetSupplier).argsToSnippets(args);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2547
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2548
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2549
    /**
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2550
     * Support for converting arguments that are definition names, snippet ids,
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2551
     * or snippet id ranges into a stream of snippets,
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2552
     *
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2553
     * @param <T> the snipper subtype
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2554
     */
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2555
    private class ArgToSnippets<T extends Snippet> {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2556
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2557
        // the supplier of snippet streams
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2558
        final Supplier<Stream<T>> snippetSupplier;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2559
        // these two are parallel, and lazily filled if a range is encountered
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2560
        List<T> allSnippets;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2561
        String[] allIds = null;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2562
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2563
        /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2564
         *
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2565
         * @param snippetSupplier the base list of possible snippets
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2566
        */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2567
        ArgToSnippets(Supplier<Stream<T>> snippetSupplier) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2568
            this.snippetSupplier = snippetSupplier;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2569
        }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2570
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2571
        /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2572
         * Convert user arguments to a Stream of snippets referenced by those
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2573
         * arguments.
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2574
         *
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2575
         * @param args the user's argument to the command, maybe be the empty
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2576
         * list
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2577
         * @return a Stream of referenced snippets or null if no matches to
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2578
         * specific arg
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2579
         */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2580
        Stream<T> argsToSnippets(List<String> args) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2581
            Stream<T> result = null;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2582
            for (String arg : args) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2583
                // Find the best match
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2584
                Stream<T> st = argToSnippets(arg);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2585
                if (st == null) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2586
                    return null;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2587
                } else {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2588
                    result = (result == null)
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2589
                            ? st
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2590
                            : Stream.concat(result, st);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2591
                }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2592
            }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2593
            return result;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2594
        }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2595
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2596
        /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2597
         * Convert a user argument to a Stream of snippets referenced by the
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2598
         * argument.
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2599
         *
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2600
         * @param snippetSupplier the base list of possible snippets
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2601
         * @param arg the user's argument to the command
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2602
         * @return a Stream of referenced snippets or null if no matches to
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2603
         * specific arg
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2604
         */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2605
        Stream<T> argToSnippets(String arg) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2606
            if (arg.contains("-")) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2607
                return range(arg);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2608
            }
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2609
            // Find the best match
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  2610
            Stream<T> st = layeredSnippetSearch(snippetSupplier, arg);
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2611
            if (st == null) {
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2612
                badSnippetErrormsg(arg);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2613
                return null;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2614
            } else {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2615
                return st;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2616
            }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2617
        }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2618
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2619
        /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2620
         * Look for inappropriate snippets to give best error message
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2621
         *
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2622
         * @param arg the bad snippet arg
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2623
         * @param errKey the not found error key
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2624
         */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2625
        void badSnippetErrormsg(String arg) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2626
            Stream<Snippet> est = layeredSnippetSearch(state::snippets, arg);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2627
            if (est == null) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2628
                if (ID.matcher(arg).matches()) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2629
                    errormsg("jshell.err.no.snippet.with.id", arg);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2630
                } else {
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2631
                    errormsg("jshell.err.no.such.snippets", arg);
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2632
                }
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2633
            } else {
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2634
                errormsg("jshell.err.the.snippet.cannot.be.used.with.this.command",
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2635
                        arg, est.findFirst().get().source());
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2636
            }
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2637
        }
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2638
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2639
        /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2640
         * Search through the snippets for the best match to the id/name.
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2641
         *
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2642
         * @param <R> the snippet type
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2643
         * @param aSnippetSupplier the supplier of snippet streams
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2644
         * @param arg the arg to match
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2645
         * @return a Stream of referenced snippets or null if no matches to
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2646
         * specific arg
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2647
         */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2648
        <R extends Snippet> Stream<R> layeredSnippetSearch(Supplier<Stream<R>> aSnippetSupplier, String arg) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2649
            return nonEmptyStream(
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2650
                    // the stream supplier
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2651
                    aSnippetSupplier,
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2652
                    // look for active user declarations matching the name
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2653
                    sn -> isActive(sn) && matchingDeclaration(sn, arg),
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2654
                    // else, look for any declarations matching the name
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2655
                    sn -> matchingDeclaration(sn, arg),
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2656
                    // else, look for an id of this name
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2657
                    sn -> sn.id().equals(arg)
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2658
            );
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2659
        }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2660
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2661
        /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2662
         * Given an id1-id2 range specifier, return a stream of snippets within
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2663
         * our context
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2664
         *
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2665
         * @param arg the range arg
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2666
         * @return a Stream of referenced snippets or null if no matches to
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2667
         * specific arg
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2668
         */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2669
        Stream<T> range(String arg) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2670
            int dash = arg.indexOf('-');
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2671
            String iid = arg.substring(0, dash);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2672
            String tid = arg.substring(dash + 1);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2673
            int iidx = snippetIndex(iid);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2674
            if (iidx < 0) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2675
                return null;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2676
            }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2677
            int tidx = snippetIndex(tid);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2678
            if (tidx < 0) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2679
                return null;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2680
            }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2681
            if (tidx < iidx) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2682
                errormsg("jshell.err.end.snippet.range.less.than.start", iid, tid);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2683
                return null;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2684
            }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2685
            return allSnippets.subList(iidx, tidx+1).stream();
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2686
        }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2687
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2688
        /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2689
         * Lazily initialize the id mapping -- needed only for id ranges.
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2690
         */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2691
        void initIdMapping() {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2692
            if (allIds == null) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2693
                allSnippets = snippetSupplier.get()
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2694
                        .sorted((a, b) -> order(a) - order(b))
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2695
                        .collect(toList());
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2696
                allIds = allSnippets.stream()
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2697
                        .map(sn -> sn.id())
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2698
                        .toArray(n -> new String[n]);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2699
            }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2700
        }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2701
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2702
        /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2703
         * Return all the snippet ids -- within the context, and in order.
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2704
         *
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2705
         * @return the snippet ids
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2706
         */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2707
        String[] allIds() {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2708
            initIdMapping();
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2709
            return allIds;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2710
        }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2711
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2712
        /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2713
         * Establish an order on snippet ids.  All startup snippets are first,
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2714
         * all error snippets are last -- within that is by snippet number.
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2715
         *
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2716
         * @param id the id string
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2717
         * @return an ordering int
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2718
         */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2719
        int order(String id) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2720
            try {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2721
                switch (id.charAt(0)) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2722
                    case 's':
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2723
                        return Integer.parseInt(id.substring(1));
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2724
                    case 'e':
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2725
                        return 0x40000000 + Integer.parseInt(id.substring(1));
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2726
                    default:
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2727
                        return 0x20000000 + Integer.parseInt(id);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2728
                }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2729
            } catch (Exception ex) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2730
                return 0x60000000;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2731
            }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2732
        }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2733
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2734
        /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2735
         * Establish an order on snippets, based on its snippet id. All startup
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2736
         * snippets are first, all error snippets are last -- within that is by
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2737
         * snippet number.
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2738
         *
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2739
         * @param sn the id string
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2740
         * @return an ordering int
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2741
         */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2742
        int order(Snippet sn) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2743
            return order(sn.id());
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2744
        }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2745
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2746
        /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2747
         * Find the index into the parallel allSnippets and allIds structures.
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2748
         *
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2749
         * @param s the snippet id name
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2750
         * @return the index, or, if not found, report the error and return a
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2751
         * negative number
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2752
         */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2753
        int snippetIndex(String s) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2754
            int idx = Arrays.binarySearch(allIds(), 0, allIds().length, s,
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2755
                    (a, b) -> order(a) - order(b));
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2756
            if (idx < 0) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2757
                // the id is not in the snippet domain, find the right error to report
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2758
                if (!ID.matcher(s).matches()) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2759
                    errormsg("jshell.err.range.requires.id", s);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2760
                } else {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2761
                    badSnippetErrormsg(s);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2762
                }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2763
            }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2764
            return idx;
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2765
        }
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2766
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2767
    }
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2768
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2769
    private boolean cmdDrop(String rawargs) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2770
        ArgTokenizer at = new ArgTokenizer("/drop", rawargs.trim());
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2771
        at.allowedOptions();
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2772
        List<String> args = new ArrayList<>();
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2773
        String s;
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2774
        while ((s = at.next()) != null) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2775
            args.add(s);
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2776
        }
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2777
        if (!checkOptionsAndRemainingInput(at)) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2778
            return false;
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2779
        }
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2780
        if (args.isEmpty()) {
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2781
            errormsg("jshell.err.drop.arg");
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2782
            return false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2783
        }
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2784
        Stream<Snippet> stream = new ArgToSnippets<>(this::dropableSnippets).argsToSnippets(args);
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2785
        if (stream == null) {
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2786
            // Snippet not found. Error already printed
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2787
            fluffmsg("jshell.msg.see.classes.etc");
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2788
            return false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2789
        }
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  2790
        stream.forEach(sn -> state.drop(sn).forEach(this::handleEvent));
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2791
        return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2792
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2793
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2794
    private boolean cmdEdit(String arg) {
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  2795
        Stream<Snippet> stream = argsOptionsToSnippets(state::snippets,
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2796
                this::mainActive, arg, "/edit");
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2797
        if (stream == null) {
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2798
            return false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2799
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2800
        Set<String> srcSet = new LinkedHashSet<>();
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2801
        stream.forEachOrdered(sn -> {
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2802
            String src = sn.source();
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2803
            switch (sn.subKind()) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2804
                case VAR_VALUE_SUBKIND:
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2805
                    break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2806
                case ASSIGNMENT_SUBKIND:
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2807
                case OTHER_EXPRESSION_SUBKIND:
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2808
                case TEMP_VAR_EXPRESSION_SUBKIND:
42259
e4d04fcd0826 8143006: jshell tool: /edit doesn't process each line as same as inputs for jshell
rfield
parents: 41937
diff changeset
  2809
                case UNKNOWN_SUBKIND:
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2810
                    if (!src.endsWith(";")) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2811
                        src = src + ";";
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2812
                    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2813
                    srcSet.add(src);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2814
                    break;
43264
7b06e19184de 8171130: jshell tool: /edit adds empty statement to brace terminated snippet
rfield
parents: 43263
diff changeset
  2815
                case STATEMENT_SUBKIND:
7b06e19184de 8171130: jshell tool: /edit adds empty statement to brace terminated snippet
rfield
parents: 43263
diff changeset
  2816
                    if (src.endsWith("}")) {
7b06e19184de 8171130: jshell tool: /edit adds empty statement to brace terminated snippet
rfield
parents: 43263
diff changeset
  2817
                        // Could end with block or, for example, new Foo() {...}
7b06e19184de 8171130: jshell tool: /edit adds empty statement to brace terminated snippet
rfield
parents: 43263
diff changeset
  2818
                        // so, we need deeper analysis to know if it needs a semicolon
7b06e19184de 8171130: jshell tool: /edit adds empty statement to brace terminated snippet
rfield
parents: 43263
diff changeset
  2819
                        src = analysis.analyzeCompletion(src).source();
7b06e19184de 8171130: jshell tool: /edit adds empty statement to brace terminated snippet
rfield
parents: 43263
diff changeset
  2820
                    } else if (!src.endsWith(";")) {
7b06e19184de 8171130: jshell tool: /edit adds empty statement to brace terminated snippet
rfield
parents: 43263
diff changeset
  2821
                        src = src + ";";
7b06e19184de 8171130: jshell tool: /edit adds empty statement to brace terminated snippet
rfield
parents: 43263
diff changeset
  2822
                    }
7b06e19184de 8171130: jshell tool: /edit adds empty statement to brace terminated snippet
rfield
parents: 43263
diff changeset
  2823
                    srcSet.add(src);
7b06e19184de 8171130: jshell tool: /edit adds empty statement to brace terminated snippet
rfield
parents: 43263
diff changeset
  2824
                    break;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2825
                default:
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2826
                    srcSet.add(src);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2827
                    break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2828
            }
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2829
        });
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2830
        StringBuilder sb = new StringBuilder();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2831
        for (String s : srcSet) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2832
            sb.append(s);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2833
            sb.append('\n');
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2834
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2835
        String src = sb.toString();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2836
        Consumer<String> saveHandler = new SaveHandler(src, srcSet);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2837
        Consumer<String> errorHandler = s -> hard("Edit Error: %s", s);
41635
cb3d04878117 8163840: jshell tool: provide way to display configuration settings
rfield
parents: 41514
diff changeset
  2838
        if (editor == BUILT_IN_EDITOR) {
41934
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2839
            return builtInEdit(src, saveHandler, errorHandler);
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2840
        } else {
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2841
            // Changes have occurred in temp edit directory,
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2842
            // transfer the new sources to JShell (unless the editor is
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2843
            // running directly in JShell's window -- don't make a mess)
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2844
            String[] buffer = new String[1];
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2845
            Consumer<String> extSaveHandler = s -> {
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2846
                if (input.terminalEditorRunning()) {
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2847
                    buffer[0] = s;
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2848
                } else {
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2849
                    saveHandler.accept(s);
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2850
                }
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2851
            };
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2852
            ExternalEditor.edit(editor.cmd, src,
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2853
                    errorHandler, extSaveHandler,
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2854
                    () -> input.suspend(),
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2855
                    () -> input.resume(),
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2856
                    editor.wait,
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2857
                    () -> hardrb("jshell.msg.press.return.to.leave.edit.mode"));
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2858
            if (buffer[0] != null) {
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2859
                saveHandler.accept(buffer[0]);
37007
6023a9a9d58a 8153716: JShell tool: should warn when failed to launch editor
rfield
parents: 36992
diff changeset
  2860
            }
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2861
        }
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2862
        return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2863
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2864
    //where
41934
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2865
    // start the built-in editor
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2866
    private boolean builtInEdit(String initialText,
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2867
            Consumer<String> saveHandler, Consumer<String> errorHandler) {
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2868
        try {
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2869
            ServiceLoader<BuildInEditorProvider> sl
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2870
                    = ServiceLoader.load(BuildInEditorProvider.class);
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2871
            // Find the highest ranking provider
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2872
            BuildInEditorProvider provider = null;
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2873
            for (BuildInEditorProvider p : sl) {
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2874
                if (provider == null || p.rank() > provider.rank()) {
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2875
                    provider = p;
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2876
                }
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2877
            }
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2878
            if (provider != null) {
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2879
                provider.edit(getResourceString("jshell.label.editpad"),
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2880
                        initialText, saveHandler, errorHandler);
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2881
                return true;
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2882
            } else {
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2883
                errormsg("jshell.err.no.builtin.editor");
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2884
            }
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2885
        } catch (RuntimeException ex) {
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2886
            errormsg("jshell.err.cant.launch.editor", ex);
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2887
        }
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2888
        fluffmsg("jshell.msg.try.set.editor");
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2889
        return false;
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2890
    }
a4da50688dc7 8167636: jshell tool: Edit Pad should be in its own module
rfield
parents: 41865
diff changeset
  2891
    //where
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2892
    // receives editor requests to save
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2893
    private class SaveHandler implements Consumer<String> {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2894
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2895
        String src;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2896
        Set<String> currSrcs;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2897
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2898
        SaveHandler(String src, Set<String> ss) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2899
            this.src = src;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2900
            this.currSrcs = ss;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2901
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2902
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2903
        @Override
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2904
        public void accept(String s) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2905
            if (!s.equals(src)) { // quick check first
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2906
                src = s;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2907
                try {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2908
                    Set<String> nextSrcs = new LinkedHashSet<>();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2909
                    boolean failed = false;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2910
                    while (true) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2911
                        CompletionInfo an = analysis.analyzeCompletion(s);
38908
f0c186d76c8a 8139829: JShell API: No use of fields to return information from public types
rfield
parents: 38613
diff changeset
  2912
                        if (!an.completeness().isComplete()) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2913
                            break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2914
                        }
38908
f0c186d76c8a 8139829: JShell API: No use of fields to return information from public types
rfield
parents: 38613
diff changeset
  2915
                        String tsrc = trimNewlines(an.source());
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2916
                        if (!failed && !currSrcs.contains(tsrc)) {
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  2917
                            failed = processSource(tsrc);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2918
                        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2919
                        nextSrcs.add(tsrc);
38908
f0c186d76c8a 8139829: JShell API: No use of fields to return information from public types
rfield
parents: 38613
diff changeset
  2920
                        if (an.remaining().isEmpty()) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2921
                            break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2922
                        }
38908
f0c186d76c8a 8139829: JShell API: No use of fields to return information from public types
rfield
parents: 38613
diff changeset
  2923
                        s = an.remaining();
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2924
                    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2925
                    currSrcs = nextSrcs;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2926
                } catch (IllegalStateException ex) {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2927
                    errormsg("jshell.msg.resetting");
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2928
                    resetState();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2929
                    currSrcs = new LinkedHashSet<>(); // re-process everything
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2930
                }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2931
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2932
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2933
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2934
        private String trimNewlines(String s) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2935
            int b = 0;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2936
            while (b < s.length() && s.charAt(b) == '\n') {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2937
                ++b;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2938
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2939
            int e = s.length() -1;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2940
            while (e >= 0 && s.charAt(e) == '\n') {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2941
                --e;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2942
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2943
            return s.substring(b, e + 1);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2944
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2945
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2946
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2947
    private boolean cmdList(String arg) {
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  2948
        if (arg.length() >= 2 && "-history".startsWith(arg)) {
48939
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  2949
            return cmdHistory("");
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2950
        }
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  2951
        Stream<Snippet> stream = argsOptionsToSnippets(state::snippets,
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  2952
                this::mainActive, arg, "/list");
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2953
        if (stream == null) {
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2954
            return false;
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2955
        }
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2956
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2957
        // prevent double newline on empty list
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2958
        boolean[] hasOutput = new boolean[1];
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2959
        stream.forEachOrdered(sn -> {
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2960
            if (!hasOutput[0]) {
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2961
                cmdout.println();
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2962
                hasOutput[0] = true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2963
            }
34570
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2964
            cmdout.printf("%4s : %s\n", sn.id(), sn.source().replace("\n", "\n       "));
8a8f52a733dd 8144095: jshell tool: normalize command parameter handling
rfield
parents: 34477
diff changeset
  2965
        });
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2966
        return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2967
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2968
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  2969
    private boolean cmdOpen(String filename) {
37389
9c137b83a8b8 8143955: JShell tool (UX): Output structure
rfield
parents: 37007
diff changeset
  2970
        return runFile(filename, "/open");
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2971
    }
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2972
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2973
    private boolean runFile(String filename, String context) {
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2974
        if (!filename.isEmpty()) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2975
            try {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2976
                Scanner scanner;
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2977
                if (!interactiveModeBegun && filename.equals("-")) {
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2978
                    // - on command line: no interactive later, read from input
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2979
                    regenerateOnDeath = false;
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2980
                    scanner = new Scanner(cmdin);
42972
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  2981
                } else {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2982
                    Path path = toPathResolvingUserHome(filename);
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2983
                    String resource;
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2984
                    scanner = new Scanner(
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2985
                            (!Files.exists(path) && (resource = getResource(filename)) != null)
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2986
                            ? new StringReader(resource) // Not found as file, but found as resource
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2987
                            : new FileReader(path.toString())
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2988
                    );
42972
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  2989
                }
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  2990
                run(new ScannerIOContext(scanner));
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2991
                return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2992
            } catch (FileNotFoundException e) {
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2993
                errormsg("jshell.err.file.not.found", context, filename, e.getMessage());
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2994
            } catch (Exception e) {
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2995
                errormsg("jshell.err.file.exception", context, filename, e);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2996
            }
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2997
        } else {
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  2998
            errormsg("jshell.err.file.filename", context);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  2999
        }
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  3000
        return false;
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  3001
    }
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  3002
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  3003
    static String getResource(String name) {
42972
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3004
        if (BUILTIN_FILE_PATTERN.matcher(name).matches()) {
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3005
            try {
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3006
                return readResource(name);
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3007
            } catch (Throwable t) {
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3008
                // Fall-through to null
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3009
            }
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3010
        }
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3011
        return null;
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3012
    }
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3013
47837
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3014
    // Read a built-in file from resources or compute it
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3015
    static String readResource(String name) throws Exception {
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3016
        // Class to compute imports by following requires for a module
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3017
        class ComputeImports {
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3018
            final String base;
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3019
            ModuleFinder finder = ModuleFinder.ofSystem();
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3020
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3021
            ComputeImports(String base) {
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3022
                this.base = base;
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3023
            }
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3024
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3025
            Set<ModuleDescriptor> modules() {
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3026
                Set<ModuleDescriptor> closure = new HashSet<>();
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3027
                moduleClosure(finder.find(base), closure);
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3028
                return closure;
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3029
            }
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3030
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3031
            void moduleClosure(Optional<ModuleReference> omr, Set<ModuleDescriptor> closure) {
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3032
                if (omr.isPresent()) {
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3033
                    ModuleDescriptor mdesc = omr.get().descriptor();
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3034
                    if (closure.add(mdesc)) {
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3035
                        for (ModuleDescriptor.Requires req : mdesc.requires()) {
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3036
                            if (!req.modifiers().contains(ModuleDescriptor.Requires.Modifier.STATIC)) {
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3037
                                moduleClosure(finder.find(req.name()), closure);
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3038
                            }
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3039
                        }
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3040
                    }
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3041
                }
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3042
            }
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3043
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3044
            Set<String> packages() {
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3045
                return modules().stream().flatMap(md -> md.exports().stream())
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3046
                        .filter(e -> !e.isQualified()).map(Object::toString).collect(Collectors.toSet());
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3047
            }
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3048
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3049
            String imports() {
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3050
                Set<String> si = packages();
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3051
                String[] ai = si.toArray(new String[si.size()]);
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3052
                Arrays.sort(ai);
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3053
                return Arrays.stream(ai)
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3054
                        .map(p -> String.format("import %s.*;\n", p))
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3055
                        .collect(Collectors.joining());
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3056
            }
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3057
        }
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3058
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3059
        if (name.equals("JAVASE")) {
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3060
            // The built-in JAVASE is computed as the imports of all the packages in Java SE
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3061
            return new ComputeImports("java.se").imports();
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3062
        }
ef7aad81c3d6 8172154: jshell tool: make all IMPORTS.jsh generated at build time
rfield
parents: 47504
diff changeset
  3063
42972
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3064
        // Attempt to find the file as a resource
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3065
        String spec = String.format(BUILTIN_FILE_PATH_FORMAT, name);
43136
24d62ba7ad5e 8172414: jshell not working in exploded JDK build
jlahoda
parents: 43134
diff changeset
  3066
24d62ba7ad5e 8172414: jshell not working in exploded JDK build
jlahoda
parents: 43134
diff changeset
  3067
        try (InputStream in = JShellTool.class.getResourceAsStream(spec);
43263
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  3068
                BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
ca999fb7b46d 8172179: jshell tool: builtin startup settings should be by reference not content
rfield
parents: 43136
diff changeset
  3069
            return reader.lines().collect(Collectors.joining("\n", "", "\n"));
43136
24d62ba7ad5e 8172414: jshell not working in exploded JDK build
jlahoda
parents: 43134
diff changeset
  3070
        }
42972
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3071
    }
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3072
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3073
    private boolean cmdReset(String rawargs) {
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3074
        Options oldOptions = rawargs.trim().isEmpty()? null : options;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3075
        if (!parseCommandLineLikeFlags(rawargs, new OptionParserBase())) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3076
            return false;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3077
        }
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3078
        live = false;
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  3079
        fluffmsg("jshell.msg.resetting.state");
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3080
        return doReload(null, false, oldOptions);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3081
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3082
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3083
    private boolean cmdReload(String rawargs) {
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3084
        Options oldOptions = rawargs.trim().isEmpty()? null : options;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3085
        OptionParserReload ap = new OptionParserReload();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3086
        if (!parseCommandLineLikeFlags(rawargs, ap)) {
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3087
            return false;
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3088
        }
43564
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
  3089
        ReplayableHistory history;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3090
        if (ap.restore()) {
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3091
            if (replayableHistoryPrevious == null) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3092
                errormsg("jshell.err.reload.no.previous");
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3093
                return false;
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3094
            }
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3095
            history = replayableHistoryPrevious;
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3096
            fluffmsg("jshell.err.reload.restarting.previous.state");
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3097
        } else {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3098
            history = replayableHistory;
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3099
            fluffmsg("jshell.err.reload.restarting.state");
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3100
        }
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3101
        boolean success = doReload(history, !ap.quiet(), oldOptions);
43564
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
  3102
        if (success && ap.restore()) {
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
  3103
            // if we are restoring from previous, then if nothing was added
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
  3104
            // before time of exit, there is nothing to save
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
  3105
            replayableHistory.markSaved();
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
  3106
        }
4287765963d5 8173652: jshell tool: store history on fatal exit
rfield
parents: 43367
diff changeset
  3107
        return success;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3108
    }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3109
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3110
    private boolean cmdEnv(String rawargs) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3111
        if (rawargs.trim().isEmpty()) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3112
            // No arguments, display current settings (as option flags)
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3113
            StringBuilder sb = new StringBuilder();
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3114
            for (String a : options.commonOptions()) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3115
                sb.append(
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3116
                        a.startsWith("-")
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3117
                            ? sb.length() > 0
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3118
                                    ? "\n   "
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3119
                                    :   "   "
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3120
                            : " ");
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3121
                sb.append(a);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3122
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3123
            if (sb.length() > 0) {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  3124
                hard(sb.toString());
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3125
            }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3126
            return false;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3127
        }
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3128
        Options oldOptions = options;
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3129
        if (!parseCommandLineLikeFlags(rawargs, new OptionParserBase())) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3130
            return false;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3131
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3132
        fluffmsg("jshell.msg.set.restore");
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3133
        return doReload(replayableHistory, false, oldOptions);
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3134
    }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3135
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3136
    private boolean doReload(ReplayableHistory history, boolean echo, Options oldOptions) {
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3137
        if (oldOptions != null) {
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3138
            try {
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3139
                resetState();
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3140
            } catch (IllegalStateException ex) {
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3141
                currentNameSpace = mainNamespace; // back out of start-up (messages)
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3142
                errormsg("jshell.err.restart.failed", ex.getMessage());
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3143
                // attempt recovery to previous option settings
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3144
                options = oldOptions;
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3145
                resetState();
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3146
            }
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3147
        } else {
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3148
            resetState();
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3149
        }
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3150
        if (history != null) {
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3151
            run(new ReloadIOContext(history.iterable(),
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3152
                    echo ? cmdout : null));
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3153
        }
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3154
        return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3155
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3156
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3157
    private boolean parseCommandLineLikeFlags(String rawargs, OptionParserBase ap) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3158
        String[] args = Arrays.stream(rawargs.split("\\s+"))
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3159
                .filter(s -> !s.isEmpty())
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3160
                .toArray(String[]::new);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3161
        Options opts = ap.parse(args);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3162
        if (opts == null) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3163
            return false;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3164
        }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3165
        if (!ap.nonOptions().isEmpty()) {
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3166
            errormsg("jshell.err.unexpected.at.end", ap.nonOptions(), rawargs);
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3167
            return false;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3168
        }
44683
610dc2b48954 8178023: jshell tool: crash with ugly message on attempt to add non-existant module path
rfield
parents: 44569
diff changeset
  3169
        options = options.override(opts);
43038
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3170
        return true;
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3171
    }
7b8b8750a78e 8165405: jshell tool: /classpath is inconsistent
rfield
parents: 42972
diff changeset
  3172
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3173
    private boolean cmdSave(String rawargs) {
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3174
        // The filename to save to is the last argument, extract it
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3175
        String[] args = rawargs.split("\\s");
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3176
        String filename = args[args.length - 1];
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3177
        if (filename.isEmpty()) {
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3178
            errormsg("jshell.err.file.filename", "/save");
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3179
            return false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3180
        }
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3181
        // All the non-filename arguments are the specifier of what to save
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3182
        String srcSpec = Arrays.stream(args, 0, args.length - 1)
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3183
                .collect(Collectors.joining("\n"));
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3184
        // From the what to save specifier, compute the snippets (as a stream)
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3185
        ArgTokenizer at = new ArgTokenizer("/save", srcSpec);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3186
        at.allowedOptions("-all", "-start", "-history");
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3187
        Stream<Snippet> snippetStream = argsOptionsToSnippets(state::snippets, this::mainActive, at);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3188
        if (snippetStream == null) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3189
            // error occurred, already reported
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3190
            return false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3191
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3192
        try (BufferedWriter writer = Files.newBufferedWriter(toPathResolvingUserHome(filename),
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3193
                Charset.defaultCharset(),
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3194
                CREATE, TRUNCATE_EXISTING, WRITE)) {
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3195
            if (at.hasOption("-history")) {
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3196
                // they want history (commands and snippets), ignore the snippet stream
48939
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  3197
                for (String s : input.history(true)) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3198
                    writer.write(s);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3199
                    writer.write("\n");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3200
                }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3201
            } else {
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3202
                // write the snippet stream to the file
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3203
                writer.write(snippetStream
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  3204
                        .map(Snippet::source)
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3205
                        .collect(Collectors.joining("\n")));
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3206
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3207
        } catch (FileNotFoundException e) {
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  3208
            errormsg("jshell.err.file.not.found", "/save", filename, e.getMessage());
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3209
            return false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3210
        } catch (Exception e) {
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  3211
            errormsg("jshell.err.file.exception", "/save", filename, e);
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3212
            return false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3213
        }
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3214
        return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3215
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3216
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3217
    private boolean cmdVars(String arg) {
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  3218
        Stream<VarSnippet> stream = argsOptionsToSnippets(this::allVarSnippets,
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3219
                this::isActive, arg, "/vars");
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3220
        if (stream == null) {
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3221
            return false;
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3222
        }
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3223
        stream.forEachOrdered(vk ->
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3224
        {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3225
            String val = state.status(vk) == Status.VALID
41937
1313399705e9 8161969: jshell tool: /var value is not truncated per feedback setting
rfield
parents: 41934
diff changeset
  3226
                    ? feedback.truncateVarValue(state.varValue(vk))
40516
9e0e107c39dd 8154374: JShell: setContextClassLoader() for remote Snippet class loader
rfield
parents: 40498
diff changeset
  3227
                    : getResourceString("jshell.msg.vars.not.active");
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3228
            hard("  %s %s = %s", vk.typeName(), vk.name(), val);
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3229
        });
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3230
        return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3231
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3232
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3233
    private boolean cmdMethods(String arg) {
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  3234
        Stream<MethodSnippet> stream = argsOptionsToSnippets(this::allMethodSnippets,
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3235
                this::isActive, arg, "/methods");
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3236
        if (stream == null) {
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3237
            return false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3238
        }
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3239
        stream.forEachOrdered(meth -> {
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3240
            String sig = meth.signature();
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3241
            int i = sig.lastIndexOf(")") + 1;
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3242
            if (i <= 0) {
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3243
                hard("  %s", meth.name());
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3244
            } else {
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3245
                hard("  %s %s%s", sig.substring(i), meth.name(), sig.substring(0, i));
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3246
            }
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3247
            printSnippetStatus(meth, true);
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3248
        });
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3249
        return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3250
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3251
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3252
    private boolean cmdTypes(String arg) {
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  3253
        Stream<TypeDeclSnippet> stream = argsOptionsToSnippets(this::allTypeSnippets,
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3254
                this::isActive, arg, "/types");
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3255
        if (stream == null) {
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3256
            return false;
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3257
        }
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3258
        stream.forEachOrdered(ck
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3259
        -> {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3260
            String kind;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3261
            switch (ck.subKind()) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3262
                case INTERFACE_SUBKIND:
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3263
                    kind = "interface";
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3264
                    break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3265
                case CLASS_SUBKIND:
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3266
                    kind = "class";
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3267
                    break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3268
                case ENUM_SUBKIND:
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3269
                    kind = "enum";
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3270
                    break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3271
                case ANNOTATION_TYPE_SUBKIND:
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3272
                    kind = "@interface";
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3273
                    break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3274
                default:
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3275
                    assert false : "Wrong kind" + ck.subKind();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3276
                    kind = "class";
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3277
                    break;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3278
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3279
            hard("  %s %s", kind, ck.name());
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3280
            printSnippetStatus(ck, true);
38514
f7df9ab653b0 8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
rfield
parents: 38513
diff changeset
  3281
        });
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3282
        return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3283
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3284
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3285
    private boolean cmdImports() {
33714
8064f484590e 8142384: JShell tool: New command: /imports, /i which show the list of imported packages or classes, etc...
shinyafox
parents: 33362
diff changeset
  3286
        state.imports().forEach(ik -> {
8064f484590e 8142384: JShell tool: New command: /imports, /i which show the list of imported packages or classes, etc...
shinyafox
parents: 33362
diff changeset
  3287
            hard("  import %s%s", ik.isStatic() ? "static " : "", ik.fullname());
8064f484590e 8142384: JShell tool: New command: /imports, /i which show the list of imported packages or classes, etc...
shinyafox
parents: 33362
diff changeset
  3288
        });
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3289
        return true;
33714
8064f484590e 8142384: JShell tool: New command: /imports, /i which show the list of imported packages or classes, etc...
shinyafox
parents: 33362
diff changeset
  3290
    }
8064f484590e 8142384: JShell tool: New command: /imports, /i which show the list of imported packages or classes, etc...
shinyafox
parents: 33362
diff changeset
  3291
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3292
    private boolean cmdUseHistoryEntry(int index) {
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  3293
        List<Snippet> keys = state.snippets().collect(toList());
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3294
        if (index < 0)
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3295
            index += keys.size();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3296
        else
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3297
            index--;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3298
        if (index >= 0 && index < keys.size()) {
34477
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  3299
            rerunSnippet(keys.get(index));
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3300
        } else {
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  3301
            errormsg("jshell.err.out.of.range");
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3302
            return false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3303
        }
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3304
        return true;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3305
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3306
38539
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3307
    boolean checkOptionsAndRemainingInput(ArgTokenizer at) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3308
        String junk = at.remainder();
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3309
        if (!junk.isEmpty()) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3310
            errormsg("jshell.err.unexpected.at.end", junk, at.whole());
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3311
            return false;
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3312
        } else {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3313
            String bad = at.badOptions();
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3314
            if (!bad.isEmpty()) {
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3315
                errormsg("jshell.err.unknown.option", bad, at.whole());
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3316
                return false;
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3317
            }
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3318
        }
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3319
        return true;
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3320
    }
71874886920f 8157517: jshell tool: allow undoing operations
rfield
parents: 38535
diff changeset
  3321
45215
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3322
    /**
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3323
     * Handle snippet reevaluation commands: {@code /<id>}. These commands are a
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3324
     * sequence of ids and id ranges (names are permitted, though not in the
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3325
     * first position. Support for names is purposely not documented).
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3326
     *
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3327
     * @param rawargs the whole command including arguments
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3328
     */
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3329
    private void rerunHistoryEntriesById(String rawargs) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3330
        ArgTokenizer at = new ArgTokenizer("/<id>", rawargs.trim().substring(1));
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3331
        at.allowedOptions();
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3332
        Stream<Snippet> stream = argsOptionsToSnippets(state::snippets, sn -> true, at);
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3333
        if (stream != null) {
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3334
            // successfully parsed, rerun snippets
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3335
            stream.forEach(sn -> rerunSnippet(sn));
c9477e22877f 8167554: jshell tool: re-execute a range and/or sequence of snippets
rfield
parents: 44683
diff changeset
  3336
        }
34477
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  3337
    }
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  3338
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  3339
    private void rerunSnippet(Snippet snippet) {
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  3340
        String source = snippet.source();
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  3341
        cmdout.printf("%s\n", source);
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  3342
        input.replaceLastHistoryEntry(source);
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  3343
        processSourceCatchingReset(source);
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  3344
    }
64001b0533a2 8142447: JShell tool: Command change: re-run n-th command should be re-run by id
rfield
parents: 34475
diff changeset
  3345
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3346
    /**
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3347
     * Filter diagnostics for only errors (no warnings, ...)
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3348
     * @param diagnostics input list
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3349
     * @return filtered list
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3350
     */
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3351
    List<Diag> errorsOnly(List<Diag> diagnostics) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3352
        return diagnostics.stream()
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42415
diff changeset
  3353
                .filter(Diag::isError)
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3354
                .collect(toList());
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3355
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3356
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3357
    /**
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3358
     * Print out a snippet exception.
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3359
     *
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3360
     * @param exception the exception to print
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3361
     * @return true on fatal exception
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3362
     */
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3363
    private boolean displayException(Exception exception) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3364
        if (exception instanceof EvalException) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3365
            printEvalException((EvalException) exception);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3366
            return true;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3367
        } else if (exception instanceof UnresolvedReferenceException) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3368
            printUnresolvedException((UnresolvedReferenceException) exception);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3369
            return false;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3370
        } else {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3371
            error("Unexpected execution exception: %s", exception);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3372
            return true;
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3373
        }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3374
    }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3375
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3376
    /**
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3377
     * Display a list of diagnostics.
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3378
     *
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3379
     * @param source the source line with the error/warning
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3380
     * @param diagnostics the diagnostics to display
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3381
     */
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3382
    private void displayDiagnostics(String source, List<Diag> diagnostics) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3383
        for (Diag d : diagnostics) {
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3384
            errormsg(d.isError() ? "jshell.msg.error" : "jshell.msg.warning");
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3385
            List<String> disp = new ArrayList<>();
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3386
            displayableDiagnostic(source, d, disp);
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3387
            disp.stream()
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3388
                    .forEach(l -> error("%s", l));
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3389
        }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3390
    }
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3391
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3392
    /**
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3393
     * Convert a diagnostic into a list of pretty displayable strings with
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3394
     * source context.
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3395
     *
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3396
     * @param source the source line for the error/warning
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3397
     * @param diag the diagnostic to convert
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3398
     * @param toDisplay a list that the displayable strings are added to
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3399
     */
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3400
    private void displayableDiagnostic(String source, Diag diag, List<String> toDisplay) {
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3401
        for (String line : diag.getMessage(null).split("\\r?\\n")) { // TODO: Internationalize
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3402
            if (!line.trim().startsWith("location:")) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3403
                toDisplay.add(line);
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3404
            }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3405
        }
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3406
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3407
        int pstart = (int) diag.getStartPosition();
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3408
        int pend = (int) diag.getEndPosition();
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3409
        Matcher m = LINEBREAK.matcher(source);
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3410
        int pstartl = 0;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3411
        int pendl = -2;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3412
        while (m.find(pstartl)) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3413
            pendl = m.start();
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3414
            if (pendl >= pstart) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3415
                break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3416
            } else {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3417
                pstartl = m.end();
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3418
            }
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3419
        }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3420
        if (pendl < pstart) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3421
            pendl = source.length();
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3422
        }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3423
        toDisplay.add(source.substring(pstartl, pendl));
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3424
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3425
        StringBuilder sb = new StringBuilder();
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3426
        int start = pstart - pstartl;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3427
        for (int i = 0; i < start; ++i) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3428
            sb.append(' ');
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3429
        }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3430
        sb.append('^');
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3431
        boolean multiline = pend > pendl;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3432
        int end = (multiline ? pendl : pend) - pstartl - 1;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3433
        if (end > start) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3434
            for (int i = start + 1; i < end; ++i) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3435
                sb.append('-');
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3436
            }
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3437
            if (multiline) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3438
                sb.append("-...");
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3439
            } else {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3440
                sb.append('^');
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3441
            }
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3442
        }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3443
        toDisplay.add(sb.toString());
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3444
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3445
        debug("printDiagnostics start-pos = %d ==> %d -- wrap = %s", diag.getStartPosition(), start, this);
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3446
        debug("Code: %s", diag.getCode());
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3447
        debug("Pos: %d (%d - %d)", diag.getPosition(),
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3448
                diag.getStartPosition(), diag.getEndPosition());
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3449
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3450
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3451
    /**
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3452
     * Process a source snippet.
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3453
     *
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3454
     * @param source the input source
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3455
     * @return true if the snippet succeeded
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3456
     */
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3457
    boolean processSource(String source) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3458
        debug("Compiling: %s", source);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3459
        boolean failed = false;
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3460
        boolean isActive = false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3461
        List<SnippetEvent> events = state.eval(source);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3462
        for (SnippetEvent e : events) {
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3463
            // Report the event, recording failure
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3464
            failed |= handleEvent(e);
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3465
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3466
            // If any main snippet is active, this should be replayable
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3467
            // also ignore var value queries
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3468
            isActive |= e.causeSnippet() == null &&
38908
f0c186d76c8a 8139829: JShell API: No use of fields to return information from public types
rfield
parents: 38613
diff changeset
  3469
                    e.status().isActive() &&
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3470
                    e.snippet().subKind() != VAR_VALUE_SUBKIND;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3471
        }
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3472
        // If this is an active snippet and it didn't cause the backend to die,
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3473
        // add it to the replayable history
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3474
        if (isActive && live) {
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3475
            addToReplayHistory(source);
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3476
        }
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3477
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3478
        return !failed;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3479
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3480
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3481
    // Handle incoming snippet events -- return true on failure
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3482
    private boolean handleEvent(SnippetEvent ste) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3483
        Snippet sn = ste.snippet();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3484
        if (sn == null) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3485
            debug("Event with null key: %s", ste);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3486
            return false;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3487
        }
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  3488
        List<Diag> diagnostics = state.diagnostics(sn).collect(toList());
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3489
        String source = sn.source();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3490
        if (ste.causeSnippet() == null) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3491
            // main event
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3492
            displayDiagnostics(source, diagnostics);
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3493
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3494
            if (ste.status() != Status.REJECTED) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3495
                if (ste.exception() != null) {
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3496
                    if (displayException(ste.exception())) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3497
                        return true;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3498
                    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3499
                } else {
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3500
                    new DisplayEvent(ste, FormatWhen.PRIMARY, ste.value(), diagnostics)
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3501
                            .displayDeclarationAndValue();
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3502
                }
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3503
            } else {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3504
                if (diagnostics.isEmpty()) {
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  3505
                    errormsg("jshell.err.failed");
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3506
                }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3507
                return true;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3508
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3509
        } else {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3510
            // Update
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  3511
            if (sn instanceof DeclarationSnippet) {
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3512
                List<Diag> other = errorsOnly(diagnostics);
36494
4175f47b2a50 8148316: jshell tool: Configurable output format
rfield
parents: 36160
diff changeset
  3513
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3514
                // display update information
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3515
                new DisplayEvent(ste, FormatWhen.UPDATE, ste.value(), other)
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3516
                        .displayDeclarationAndValue();
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3517
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3518
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3519
        return false;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3520
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3521
    //where
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3522
    void printStackTrace(StackTraceElement[] stes) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3523
        for (StackTraceElement ste : stes) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3524
            StringBuilder sb = new StringBuilder();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3525
            String cn = ste.getClassName();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3526
            if (!cn.isEmpty()) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3527
                int dot = cn.lastIndexOf('.');
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3528
                if (dot > 0) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3529
                    sb.append(cn.substring(dot + 1));
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3530
                } else {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3531
                    sb.append(cn);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3532
                }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3533
                sb.append(".");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3534
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3535
            if (!ste.getMethodName().isEmpty()) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3536
                sb.append(ste.getMethodName());
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3537
                sb.append(" ");
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3538
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3539
            String fileName = ste.getFileName();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3540
            int lineNumber = ste.getLineNumber();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3541
            String loc = ste.isNativeMethod()
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  3542
                    ? getResourceString("jshell.msg.native.method")
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3543
                    : fileName == null
36990
ec0b843a7af5 8147515: JShell: Internationalize
rfield
parents: 36718
diff changeset
  3544
                            ? getResourceString("jshell.msg.unknown.source")
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3545
                            : lineNumber >= 0
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3546
                                    ? fileName + ":" + lineNumber
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3547
                                    : fileName;
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  3548
            error("      at %s(%s)", sb, loc);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3549
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3550
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3551
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3552
    //where
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3553
    void printUnresolvedException(UnresolvedReferenceException ex) {
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3554
        printSnippetStatus(ex.getSnippet(), false);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3555
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3556
    //where
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3557
    void printEvalException(EvalException ex) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3558
        if (ex.getMessage() == null) {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  3559
            error("%s thrown", ex.getExceptionClassName());
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3560
        } else {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  3561
            error("%s thrown: %s", ex.getExceptionClassName(), ex.getMessage());
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3562
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3563
        printStackTrace(ex.getStackTrace());
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3564
    }
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3565
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3566
    private FormatAction toAction(Status status, Status previousStatus, boolean isSignatureChange) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3567
        FormatAction act;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3568
        switch (status) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3569
            case VALID:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3570
            case RECOVERABLE_DEFINED:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3571
            case RECOVERABLE_NOT_DEFINED:
38908
f0c186d76c8a 8139829: JShell API: No use of fields to return information from public types
rfield
parents: 38613
diff changeset
  3572
                if (previousStatus.isActive()) {
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3573
                    act = isSignatureChange
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3574
                            ? FormatAction.REPLACED
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3575
                            : FormatAction.MODIFIED;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3576
                } else {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3577
                    act = FormatAction.ADDED;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3578
                }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3579
                break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3580
            case OVERWRITTEN:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3581
                act = FormatAction.OVERWROTE;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3582
                break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3583
            case DROPPED:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3584
                act = FormatAction.DROPPED;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3585
                break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3586
            case REJECTED:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3587
            case NONEXISTENT:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3588
            default:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3589
                // Should not occur
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3590
                error("Unexpected status: " + previousStatus.toString() + "=>" + status.toString());
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3591
                act = FormatAction.DROPPED;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3592
        }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3593
        return act;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3594
    }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3595
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3596
    void printSnippetStatus(DeclarationSnippet sn, boolean resolve) {
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3597
        List<Diag> otherErrors = errorsOnly(state.diagnostics(sn).collect(toList()));
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3598
        new DisplayEvent(sn, state.status(sn), resolve, otherErrors)
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3599
                .displayDeclarationAndValue();
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3600
    }
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3601
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3602
    class DisplayEvent {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3603
        private final Snippet sn;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3604
        private final FormatAction action;
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3605
        private final FormatWhen update;
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3606
        private final String value;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3607
        private final List<String> errorLines;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3608
        private final FormatResolve resolution;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3609
        private final String unresolved;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3610
        private final FormatUnresolved unrcnt;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3611
        private final FormatErrors errcnt;
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3612
        private final boolean resolve;
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3613
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3614
        DisplayEvent(SnippetEvent ste, FormatWhen update, String value, List<Diag> errors) {
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3615
            this(ste.snippet(), ste.status(), false,
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3616
                    toAction(ste.status(), ste.previousStatus(), ste.isSignatureChange()),
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3617
                    update, value, errors);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3618
        }
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3619
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3620
        DisplayEvent(Snippet sn, Status status, boolean resolve, List<Diag> errors) {
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3621
            this(sn, status, resolve, FormatAction.USED, FormatWhen.UPDATE, null, errors);
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3622
        }
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3623
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3624
        private DisplayEvent(Snippet sn, Status status, boolean resolve,
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3625
                FormatAction action, FormatWhen update, String value, List<Diag> errors) {
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3626
            this.sn = sn;
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3627
            this.resolve =resolve;
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3628
            this.action = action;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3629
            this.update = update;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3630
            this.value = value;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3631
            this.errorLines = new ArrayList<>();
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3632
            for (Diag d : errors) {
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3633
                displayableDiagnostic(sn.source(), d, errorLines);
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3634
            }
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3635
            if (resolve) {
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3636
                // resolve needs error lines indented
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3637
                for (int i = 0; i < errorLines.size(); ++i) {
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3638
                    errorLines.set(i, "    " + errorLines.get(i));
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3639
                }
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3640
            }
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  3641
            long unresolvedCount;
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3642
            if (sn instanceof DeclarationSnippet && (status == Status.RECOVERABLE_DEFINED || status == Status.RECOVERABLE_NOT_DEFINED)) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3643
                resolution = (status == Status.RECOVERABLE_NOT_DEFINED)
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3644
                        ? FormatResolve.NOTDEFINED
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3645
                        : FormatResolve.DEFINED;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3646
                unresolved = unresolved((DeclarationSnippet) sn);
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  3647
                unresolvedCount = state.unresolvedDependencies((DeclarationSnippet) sn).count();
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3648
            } else {
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3649
                resolution = FormatResolve.OK;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3650
                unresolved = "";
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3651
                unresolvedCount = 0;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3652
            }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3653
            unrcnt = unresolvedCount == 0
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3654
                    ? FormatUnresolved.UNRESOLVED0
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3655
                    : unresolvedCount == 1
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3656
                        ? FormatUnresolved.UNRESOLVED1
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3657
                        : FormatUnresolved.UNRESOLVED2;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3658
            errcnt = errors.isEmpty()
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3659
                    ? FormatErrors.ERROR0
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3660
                    : errors.size() == 1
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3661
                        ? FormatErrors.ERROR1
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3662
                        : FormatErrors.ERROR2;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3663
        }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3664
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3665
        private String unresolved(DeclarationSnippet key) {
40304
0318f4e75c6d 8143964: JShell API: convert query responses to Stream instead of List
rfield
parents: 38912
diff changeset
  3666
            List<String> unr = state.unresolvedDependencies(key).collect(toList());
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3667
            StringBuilder sb = new StringBuilder();
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3668
            int fromLast = unr.size();
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3669
            if (fromLast > 0) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3670
                sb.append(" ");
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3671
            }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3672
            for (String u : unr) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3673
                --fromLast;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3674
                sb.append(u);
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3675
                switch (fromLast) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3676
                    // No suffix
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3677
                    case 0:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3678
                        break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3679
                    case 1:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3680
                        sb.append(", and ");
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3681
                        break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3682
                    default:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3683
                        sb.append(", ");
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3684
                        break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3685
                }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3686
            }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3687
            return sb.toString();
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3688
        }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3689
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3690
        private void custom(FormatCase fcase, String name) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3691
            custom(fcase, name, null);
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3692
        }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3693
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3694
        private void custom(FormatCase fcase, String name, String type) {
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3695
            if (resolve) {
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3696
                String resolutionErrors = feedback.format("resolve", fcase, action, update,
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3697
                        resolution, unrcnt, errcnt,
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3698
                        name, type, value, unresolved, errorLines);
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3699
                if (!resolutionErrors.trim().isEmpty()) {
47504
58ce36f43f1a 8179856: jshell tool: not suitable for pipeline use
rfield
parents: 47216
diff changeset
  3700
                    error("    %s", resolutionErrors);
43759
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3701
                }
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3702
            } else if (interactive()) {
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3703
                String display = feedback.format(fcase, action, update,
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3704
                        resolution, unrcnt, errcnt,
61535ac55add 8173916: jshell tool: /methods signature confusing/non-standard format
rfield
parents: 43757
diff changeset
  3705
                        name, type, value, unresolved, errorLines);
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3706
                cmdout.print(display);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3707
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3708
        }
36718
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3709
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3710
        @SuppressWarnings("fallthrough")
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3711
        private void displayDeclarationAndValue() {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3712
            switch (sn.subKind()) {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3713
                case CLASS_SUBKIND:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3714
                    custom(FormatCase.CLASS, ((TypeDeclSnippet) sn).name());
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3715
                    break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3716
                case INTERFACE_SUBKIND:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3717
                    custom(FormatCase.INTERFACE, ((TypeDeclSnippet) sn).name());
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3718
                    break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3719
                case ENUM_SUBKIND:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3720
                    custom(FormatCase.ENUM, ((TypeDeclSnippet) sn).name());
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3721
                    break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3722
                case ANNOTATION_TYPE_SUBKIND:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3723
                    custom(FormatCase.ANNOTATION, ((TypeDeclSnippet) sn).name());
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3724
                    break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3725
                case METHOD_SUBKIND:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3726
                    custom(FormatCase.METHOD, ((MethodSnippet) sn).name(), ((MethodSnippet) sn).parameterTypes());
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3727
                    break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3728
                case VAR_DECLARATION_SUBKIND: {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3729
                    VarSnippet vk = (VarSnippet) sn;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3730
                    custom(FormatCase.VARDECL, vk.name(), vk.typeName());
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3731
                    break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3732
                }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3733
                case VAR_DECLARATION_WITH_INITIALIZER_SUBKIND: {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3734
                    VarSnippet vk = (VarSnippet) sn;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3735
                    custom(FormatCase.VARINIT, vk.name(), vk.typeName());
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3736
                    break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3737
                }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3738
                case TEMP_VAR_EXPRESSION_SUBKIND: {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3739
                    VarSnippet vk = (VarSnippet) sn;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3740
                    custom(FormatCase.EXPRESSION, vk.name(), vk.typeName());
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3741
                    break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3742
                }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3743
                case OTHER_EXPRESSION_SUBKIND:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3744
                    error("Unexpected expression form -- value is: %s", (value));
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3745
                    break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3746
                case VAR_VALUE_SUBKIND: {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3747
                    ExpressionSnippet ek = (ExpressionSnippet) sn;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3748
                    custom(FormatCase.VARVALUE, ek.name(), ek.typeName());
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3749
                    break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3750
                }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3751
                case ASSIGNMENT_SUBKIND: {
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3752
                    ExpressionSnippet ek = (ExpressionSnippet) sn;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3753
                    custom(FormatCase.ASSIGNMENT, ek.name(), ek.typeName());
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3754
                    break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3755
                }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3756
                case SINGLE_TYPE_IMPORT_SUBKIND:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3757
                case TYPE_IMPORT_ON_DEMAND_SUBKIND:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3758
                case SINGLE_STATIC_IMPORT_SUBKIND:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3759
                case STATIC_IMPORT_ON_DEMAND_SUBKIND:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3760
                    custom(FormatCase.IMPORT, ((ImportSnippet) sn).name());
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3761
                    break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3762
                case STATEMENT_SUBKIND:
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3763
                    custom(FormatCase.STATEMENT, null);
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3764
                    break;
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3765
            }
bf40906bf49d 8151755: jshell tool: properly cover resolution issues in output configuration
rfield
parents: 36715
diff changeset
  3766
        }
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3767
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3768
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3769
    /** The current version number as a string.
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3770
     */
36992
ddebebe611a1 8153417: jshell tool: use test passed locale to retrieve ResourceBundle
rfield
parents: 36990
diff changeset
  3771
    String version() {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3772
        return version("release");  // mm.nn.oo[-milestone]
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3773
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3774
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3775
    /** The current full version number as a string.
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3776
     */
36992
ddebebe611a1 8153417: jshell tool: use test passed locale to retrieve ResourceBundle
rfield
parents: 36990
diff changeset
  3777
    String fullVersion() {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3778
        return version("full"); // mm.mm.oo[-milestone]-build
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3779
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3780
36992
ddebebe611a1 8153417: jshell tool: use test passed locale to retrieve ResourceBundle
rfield
parents: 36990
diff changeset
  3781
    private String version(String key) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3782
        if (versionRB == null) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3783
            try {
36992
ddebebe611a1 8153417: jshell tool: use test passed locale to retrieve ResourceBundle
rfield
parents: 36990
diff changeset
  3784
                versionRB = ResourceBundle.getBundle(VERSION_RB_NAME, locale);
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3785
            } catch (MissingResourceException e) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3786
                return "(version info not available)";
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3787
            }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3788
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3789
        try {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3790
            return versionRB.getString(key);
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3791
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3792
        catch (MissingResourceException e) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3793
            return "(version info not available)";
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3794
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3795
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3796
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3797
    class NameSpace {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3798
        final String spaceName;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3799
        final String prefix;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3800
        private int nextNum;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3801
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3802
        NameSpace(String spaceName, String prefix) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3803
            this.spaceName = spaceName;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3804
            this.prefix = prefix;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3805
            this.nextNum = 1;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3806
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3807
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3808
        String tid(Snippet sn) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3809
            String tid = prefix + nextNum++;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3810
            mapSnippet.put(sn, new SnippetInfo(sn, this, tid));
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3811
            return tid;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3812
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3813
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3814
        String tidNext() {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3815
            return prefix + nextNum;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3816
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3817
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3818
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3819
    static class SnippetInfo {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3820
        final Snippet snippet;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3821
        final NameSpace space;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3822
        final String tid;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3823
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3824
        SnippetInfo(Snippet snippet, NameSpace space, String tid) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3825
            this.snippet = snippet;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3826
            this.space = space;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3827
            this.tid = tid;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3828
        }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3829
    }
40498
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3830
40765
6f9556cf4404 8164825: jshell tool: Completion for subcommand
shinyafox
parents: 40598
diff changeset
  3831
    static class ArgSuggestion implements Suggestion {
40498
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3832
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3833
        private final String continuation;
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3834
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3835
        /**
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3836
         * Create a {@code Suggestion} instance.
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3837
         *
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3838
         * @param continuation a candidate continuation of the user's input
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3839
         */
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3840
        public ArgSuggestion(String continuation) {
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3841
            this.continuation = continuation;
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3842
        }
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3843
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3844
        /**
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3845
         * The candidate continuation of the given user's input.
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3846
         *
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3847
         * @return the continuation string
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3848
         */
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3849
        @Override
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3850
        public String continuation() {
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3851
            return continuation;
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3852
        }
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3853
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3854
        /**
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3855
         * Indicates whether input continuation matches the target type and is thus
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3856
         * more likely to be the desired continuation. A matching continuation is
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3857
         * preferred.
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3858
         *
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3859
         * @return {@code false}, non-types analysis
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3860
         */
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3861
        @Override
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3862
        public boolean matchesType() {
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3863
            return false;
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3864
        }
f54048be4a57 8159027: JShell API: SourceCodeAnalysis.Suggestion has constructor, ...
rfield
parents: 40304
diff changeset
  3865
    }
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3866
}
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3867
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3868
abstract class NonInteractiveIOContext extends IOContext {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3869
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3870
    @Override
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3871
    public boolean interactiveOutput() {
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3872
        return false;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3873
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3874
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3875
    @Override
48939
ba545e52b932 8166232: jshell tool: cannot access previous history
rfield
parents: 48543
diff changeset
  3876
    public Iterable<String> history(boolean currentSession) {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3877
        return Collections.emptyList();
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3878
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3879
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3880
    @Override
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3881
    public boolean terminalEditorRunning() {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3882
        return false;
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3883
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3884
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3885
    @Override
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3886
    public void suspend() {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3887
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3888
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3889
    @Override
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3890
    public void resume() {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3891
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3892
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3893
    @Override
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3894
    public void beforeUserCode() {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3895
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3896
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3897
    @Override
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3898
    public void afterUserCode() {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3899
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3900
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3901
    @Override
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3902
    public void replaceLastHistoryEntry(String source) {
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3903
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3904
}
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3905
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3906
class ScannerIOContext extends NonInteractiveIOContext {
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3907
    private final Scanner scannerIn;
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3908
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3909
    ScannerIOContext(Scanner scannerIn) {
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3910
        this.scannerIn = scannerIn;
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3911
    }
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3912
42972
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3913
    ScannerIOContext(Reader rdr) throws FileNotFoundException {
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3914
        this(new Scanner(rdr));
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3915
    }
47ca49eee534 8172102: jshell tool: remove print method forwarding to System.out from default startup
rfield
parents: 42969
diff changeset
  3916
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3917
    @Override
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3918
    public String readLine(String prompt, String prefix) {
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3919
        if (scannerIn.hasNextLine()) {
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3920
            return scannerIn.nextLine();
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3921
        } else {
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3922
            return null;
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3923
        }
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3924
    }
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3925
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3926
    @Override
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3927
    public void close() {
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3928
        scannerIn.close();
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3929
    }
40767
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
  3930
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3931
    @Override
40767
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
  3932
    public int readUserInput() {
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
  3933
        return -1;
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
  3934
    }
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3935
}
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3936
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3937
class ReloadIOContext extends NonInteractiveIOContext {
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3938
    private final Iterator<String> it;
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3939
    private final PrintStream echoStream;
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3940
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3941
    ReloadIOContext(Iterable<String> history, PrintStream echoStream) {
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3942
        this.it = history.iterator();
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3943
        this.echoStream = echoStream;
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3944
    }
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3945
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3946
    @Override
34999
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3947
    public String readLine(String prompt, String prefix) {
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3948
        String s = it.hasNext()
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3949
                ? it.next()
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3950
                : null;
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3951
        if (echoStream != null && s != null) {
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3952
            String p = "-: ";
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3953
            String p2 = "\n   ";
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3954
            echoStream.printf("%s%s\n", p, s.replace("\n", p2));
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3955
        }
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3956
        return s;
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3957
    }
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3958
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3959
    @Override
aacf94dab449 8081845: JShell: Need way to refresh relative to external state
rfield
parents: 34570
diff changeset
  3960
    public void close() {
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3961
    }
40767
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
  3962
47840
e0f08a49f3e3 8177076: jshell tool: allow non-zero /exit
rfield
parents: 47837
diff changeset
  3963
    @Override
40767
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
  3964
    public int readUserInput() {
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
  3965
        return -1;
c7908e8c786b 8131023: JShell: System.in does not work
jlahoda
parents: 40765
diff changeset
  3966
    }
33362
65ec6de1d6b4 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents:
diff changeset
  3967
}