Skip to content

Commit fd5c884

Browse files
gselzerclaude
andcommitted
Follow scijava-code-lsp's sessions and environments
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 7e6a4af commit fd5c884

5 files changed

Lines changed: 7 additions & 11 deletions

File tree

‎src/main/java/org/scijava/ui/swing/script/PromptPane.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
import org.scijava.Context;
5656
import org.scijava.script.ScriptInterpreter;
5757
import org.scijava.script.ScriptREPL;
58-
import org.scijava.code.lsp.Environment;
5958
import org.scijava.code.lsp.LanguageServerService;
6059
import org.scijava.code.lsp.Positions;
6160
import org.scijava.code.lsp.ScriptSession;
@@ -295,8 +294,9 @@ private synchronized ScriptSession session(
295294
LanguageServerService.class);
296295
final ScriptEngine engine = interpreter.getEngine();
297296
if (servers == null || interpreter.getLanguage() == null) return null;
298-
session = new ScriptSession(servers, interpreter.getLanguage(),
299-
engine == null ? Environment.NO_STATE : engine.getContext());
297+
session = engine == null ? new ScriptSession(servers, interpreter
298+
.getLanguage()) : new ScriptSession(servers, interpreter.getLanguage(),
299+
engine.getContext());
300300
sessionInterpreter = interpreter;
301301
return session;
302302
}

‎src/main/java/org/scijava/ui/swing/script/autocompletion/LanguageServerLanguageSupport.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ public void setDiagnosticsEnabled(final boolean enabled) {
103103

104104
@Override
105105
public void install(final RSyntaxTextArea textArea) {
106-
final ScriptSession session = sessions.get().setFile(file).setLogger(log);
106+
final ScriptSession session = sessions.get();
107+
session.setFile(file);
107108
final SciJavaCompletionProvider provider = new SciJavaCompletionProvider(
108109
session);
109110
provider.setLogger(log);

‎src/test/java/org/scijava/ui/swing/script/autocompletion/CodeIntelligenceUITest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private static org.eclipse.lsp4j.SignatureInformation signature(
158158
private static class FakeServer extends AbstractLanguageServer {
159159

160160
FakeServer() {
161-
super(Environment.NONE);
161+
super(new Environment());
162162
}
163163

164164
@Override

‎src/test/java/org/scijava/ui/swing/script/autocompletion/FakeServers.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,4 @@ public LanguageServer launch(final String languageId,
137137
{
138138
return server;
139139
}
140-
141-
@Override
142-
public Map<String, Class<?>> scriptParameters(final String text) {
143-
return Collections.emptyMap();
144-
}
145140
}

‎src/test/java/org/scijava/ui/swing/script/autocompletion/SciJavaCompletionProviderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ private static class FakeServer extends AbstractLanguageServer {
445445
final List<Document> closed = new ArrayList<>();
446446

447447
FakeServer() {
448-
super(Environment.NONE);
448+
super(new Environment());
449449
}
450450

451451
/** Completions replacing the text from {@code start} to the caret. */

0 commit comments

Comments
 (0)