author | jlahoda |
Mon, 13 Feb 2017 11:57:56 +0100 | |
changeset 43773 | 8d8593871575 |
parent 43583 | d16e490ec827 |
child 44188 | 3f2047e62102 |
permissions | -rw-r--r-- |
33362 | 1 |
/* |
38521 | 2 |
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. |
33362 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. Oracle designates this |
|
8 |
* particular file as subject to the "Classpath" exception as provided |
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
|
10 |
* |
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
24 |
*/ |
|
25 |
||
26 |
package jdk.internal.jshell.tool; |
|
27 |
||
41865 | 28 |
import jdk.jshell.SourceCodeAnalysis.Documentation; |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
29 |
import jdk.jshell.SourceCodeAnalysis.QualifiedNames; |
33362 | 30 |
import jdk.jshell.SourceCodeAnalysis.Suggestion; |
31 |
||
32 |
import java.io.IOException; |
|
33 |
import java.io.InputStream; |
|
41628 | 34 |
import java.io.InterruptedIOException; |
33362 | 35 |
import java.io.PrintStream; |
36 |
import java.io.UncheckedIOException; |
|
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
37 |
import java.util.ArrayList; |
41865 | 38 |
import java.util.Arrays; |
38521 | 39 |
import java.util.Collection; |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
40 |
import java.util.Collections; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
41 |
import java.util.HashMap; |
41865 | 42 |
import java.util.Iterator; |
33362 | 43 |
import java.util.List; |
44 |
import java.util.Locale; |
|
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
45 |
import java.util.Map; |
33362 | 46 |
import java.util.Objects; |
47 |
import java.util.Optional; |
|
43363
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
48 |
import java.util.concurrent.atomic.AtomicBoolean; |
41865 | 49 |
import java.util.function.Function; |
38521 | 50 |
import java.util.stream.Collectors; |
51 |
import java.util.stream.Stream; |
|
33362 | 52 |
|
41865 | 53 |
import jdk.internal.shellsupport.doc.JavadocFormatter; |
33362 | 54 |
import jdk.internal.jline.NoInterruptUnixTerminal; |
55 |
import jdk.internal.jline.Terminal; |
|
56 |
import jdk.internal.jline.TerminalFactory; |
|
36715
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
57 |
import jdk.internal.jline.TerminalSupport; |
33362 | 58 |
import jdk.internal.jline.WindowsTerminal; |
59 |
import jdk.internal.jline.console.ConsoleReader; |
|
60 |
import jdk.internal.jline.console.KeyMap; |
|
43363
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
61 |
import jdk.internal.jline.console.Operation; |
33362 | 62 |
import jdk.internal.jline.console.UserInterruptException; |
63 |
import jdk.internal.jline.console.completer.Completer; |
|
40767 | 64 |
import jdk.internal.jline.console.history.History; |
65 |
import jdk.internal.jline.console.history.MemoryHistory; |
|
38521 | 66 |
import jdk.internal.jline.extra.EditingHistory; |
33362 | 67 |
import jdk.internal.jshell.tool.StopDetectingInputStream.State; |
41631
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
68 |
import jdk.internal.misc.Signal; |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
69 |
import jdk.internal.misc.Signal.Handler; |
33362 | 70 |
|
71 |
class ConsoleIOContext extends IOContext { |
|
72 |
||
38521 | 73 |
private static final String HISTORY_LINE_PREFIX = "HISTORY_LINE_"; |
74 |
||
33362 | 75 |
final JShellTool repl; |
76 |
final StopDetectingInputStream input; |
|
77 |
final ConsoleReader in; |
|
78 |
final EditingHistory history; |
|
40767 | 79 |
final MemoryHistory userInputHistory = new MemoryHistory(); |
33362 | 80 |
|
81 |
String prefix = ""; |
|
82 |
||
83 |
ConsoleIOContext(JShellTool repl, InputStream cmdin, PrintStream cmdout) throws Exception { |
|
84 |
this.repl = repl; |
|
85 |
this.input = new StopDetectingInputStream(() -> repl.state.stop(), ex -> repl.hard("Error on input: %s", ex)); |
|
86 |
Terminal term; |
|
36501 | 87 |
if (System.getProperty("test.jdk") != null) { |
36715
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
88 |
term = new TestTerminal(input); |
36501 | 89 |
} else if (System.getProperty("os.name").toLowerCase(Locale.US).contains(TerminalFactory.WINDOWS)) { |
33362 | 90 |
term = new JShellWindowsTerminal(input); |
91 |
} else { |
|
92 |
term = new JShellUnixTerminal(input); |
|
93 |
} |
|
94 |
term.init(); |
|
43363
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
95 |
AtomicBoolean allowSmart = new AtomicBoolean(); |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
96 |
in = new ConsoleReader(cmdin, cmdout, term) { |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
97 |
@Override public KeyMap getKeys() { |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
98 |
return new CheckCompletionKeyMap(super.getKeys(), allowSmart); |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
99 |
} |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
100 |
}; |
33362 | 101 |
in.setExpandEvents(false); |
102 |
in.setHandleUserInterrupt(true); |
|
38521 | 103 |
List<String> persistenHistory = Stream.of(repl.prefs.keys()) |
104 |
.filter(key -> key.startsWith(HISTORY_LINE_PREFIX)) |
|
105 |
.sorted() |
|
42843
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
106 |
.map(key -> repl.prefs.get(key)) |
38521 | 107 |
.collect(Collectors.toList()); |
108 |
in.setHistory(history = new EditingHistory(in, persistenHistory) { |
|
109 |
@Override protected boolean isComplete(CharSequence input) { |
|
38908
f0c186d76c8a
8139829: JShell API: No use of fields to return information from public types
rfield
parents:
38541
diff
changeset
|
110 |
return repl.analysis.analyzeCompletion(input.toString()).completeness().isComplete(); |
33362 | 111 |
} |
112 |
}); |
|
113 |
in.setBellEnabled(true); |
|
38541
44e95493fd13
8131017: jshell tool: pasting code with tabs invokes tab completion
jlahoda
parents:
38521
diff
changeset
|
114 |
in.setCopyPasteDetection(true); |
33362 | 115 |
in.addCompleter(new Completer() { |
116 |
@Override public int complete(String test, int cursor, List<CharSequence> result) { |
|
117 |
int[] anchor = new int[] {-1}; |
|
118 |
List<Suggestion> suggestions; |
|
119 |
if (prefix.isEmpty() && test.trim().startsWith("/")) { |
|
120 |
suggestions = repl.commandCompletionSuggestions(test, cursor, anchor); |
|
121 |
} else { |
|
122 |
int prefixLength = prefix.length(); |
|
123 |
suggestions = repl.analysis.completionSuggestions(prefix + test, cursor + prefixLength, anchor); |
|
124 |
anchor[0] -= prefixLength; |
|
125 |
} |
|
43363
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
126 |
boolean smart = allowSmart.get() && |
33362 | 127 |
suggestions.stream() |
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42258
diff
changeset
|
128 |
.anyMatch(Suggestion::matchesType); |
33362 | 129 |
|
43363
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
130 |
allowSmart.set(!allowSmart.get()); |
33362 | 131 |
|
132 |
suggestions.stream() |
|
38908
f0c186d76c8a
8139829: JShell API: No use of fields to return information from public types
rfield
parents:
38541
diff
changeset
|
133 |
.filter(s -> !smart || s.matchesType()) |
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42258
diff
changeset
|
134 |
.map(Suggestion::continuation) |
33362 | 135 |
.forEach(result::add); |
136 |
||
137 |
boolean onlySmart = suggestions.stream() |
|
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42258
diff
changeset
|
138 |
.allMatch(Suggestion::matchesType); |
33362 | 139 |
|
140 |
if (smart && !onlySmart) { |
|
141 |
Optional<String> prefix = |
|
142 |
suggestions.stream() |
|
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42258
diff
changeset
|
143 |
.map(Suggestion::continuation) |
33362 | 144 |
.reduce(ConsoleIOContext::commonPrefix); |
145 |
||
146 |
String prefixStr = prefix.orElse("").substring(cursor - anchor[0]); |
|
147 |
try { |
|
148 |
in.putString(prefixStr); |
|
149 |
cursor += prefixStr.length(); |
|
150 |
} catch (IOException ex) { |
|
151 |
throw new IllegalStateException(ex); |
|
152 |
} |
|
36990 | 153 |
result.add(repl.messageFormat("jshell.console.see.more")); |
33362 | 154 |
return cursor; //anchor should not be used. |
155 |
} |
|
156 |
||
157 |
if (result.isEmpty()) { |
|
158 |
try { |
|
159 |
//provide "empty completion" feedback |
|
160 |
//XXX: this only works correctly when there is only one Completer: |
|
161 |
in.beep(); |
|
162 |
} catch (IOException ex) { |
|
163 |
throw new UncheckedIOException(ex); |
|
164 |
} |
|
165 |
} |
|
166 |
||
167 |
return anchor[0]; |
|
168 |
} |
|
169 |
}); |
|
41934
a4da50688dc7
8167636: jshell tool: Edit Pad should be in its own module
rfield
parents:
41865
diff
changeset
|
170 |
bind(DOCUMENTATION_SHORTCUT, (Runnable) () -> documentation(repl)); |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
171 |
for (FixComputer computer : FIX_COMPUTERS) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
172 |
for (String shortcuts : SHORTCUT_FIXES) { |
41934
a4da50688dc7
8167636: jshell tool: Edit Pad should be in its own module
rfield
parents:
41865
diff
changeset
|
173 |
bind(shortcuts + computer.shortcut, (Runnable) () -> fixes(computer)); |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
174 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
175 |
} |
41631
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
176 |
try { |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
177 |
Signal.handle(new Signal("CONT"), new Handler() { |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
178 |
@Override public void handle(Signal sig) { |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
179 |
try { |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
180 |
in.getTerminal().reset(); |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
181 |
in.redrawLine(); |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
182 |
in.flush(); |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
183 |
} catch (Exception ex) { |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
184 |
ex.printStackTrace(); |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
185 |
} |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
186 |
} |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
187 |
}); |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
188 |
} catch (IllegalArgumentException ignored) { |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
189 |
//the CONT signal does not exist on this platform |
a348d1cc8d9d
8166183: jshell tool: on return from Ctrl-Z, garbage on screen, dies with Ctrl-C
jlahoda
parents:
41628
diff
changeset
|
190 |
} |
33362 | 191 |
} |
192 |
||
193 |
@Override |
|
194 |
public String readLine(String prompt, String prefix) throws IOException, InputInterruptedException { |
|
195 |
this.prefix = prefix; |
|
196 |
try { |
|
197 |
return in.readLine(prompt); |
|
198 |
} catch (UserInterruptException ex) { |
|
199 |
throw (InputInterruptedException) new InputInterruptedException().initCause(ex); |
|
200 |
} |
|
201 |
} |
|
202 |
||
203 |
@Override |
|
204 |
public boolean interactiveOutput() { |
|
205 |
return true; |
|
206 |
} |
|
207 |
||
208 |
@Override |
|
209 |
public Iterable<String> currentSessionHistory() { |
|
210 |
return history.currentSessionEntries(); |
|
211 |
} |
|
212 |
||
213 |
@Override |
|
214 |
public void close() throws IOException { |
|
38521 | 215 |
//save history: |
42843
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
216 |
for (String key : repl.prefs.keys()) { |
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
217 |
if (key.startsWith(HISTORY_LINE_PREFIX)) { |
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
218 |
repl.prefs.remove(key); |
38521 | 219 |
} |
42843
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
220 |
} |
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
221 |
Collection<? extends String> savedHistory = history.save(); |
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
222 |
if (!savedHistory.isEmpty()) { |
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
223 |
int len = (int) Math.ceil(Math.log10(savedHistory.size()+1)); |
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
224 |
String format = HISTORY_LINE_PREFIX + "%0" + len + "d"; |
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
225 |
int index = 0; |
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
226 |
for (String historyLine : savedHistory) { |
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
227 |
repl.prefs.put(String.format(format, index++), historyLine); |
38521 | 228 |
} |
229 |
} |
|
42843
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
230 |
repl.prefs.flush(); |
33362 | 231 |
in.shutdown(); |
232 |
try { |
|
233 |
in.getTerminal().restore(); |
|
234 |
} catch (Exception ex) { |
|
235 |
throw new IOException(ex); |
|
236 |
} |
|
38909
80e42e2d475b
8158174: jshell tool: leaks threads waiting on StopDetectingInputStream
jlahoda
parents:
38908
diff
changeset
|
237 |
input.shutdown(); |
33362 | 238 |
} |
239 |
||
240 |
private void bind(String shortcut, Object action) { |
|
241 |
KeyMap km = in.getKeys(); |
|
242 |
for (int i = 0; i < shortcut.length(); i++) { |
|
243 |
Object value = km.getBound(Character.toString(shortcut.charAt(i))); |
|
244 |
if (value instanceof KeyMap) { |
|
245 |
km = (KeyMap) value; |
|
246 |
} else { |
|
247 |
km.bind(shortcut.substring(i), action); |
|
248 |
} |
|
249 |
} |
|
250 |
} |
|
251 |
||
252 |
private static final String DOCUMENTATION_SHORTCUT = "\033\133\132"; //Shift-TAB |
|
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
253 |
private static final String[] SHORTCUT_FIXES = { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
254 |
"\033\015", //Alt-Enter (Linux) |
39811
b8d3d2487379
8162255: 'Alt-Enter v'/'Alt-Enter i' not working on some terminals
jlahoda
parents:
38909
diff
changeset
|
255 |
"\033\012", //Alt-Enter (Linux) |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
256 |
"\033\133\061\067\176", //F6/Alt-F1 (Mac) |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
257 |
"\u001BO3P" //Alt-F1 (Linux) |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
258 |
}; |
33362 | 259 |
|
41865 | 260 |
private String lastDocumentationBuffer; |
261 |
private int lastDocumentationCursor = (-1); |
|
262 |
||
33362 | 263 |
private void documentation(JShellTool repl) { |
264 |
String buffer = in.getCursorBuffer().buffer.toString(); |
|
265 |
int cursor = in.getCursorBuffer().cursor; |
|
41865 | 266 |
boolean firstInvocation = !buffer.equals(lastDocumentationBuffer) || cursor != lastDocumentationCursor; |
267 |
lastDocumentationBuffer = buffer; |
|
268 |
lastDocumentationCursor = cursor; |
|
269 |
List<String> doc; |
|
270 |
String seeMore; |
|
271 |
Terminal term = in.getTerminal(); |
|
33362 | 272 |
if (prefix.isEmpty() && buffer.trim().startsWith("/")) { |
41865 | 273 |
doc = Arrays.asList(repl.commandDocumentation(buffer, cursor, firstInvocation)); |
274 |
seeMore = "jshell.console.see.help"; |
|
33362 | 275 |
} else { |
41865 | 276 |
JavadocFormatter formatter = new JavadocFormatter(term.getWidth(), |
277 |
term.isAnsiSupported()); |
|
278 |
Function<Documentation, String> convertor; |
|
279 |
if (firstInvocation) { |
|
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42258
diff
changeset
|
280 |
convertor = Documentation::signature; |
41865 | 281 |
} else { |
42258
a1aafd5ea6ec
8169561: jshell tool: double shift-tab on variable crashes tool
jlahoda
parents:
41996
diff
changeset
|
282 |
convertor = d -> formatter.formatJavadoc(d.signature(), d.javadoc()) + |
a1aafd5ea6ec
8169561: jshell tool: double shift-tab on variable crashes tool
jlahoda
parents:
41996
diff
changeset
|
283 |
(d.javadoc() == null ? repl.messageFormat("jshell.console.no.javadoc") |
a1aafd5ea6ec
8169561: jshell tool: double shift-tab on variable crashes tool
jlahoda
parents:
41996
diff
changeset
|
284 |
: ""); |
41865 | 285 |
} |
286 |
doc = repl.analysis.documentation(prefix + buffer, cursor + prefix.length(), !firstInvocation) |
|
287 |
.stream() |
|
288 |
.map(convertor) |
|
289 |
.collect(Collectors.toList()); |
|
290 |
seeMore = "jshell.console.see.javadoc"; |
|
33362 | 291 |
} |
292 |
||
293 |
try { |
|
41865 | 294 |
if (doc != null && !doc.isEmpty()) { |
295 |
if (firstInvocation) { |
|
296 |
in.println(); |
|
297 |
in.println(doc.stream().collect(Collectors.joining("\n"))); |
|
298 |
in.println(repl.messageFormat(seeMore)); |
|
299 |
in.redrawLine(); |
|
300 |
in.flush(); |
|
301 |
} else { |
|
302 |
in.println(); |
|
303 |
||
304 |
int height = term.getHeight(); |
|
305 |
String lastNote = ""; |
|
306 |
||
307 |
PRINT_DOC: for (Iterator<String> docIt = doc.iterator(); docIt.hasNext(); ) { |
|
308 |
String currentDoc = docIt.next(); |
|
309 |
String[] lines = currentDoc.split("\n"); |
|
310 |
int firstLine = 0; |
|
311 |
||
312 |
PRINT_PAGE: while (true) { |
|
43773 | 313 |
in.print(lastNote.replaceAll(".", " ") + ConsoleReader.RESET_LINE); |
314 |
||
41865 | 315 |
int toPrint = height - 1; |
316 |
||
317 |
while (toPrint > 0 && firstLine < lines.length) { |
|
318 |
in.println(lines[firstLine++]); |
|
319 |
toPrint--; |
|
320 |
} |
|
321 |
||
322 |
if (firstLine >= lines.length) { |
|
323 |
break; |
|
324 |
} |
|
325 |
||
326 |
lastNote = repl.getResourceString("jshell.console.see.next.page"); |
|
327 |
in.print(lastNote + ConsoleReader.RESET_LINE); |
|
328 |
in.flush(); |
|
329 |
||
330 |
while (true) { |
|
331 |
int r = in.readCharacter(); |
|
332 |
||
333 |
switch (r) { |
|
334 |
case ' ': continue PRINT_PAGE; |
|
335 |
case 'q': |
|
336 |
case 3: |
|
337 |
break PRINT_DOC; |
|
338 |
default: |
|
339 |
in.beep(); |
|
340 |
break; |
|
341 |
} |
|
342 |
} |
|
343 |
} |
|
344 |
||
345 |
if (docIt.hasNext()) { |
|
346 |
lastNote = repl.getResourceString("jshell.console.see.next.javadoc"); |
|
347 |
in.print(lastNote + ConsoleReader.RESET_LINE); |
|
348 |
in.flush(); |
|
349 |
||
350 |
while (true) { |
|
351 |
int r = in.readCharacter(); |
|
352 |
||
353 |
switch (r) { |
|
354 |
case ' ': continue PRINT_DOC; |
|
355 |
case 'q': |
|
356 |
case 3: |
|
357 |
break PRINT_DOC; |
|
358 |
default: |
|
359 |
in.beep(); |
|
360 |
break; |
|
361 |
} |
|
362 |
} |
|
363 |
} |
|
364 |
} |
|
365 |
//clear the "press space" line: |
|
366 |
in.getCursorBuffer().buffer.replace(0, buffer.length(), lastNote); |
|
367 |
in.getCursorBuffer().cursor = 0; |
|
368 |
in.killLine(); |
|
369 |
in.getCursorBuffer().buffer.append(buffer); |
|
370 |
in.getCursorBuffer().cursor = cursor; |
|
371 |
in.redrawLine(); |
|
372 |
in.flush(); |
|
373 |
} |
|
33362 | 374 |
} else { |
375 |
in.beep(); |
|
376 |
} |
|
377 |
} catch (IOException ex) { |
|
378 |
throw new IllegalStateException(ex); |
|
379 |
} |
|
380 |
} |
|
381 |
||
382 |
private static String commonPrefix(String str1, String str2) { |
|
383 |
for (int i = 0; i < str2.length(); i++) { |
|
384 |
if (!str1.startsWith(str2.substring(0, i + 1))) { |
|
385 |
return str2.substring(0, i); |
|
386 |
} |
|
387 |
} |
|
388 |
||
389 |
return str2; |
|
390 |
} |
|
391 |
||
392 |
@Override |
|
393 |
public boolean terminalEditorRunning() { |
|
394 |
Terminal terminal = in.getTerminal(); |
|
43583
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
395 |
if (terminal instanceof SuspendableTerminal) |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
396 |
return ((SuspendableTerminal) terminal).isRaw(); |
33362 | 397 |
return false; |
398 |
} |
|
399 |
||
400 |
@Override |
|
401 |
public void suspend() { |
|
43583
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
402 |
Terminal terminal = in.getTerminal(); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
403 |
if (terminal instanceof SuspendableTerminal) |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
404 |
((SuspendableTerminal) terminal).suspend(); |
33362 | 405 |
} |
406 |
||
407 |
@Override |
|
408 |
public void resume() { |
|
43583
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
409 |
Terminal terminal = in.getTerminal(); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
410 |
if (terminal instanceof SuspendableTerminal) |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
411 |
((SuspendableTerminal) terminal).resume(); |
33362 | 412 |
} |
413 |
||
42843
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
414 |
@Override |
33362 | 415 |
public void beforeUserCode() { |
40767 | 416 |
synchronized (this) { |
417 |
inputBytes = null; |
|
418 |
} |
|
33362 | 419 |
input.setState(State.BUFFER); |
420 |
} |
|
421 |
||
42843
a8d83044a192
8170162: jshell tool: no mechanism to programmatically launch
rfield
parents:
42827
diff
changeset
|
422 |
@Override |
33362 | 423 |
public void afterUserCode() { |
424 |
input.setState(State.WAIT); |
|
425 |
} |
|
426 |
||
427 |
@Override |
|
428 |
public void replaceLastHistoryEntry(String source) { |
|
429 |
history.fullHistoryReplace(source); |
|
430 |
} |
|
431 |
||
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
432 |
//compute possible options/Fixes based on the selected FixComputer, present them to the user, |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
433 |
//and perform the selected one: |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
434 |
private void fixes(FixComputer computer) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
435 |
String input = prefix + in.getCursorBuffer().toString(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
436 |
int cursor = prefix.length() + in.getCursorBuffer().cursor; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
437 |
FixResult candidates = computer.compute(repl, input, cursor); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
438 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
439 |
try { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
440 |
final boolean printError = candidates.error != null && !candidates.error.isEmpty(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
441 |
if (printError) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
442 |
in.println(candidates.error); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
443 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
444 |
if (candidates.fixes.isEmpty()) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
445 |
in.beep(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
446 |
if (printError) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
447 |
in.redrawLine(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
448 |
in.flush(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
449 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
450 |
} else if (candidates.fixes.size() == 1 && !computer.showMenu) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
451 |
if (printError) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
452 |
in.redrawLine(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
453 |
in.flush(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
454 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
455 |
candidates.fixes.get(0).perform(in); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
456 |
} else { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
457 |
List<Fix> fixes = new ArrayList<>(candidates.fixes); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
458 |
fixes.add(0, new Fix() { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
459 |
@Override |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
460 |
public String displayName() { |
36990 | 461 |
return repl.messageFormat("jshell.console.do.nothing"); |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
462 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
463 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
464 |
@Override |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
465 |
public void perform(ConsoleReader in) throws IOException { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
466 |
in.redrawLine(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
467 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
468 |
}); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
469 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
470 |
Map<Character, Fix> char2Fix = new HashMap<>(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
471 |
in.println(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
472 |
for (int i = 0; i < fixes.size(); i++) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
473 |
Fix fix = fixes.get(i); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
474 |
char2Fix.put((char) ('0' + i), fix); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
475 |
in.println("" + i + ": " + fixes.get(i).displayName()); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
476 |
} |
36990 | 477 |
in.print(repl.messageFormat("jshell.console.choice")); |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
478 |
in.flush(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
479 |
int read; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
480 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
481 |
read = in.readCharacter(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
482 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
483 |
Fix fix = char2Fix.get((char) read); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
484 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
485 |
if (fix == null) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
486 |
in.beep(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
487 |
fix = fixes.get(0); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
488 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
489 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
490 |
in.println(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
491 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
492 |
fix.perform(in); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
493 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
494 |
in.flush(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
495 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
496 |
} catch (IOException ex) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
497 |
ex.printStackTrace(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
498 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
499 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
500 |
|
40767 | 501 |
private byte[] inputBytes; |
502 |
private int inputBytesPointer; |
|
503 |
||
504 |
@Override |
|
41628 | 505 |
public synchronized int readUserInput() throws IOException { |
40767 | 506 |
while (inputBytes == null || inputBytes.length <= inputBytesPointer) { |
507 |
boolean prevHandleUserInterrupt = in.getHandleUserInterrupt(); |
|
508 |
History prevHistory = in.getHistory(); |
|
509 |
||
510 |
try { |
|
511 |
input.setState(State.WAIT); |
|
512 |
in.setHandleUserInterrupt(true); |
|
513 |
in.setHistory(userInputHistory); |
|
514 |
inputBytes = (in.readLine("") + System.getProperty("line.separator")).getBytes(); |
|
515 |
inputBytesPointer = 0; |
|
516 |
} catch (UserInterruptException ex) { |
|
41628 | 517 |
throw new InterruptedIOException(); |
40767 | 518 |
} finally { |
519 |
in.setHistory(prevHistory); |
|
520 |
in.setHandleUserInterrupt(prevHandleUserInterrupt); |
|
521 |
input.setState(State.BUFFER); |
|
522 |
} |
|
523 |
} |
|
524 |
return inputBytes[inputBytesPointer++]; |
|
525 |
} |
|
526 |
||
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
527 |
/** |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
528 |
* A possible action which the user can choose to perform. |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
529 |
*/ |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
530 |
public interface Fix { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
531 |
/** |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
532 |
* A name that should be shown to the user. |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
533 |
*/ |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
534 |
public String displayName(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
535 |
/** |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
536 |
* Perform the given action. |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
537 |
*/ |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
538 |
public void perform(ConsoleReader in) throws IOException; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
539 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
540 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
541 |
/** |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
542 |
* A factory for {@link Fix}es. |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
543 |
*/ |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
544 |
public abstract static class FixComputer { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
545 |
private final char shortcut; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
546 |
private final boolean showMenu; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
547 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
548 |
/** |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
549 |
* Construct a new FixComputer. {@code shortcut} defines the key which should trigger this FixComputer. |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
550 |
* If {@code showMenu} is {@code false}, and this computer returns exactly one {@code Fix}, |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
551 |
* no options will be show to the user, and the given {@code Fix} will be performed. |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
552 |
*/ |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
553 |
public FixComputer(char shortcut, boolean showMenu) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
554 |
this.shortcut = shortcut; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
555 |
this.showMenu = showMenu; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
556 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
557 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
558 |
/** |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
559 |
* Compute possible actions for the given code. |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
560 |
*/ |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
561 |
public abstract FixResult compute(JShellTool repl, String code, int cursor); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
562 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
563 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
564 |
/** |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
565 |
* A list of {@code Fix}es with a possible error that should be shown to the user. |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
566 |
*/ |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
567 |
public static class FixResult { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
568 |
public final List<Fix> fixes; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
569 |
public final String error; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
570 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
571 |
public FixResult(List<Fix> fixes, String error) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
572 |
this.fixes = fixes; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
573 |
this.error = error; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
574 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
575 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
576 |
|
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
577 |
private static final FixComputer[] FIX_COMPUTERS = new FixComputer[] { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
578 |
new FixComputer('v', false) { //compute "Introduce variable" Fix: |
41996
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
579 |
private void performToVar(ConsoleReader in, String type) throws IOException { |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
580 |
in.redrawLine(); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
581 |
in.setCursorPosition(0); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
582 |
in.putString(type + " = "); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
583 |
in.setCursorPosition(in.getCursorBuffer().cursor - 3); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
584 |
in.flush(); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
585 |
} |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
586 |
|
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
587 |
@Override |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
588 |
public FixResult compute(JShellTool repl, String code, int cursor) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
589 |
String type = repl.analysis.analyzeType(code, cursor); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
590 |
if (type == null) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
591 |
return new FixResult(Collections.emptyList(), null); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
592 |
} |
41996
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
593 |
List<Fix> fixes = new ArrayList<>(); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
594 |
fixes.add(new Fix() { |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
595 |
@Override |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
596 |
public String displayName() { |
36990 | 597 |
return repl.messageFormat("jshell.console.create.variable"); |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
598 |
} |
41996
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
599 |
|
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
600 |
@Override |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
601 |
public void perform(ConsoleReader in) throws IOException { |
41996
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
602 |
performToVar(in, type); |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
603 |
} |
41996
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
604 |
}); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
605 |
int idx = type.lastIndexOf("."); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
606 |
if (idx > 0) { |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
607 |
String stype = type.substring(idx + 1); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
608 |
QualifiedNames res = repl.analysis.listQualifiedNames(stype, stype.length()); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
609 |
if (res.isUpToDate() && res.getNames().contains(type) |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
610 |
&& !res.isResolvable()) { |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
611 |
fixes.add(new Fix() { |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
612 |
@Override |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
613 |
public String displayName() { |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
614 |
return "import: " + type + ". " + |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
615 |
repl.messageFormat("jshell.console.create.variable"); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
616 |
} |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
617 |
|
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
618 |
@Override |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
619 |
public void perform(ConsoleReader in) throws IOException { |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
620 |
repl.state.eval("import " + type + ";"); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
621 |
in.println("Imported: " + type); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
622 |
performToVar(in, stype); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
623 |
} |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
624 |
}); |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
625 |
} |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
626 |
} |
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
627 |
return new FixResult(fixes, null); |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
628 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
629 |
}, |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
630 |
new FixComputer('i', true) { //compute "Add import" Fixes: |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
631 |
@Override |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
632 |
public FixResult compute(JShellTool repl, String code, int cursor) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
633 |
QualifiedNames res = repl.analysis.listQualifiedNames(code, cursor); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
634 |
List<Fix> fixes = new ArrayList<>(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
635 |
for (String fqn : res.getNames()) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
636 |
fixes.add(new Fix() { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
637 |
@Override |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
638 |
public String displayName() { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
639 |
return "import: " + fqn; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
640 |
} |
41996
389212e0746c
8166333: jshell tool: shortcut var does not import its type
rfield
parents:
41934
diff
changeset
|
641 |
|
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
642 |
@Override |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
643 |
public void perform(ConsoleReader in) throws IOException { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
644 |
repl.state.eval("import " + fqn + ";"); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
645 |
in.println("Imported: " + fqn); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
646 |
in.redrawLine(); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
647 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
648 |
}); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
649 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
650 |
if (res.isResolvable()) { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
651 |
return new FixResult(Collections.emptyList(), |
36990 | 652 |
repl.messageFormat("jshell.console.resolvable")); |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
653 |
} else { |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
654 |
String error = ""; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
655 |
if (fixes.isEmpty()) { |
36990 | 656 |
error = repl.messageFormat("jshell.console.no.candidate"); |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
657 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
658 |
if (!res.isUpToDate()) { |
36990 | 659 |
error += repl.messageFormat("jshell.console.incomplete"); |
36160
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
660 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
661 |
return new FixResult(fixes, error); |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
662 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
663 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
664 |
} |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
665 |
}; |
f42d362d0d17
8131027: JShell API/tool: suggest imports for a class
jlahoda
parents:
33362
diff
changeset
|
666 |
|
43583
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
667 |
private static final class JShellUnixTerminal extends NoInterruptUnixTerminal implements SuspendableTerminal { |
33362 | 668 |
|
669 |
private final StopDetectingInputStream input; |
|
670 |
||
671 |
public JShellUnixTerminal(StopDetectingInputStream input) throws Exception { |
|
672 |
this.input = input; |
|
673 |
} |
|
674 |
||
675 |
public boolean isRaw() { |
|
676 |
try { |
|
677 |
return getSettings().get("-a").contains("-icanon"); |
|
678 |
} catch (IOException | InterruptedException ex) { |
|
679 |
return false; |
|
680 |
} |
|
681 |
} |
|
682 |
||
683 |
@Override |
|
684 |
public InputStream wrapInIfNeeded(InputStream in) throws IOException { |
|
685 |
return input.setInputStream(super.wrapInIfNeeded(in)); |
|
686 |
} |
|
687 |
||
688 |
@Override |
|
689 |
public void disableInterruptCharacter() { |
|
690 |
} |
|
691 |
||
692 |
@Override |
|
693 |
public void enableInterruptCharacter() { |
|
694 |
} |
|
695 |
||
43583
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
696 |
@Override |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
697 |
public void suspend() { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
698 |
try { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
699 |
getSettings().restore(); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
700 |
super.disableInterruptCharacter(); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
701 |
} catch (Exception ex) { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
702 |
throw new IllegalStateException(ex); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
703 |
} |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
704 |
} |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
705 |
|
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
706 |
@Override |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
707 |
public void resume() { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
708 |
try { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
709 |
init(); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
710 |
} catch (Exception ex) { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
711 |
throw new IllegalStateException(ex); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
712 |
} |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
713 |
} |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
714 |
|
33362 | 715 |
} |
716 |
||
43583
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
717 |
private static final class JShellWindowsTerminal extends WindowsTerminal implements SuspendableTerminal { |
33362 | 718 |
|
719 |
private final StopDetectingInputStream input; |
|
720 |
||
721 |
public JShellWindowsTerminal(StopDetectingInputStream input) throws Exception { |
|
722 |
this.input = input; |
|
723 |
} |
|
724 |
||
725 |
@Override |
|
726 |
public void init() throws Exception { |
|
727 |
super.init(); |
|
728 |
setAnsiSupported(false); |
|
729 |
} |
|
730 |
||
731 |
@Override |
|
732 |
public InputStream wrapInIfNeeded(InputStream in) throws IOException { |
|
733 |
return input.setInputStream(super.wrapInIfNeeded(in)); |
|
734 |
} |
|
735 |
||
43583
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
736 |
@Override |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
737 |
public void suspend() { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
738 |
try { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
739 |
restore(); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
740 |
setConsoleMode(getConsoleMode() & ~ConsoleMode.ENABLE_PROCESSED_INPUT.code); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
741 |
} catch (Exception ex) { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
742 |
throw new IllegalStateException(ex); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
743 |
} |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
744 |
} |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
745 |
|
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
746 |
@Override |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
747 |
public void resume() { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
748 |
try { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
749 |
restore(); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
750 |
init(); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
751 |
} catch (Exception ex) { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
752 |
throw new IllegalStateException(ex); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
753 |
} |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
754 |
} |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
755 |
|
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
756 |
@Override |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
757 |
public boolean isRaw() { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
758 |
return (getConsoleMode() & ConsoleMode.ENABLE_LINE_INPUT.code) == 0; |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
759 |
} |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
760 |
|
33362 | 761 |
} |
36715
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
762 |
|
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
763 |
private static final class TestTerminal extends TerminalSupport { |
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
764 |
|
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
765 |
private final StopDetectingInputStream input; |
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
766 |
|
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
767 |
public TestTerminal(StopDetectingInputStream input) throws Exception { |
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
768 |
super(true); |
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
769 |
setAnsiSupported(false); |
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
770 |
setEchoEnabled(true); |
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
771 |
this.input = input; |
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
772 |
} |
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
773 |
|
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
774 |
@Override |
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
775 |
public InputStream wrapInIfNeeded(InputStream in) throws IOException { |
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
776 |
return input.setInputStream(super.wrapInIfNeeded(in)); |
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
777 |
} |
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
778 |
|
ae6fa9280e0b
8152296: langtools/test/jdk/jshell/ToolReloadTest.java failing if there is not persisted history
jlahoda
parents:
36501
diff
changeset
|
779 |
} |
43363
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
780 |
|
43583
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
781 |
private interface SuspendableTerminal { |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
782 |
public void suspend(); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
783 |
public void resume(); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
784 |
public boolean isRaw(); |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
785 |
} |
d16e490ec827
8173653: jshell tool: ctrl-C when in external editor aborts jshell -- history lost
jlahoda
parents:
43363
diff
changeset
|
786 |
|
43363
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
787 |
private static final class CheckCompletionKeyMap extends KeyMap { |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
788 |
|
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
789 |
private final KeyMap del; |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
790 |
private final AtomicBoolean allowSmart; |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
791 |
|
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
792 |
public CheckCompletionKeyMap(KeyMap del, AtomicBoolean allowSmart) { |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
793 |
super(del.getName(), del.isViKeyMap()); |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
794 |
this.del = del; |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
795 |
this.allowSmart = allowSmart; |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
796 |
} |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
797 |
|
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
798 |
@Override |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
799 |
public void bind(CharSequence keySeq, Object function) { |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
800 |
del.bind(keySeq, function); |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
801 |
} |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
802 |
|
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
803 |
@Override |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
804 |
public void bindIfNotBound(CharSequence keySeq, Object function) { |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
805 |
del.bindIfNotBound(keySeq, function); |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
806 |
} |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
807 |
|
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
808 |
@Override |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
809 |
public void from(KeyMap other) { |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
810 |
del.from(other); |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
811 |
} |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
812 |
|
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
813 |
@Override |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
814 |
public Object getAnotherKey() { |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
815 |
return del.getAnotherKey(); |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
816 |
} |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
817 |
|
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
818 |
@Override |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
819 |
public Object getBound(CharSequence keySeq) { |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
820 |
Object res = del.getBound(keySeq); |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
821 |
|
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
822 |
if (res != Operation.COMPLETE) { |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
823 |
allowSmart.set(true); |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
824 |
} |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
825 |
|
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
826 |
return res; |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
827 |
} |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
828 |
|
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
829 |
@Override |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
830 |
public void setBlinkMatchingParen(boolean on) { |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
831 |
del.setBlinkMatchingParen(on); |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
832 |
} |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
833 |
|
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
834 |
@Override |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
835 |
public String toString() { |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
836 |
return "check: " + del.toString(); |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
837 |
} |
a4ed2006a4c5
8153759: jshell tool: Smart completion detection is not reliable
jlahoda
parents:
42843
diff
changeset
|
838 |
} |
33362 | 839 |
} |