Skip to content

Commit 2134858

Browse files
gselzerclaude
andcommitted
Ask the language servers through script sessions in tests
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 0dd6198 commit 2134858

1 file changed

Lines changed: 23 additions & 38 deletions

File tree

‎src/test/java/org/scijava/plugins/scripting/jython/JythonCompletionTest.java‎

Lines changed: 23 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,19 @@
3535
import static org.junit.Assert.assertTrue;
3636

3737
import java.util.List;
38+
import java.util.function.Supplier;
3839
import java.util.concurrent.TimeUnit;
3940
import java.util.stream.Collectors;
4041

4142
import javax.script.ScriptEngine;
4243

4344
import org.eclipse.lsp4j.CompletionItem;
44-
import org.eclipse.lsp4j.CompletionParams;
45-
import org.eclipse.lsp4j.DidCloseTextDocumentParams;
46-
import org.eclipse.lsp4j.DidOpenTextDocumentParams;
4745
import org.eclipse.lsp4j.SignatureHelp;
48-
import org.eclipse.lsp4j.SignatureHelpParams;
49-
import org.eclipse.lsp4j.TextDocumentIdentifier;
50-
import org.eclipse.lsp4j.TextDocumentItem;
5146
import org.junit.Test;
5247
import org.scijava.Context;
5348
import org.scijava.code.lsp.ClassIndex;
5449
import org.scijava.code.lsp.LanguageServerService;
55-
import org.scijava.code.lsp.Positions;
56-
import org.scijava.code.lsp.MergedLanguageServer;
50+
import org.scijava.code.lsp.ScriptSession;
5751
import org.scijava.code.lsp.RatedSignatureInformation;
5852
import org.scijava.script.ScriptLanguage;
5953
import org.scijava.script.ScriptService;
@@ -66,8 +60,6 @@
6660
*/
6761
public class JythonCompletionTest {
6862

69-
private static final String URI = "untitled:/test.py";
70-
7163
@Test
7264
public void testMemberCompletionViaService() {
7365
final Context ctx = new Context(ScriptService.class,
@@ -83,7 +75,7 @@ public void testMemberCompletionViaService() {
8375
assertTrue(servers.supports(jython));
8476

8577
// Static analysis: 's' is a String, so 's.' completes to String members.
86-
final List<String> texts = labels(items(servers.server(jython),
78+
final List<String> texts = labels(items(servers.session(jython),
8779
"s = \"hello\"\ns."));
8880
assertTrue("expected s.length among " + texts, texts.contains("s.length"));
8981
assertTrue("expected s.charAt among " + texts, texts.contains("s.charAt"));
@@ -208,19 +200,21 @@ public void testInterpreterBindings() throws Exception {
208200
engine.eval("from java.util import Collections, HashMap\n" +
209201
"m = HashMap()\n" +
210202
"def helper(): pass\n");
211-
final MergedLanguageServer server = ctx.service(
212-
LanguageServerService.class).server(jython, engine.getContext());
203+
final LanguageServerService servers = ctx.service(
204+
LanguageServerService.class);
205+
final Supplier<ScriptSession> live = () -> servers.session(jython, engine
206+
.getContext());
213207

214-
assertTrue(labels(items(server, "m.putIfAb")).contains(
208+
assertTrue(labels(items(live.get(), "m.putIfAb")).contains(
215209
"m.putIfAbsent"));
216-
assertTrue(labels(items(server, "injected.si")).contains(
210+
assertTrue(labels(items(live.get(), "injected.si")).contains(
217211
"injected.size"));
218-
assertTrue(labels(items(server, "x = hel")).contains("helper"));
212+
assertTrue(labels(items(live.get(), "x = hel")).contains("helper"));
219213
// An imported Java class offers its static members.
220-
assertTrue(labels(items(server, "Collections.emptyL")).contains(
214+
assertTrue(labels(items(live.get(), "Collections.emptyL")).contains(
221215
"Collections.emptyList"));
222216
// Python internals are not offered.
223-
assertFalse(labels(items(server, "x = __")).contains("__name__"));
217+
assertFalse(labels(items(live.get(), "x = __")).contains("__name__"));
224218
}
225219
finally {
226220
ctx.dispose();
@@ -259,13 +253,12 @@ private static SignatureHelp help(final String code) {
259253
try {
260254
final ScriptLanguage jython = ctx.service(ScriptService.class)
261255
.getLanguageByName("Jython");
262-
final MergedLanguageServer server = ctx.service(
263-
LanguageServerService.class).server(jython);
264-
server.didOpen(new DidOpenTextDocumentParams(new TextDocumentItem(URI,
265-
"python", 1, code)));
266-
return server.signatureHelp(new SignatureHelpParams(
267-
new TextDocumentIdentifier(URI), Positions.position(code, code
268-
.length()))).get(30, TimeUnit.SECONDS);
256+
try (ScriptSession session = ctx.service(LanguageServerService.class)
257+
.session(jython))
258+
{
259+
return session.signatureHelp(code, code.length()).get(30,
260+
TimeUnit.SECONDS);
261+
}
269262
}
270263
catch (final Exception exc) {
271264
throw new RuntimeException(exc);
@@ -301,33 +294,25 @@ private static List<CompletionItem> completions(final String code) {
301294
try {
302295
final ScriptLanguage jython = ctx.service(ScriptService.class)
303296
.getLanguageByName("Jython");
304-
return items(ctx.service(LanguageServerService.class).server(jython),
297+
return items(ctx.service(LanguageServerService.class).session(jython),
305298
code);
306299
}
307300
finally {
308301
ctx.dispose();
309302
}
310303
}
311304

312-
private static List<CompletionItem> items(final MergedLanguageServer server,
305+
private static List<CompletionItem> items(final ScriptSession session,
313306
final String code)
314307
{
315-
server.didOpen(new DidOpenTextDocumentParams(new TextDocumentItem(URI,
316-
"python", 1, code)));
317-
try {
318-
final List<CompletionItem> items = new java.util.ArrayList<>(server
319-
.completion(new CompletionParams(new TextDocumentIdentifier(URI),
320-
Positions.position(code, code.length()))).get(30, TimeUnit.SECONDS)
321-
.getRight().getItems());
308+
try (ScriptSession s = session) {
309+
final List<CompletionItem> items = new java.util.ArrayList<>(s.completion(
310+
code, code.length()).get(30, TimeUnit.SECONDS).getItems());
322311
items.sort((a, b) -> a.getSortText().compareTo(b.getSortText()));
323312
return items;
324313
}
325314
catch (final Exception exc) {
326315
throw new RuntimeException(exc);
327316
}
328-
finally {
329-
server.didClose(new DidCloseTextDocumentParams(
330-
new TextDocumentIdentifier(URI)));
331-
}
332317
}
333318
}

0 commit comments

Comments
 (0)