Skip to content

Commit ad1687b

Browse files
gselzerclaude
andcommitted
code-lsp-groovy: follow code-lsp's sessions and environments
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 970da60 commit ad1687b

3 files changed

Lines changed: 28 additions & 21 deletions

File tree

‎code-lsp-groovy/src/main/java/org/scijava/code/lsp/groovy/GroovyLanguageServer.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646

4747
import javax.script.Bindings;
4848
import javax.script.ScriptContext;
49+
import javax.script.SimpleBindings;
4950

5051
import groovy.lang.GroovySystem;
5152
import groovy.lang.MetaMethod;
@@ -650,16 +651,14 @@ private static CompletionItem field(final String name, final String type) {
650651
*/
651652
private Map<String, Class<?>> liveVariables() {
652653
final Map<String, Class<?>> vars = new LinkedHashMap<>();
653-
final ScriptContext live = environment().live();
654-
final Bindings bindings = live.getBindings(ScriptContext.ENGINE_SCOPE);
655-
if (bindings != null) {
656-
for (final Map.Entry<String, Object> entry : bindings.entrySet()) {
657-
final String name = entry.getKey();
658-
if (!isIdentifier(name) || name.startsWith("__")) continue;
659-
final Object value = entry.getValue();
660-
vars.put(name, value == null ? Object.class : publicType(value
661-
.getClass()));
662-
}
654+
final Bindings bindings = environment().live().map(l -> l.getBindings(
655+
ScriptContext.ENGINE_SCOPE)).orElseGet(SimpleBindings::new);
656+
for (final Map.Entry<String, Object> entry : bindings.entrySet()) {
657+
final String name = entry.getKey();
658+
if (!isIdentifier(name) || name.startsWith("__")) continue;
659+
final Object value = entry.getValue();
660+
vars.put(name, value == null ? Object.class : publicType(value
661+
.getClass()));
663662
}
664663
return vars;
665664
}

‎code-lsp-groovy/src/test/java/org/scijava/code/lsp/groovy/GroovyLanguageServerTest.java‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
import java.util.Collections;
3939
import java.util.List;
4040
import java.util.Map;
41+
import java.util.Optional;
42+
import java.util.concurrent.CompletableFuture;
4143
import java.util.concurrent.TimeUnit;
4244
import java.util.stream.Collectors;
4345

@@ -134,7 +136,7 @@ public void testMembersOfBindings() {
134136
}
135137

136138
@Test
137-
public void testDiagnostics() {
139+
public void testDiagnostics() throws Exception {
138140
// Syntax errors, and unresolvable classes: errors, where they are.
139141
assertEquals(Collections.singletonList("Error@1:11-12 Unexpected input: '+'"),
140142
problems("sigma = 1.5\ndef x = (1 +\n"));
@@ -289,8 +291,8 @@ public void testInterpreterBindings() {
289291
final ScriptContext live = new SimpleScriptContext();
290292
live.setAttribute("injected", new ArrayList<String>(),
291293
ScriptContext.ENGINE_SCOPE);
292-
final List<String> texts = labels(items(session(new Environment(null,
293-
Collections.emptyList(), live)), "injected.si"));
294+
final List<String> texts = labels(items(session(new Environment().withLive(
295+
live)), "injected.si"));
294296
assertTrue(texts.contains("size"), texts.toString());
295297
}
296298

@@ -348,15 +350,21 @@ public void testImportOffset() {
348350

349351
/** A session about plain Groovy, with a server of its own. */
350352
private static ScriptSession session(final Environment env) {
351-
return new ScriptSession(context.service(LanguageServerService.class),
352-
TEST_LANGUAGE, env.live());
353+
final LanguageServerService servers = context.service(
354+
LanguageServerService.class);
355+
return env.live().map(live -> new ScriptSession(servers, TEST_LANGUAGE,
356+
live)).orElseGet(() -> new ScriptSession(servers, TEST_LANGUAGE));
353357
}
354358

355359
/** The problems found in a script, e.g. {@code Error@0:4-6 message}. */
356-
private static List<String> problems(final String code) {
360+
private static List<String> problems(final String code) throws Exception {
361+
final CompletableFuture<List<Diagnostic>> heard =
362+
new CompletableFuture<>();
357363
final List<Diagnostic> found;
358-
try (ScriptSession session = session(Environment.NONE)) {
359-
found = session.update(code).diagnostics(20_000);
364+
try (ScriptSession session = session(new Environment())) {
365+
session.setDiagnosticsListener(heard::complete);
366+
session.update(code);
367+
found = heard.get(20, TimeUnit.SECONDS);
360368
}
361369
return found.stream().map(d -> d.getSeverity() + "@" + d.getRange().getStart()
362370
.getLine() + ":" + d.getRange().getStart().getCharacter() + "-" + d
@@ -365,7 +373,7 @@ private static List<String> problems(final String code) {
365373
}
366374

367375
private static SignatureHelp help(final String code) {
368-
try (ScriptSession session = session(Environment.NONE)) {
376+
try (ScriptSession session = session(new Environment())) {
369377
return session.signatureHelp(code, code.length()).get(30,
370378
TimeUnit.SECONDS);
371379
}
@@ -386,7 +394,7 @@ private static String describe(final SignatureHelp help) {
386394
}
387395

388396
private static List<CompletionItem> items(final String code) {
389-
return items(session(Environment.NONE), code);
397+
return items(session(new Environment()), code);
390398
}
391399

392400
private static List<CompletionItem> items(final ScriptSession session,

‎code-lsp-groovy/src/test/java/org/scijava/code/lsp/groovy/GroovyServerPluginTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void testServerIsDiscovered() {
4040
public void testServerLaunch() {
4141
LanguageServer server = servers.launch(
4242
"groovy",
43-
Environment.NONE
43+
new Environment()
4444
);
4545
assertTrue(server instanceof GroovyLanguageServer);
4646
}

0 commit comments

Comments
 (0)