Skip to content

Commit 0dd6198

Browse files
gselzerclaude
andcommitted
Move off scijava-code-api, now removed
Its remaining types (ScriptDocument, ScriptDialect, ClassIndex, Signatures, Environment) come from scijava-code-lsp, and script parameters from the LanguageServerService. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent a8dd8c0 commit 0dd6198

11 files changed

Lines changed: 34 additions & 46 deletions

File tree

‎pom.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<package-name>org.scijava.plugins.scripting.jython</package-name>
8686

8787
<scijava-common.version>2.101.0</scijava-common.version>
88-
<scijava-code-api.version>0.1.0-SNAPSHOT</scijava-code-api.version>
88+
<scijava-code-lsp.version>0.1.0-SNAPSHOT</scijava-code-lsp.version>
8989
<!-- NB: As Fiji ships, for scijava-code-lsp (lsp4j); newer than pom-scijava 34's. -->
9090
<gson.version>2.14.0</gson.version>
9191

@@ -103,15 +103,10 @@
103103
<groupId>org.scijava</groupId>
104104
<artifactId>scijava-common</artifactId>
105105
</dependency>
106-
<dependency>
107-
<groupId>org.scijava</groupId>
108-
<artifactId>scijava-code-api</artifactId>
109-
<version>${scijava-code-api.version}</version>
110-
</dependency>
111106
<dependency>
112107
<groupId>org.scijava</groupId>
113108
<artifactId>scijava-code-lsp</artifactId>
114-
<version>${scijava-code-api.version}</version>
109+
<version>${scijava-code-lsp.version}</version>
115110
</dependency>
116111

117112
<!-- Third-party dependencies -->

‎src/main/java/org/scijava/plugins/scripting/jython/CompletionText.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,13 @@
3636
import java.util.Collections;
3737
import java.util.List;
3838

39-
import org.scijava.code.api.ClassIndex;
39+
import org.scijava.code.lsp.ClassIndex;
4040

4141
/**
4242
* A mutable suggestion used internally by the Jython completion engine. It holds
4343
* the replacement text plus optional documentation and (for callables) parameter
44-
* and return-type metadata. The {@link JythonCodeCompleter} converts these into
45-
* toolkit-agnostic {@link org.scijava.code.api.Completion}s at the
46-
* boundary.
44+
* and return-type metadata. {@link JythonAutoCompletions} converts these into
45+
* LSP completion items at the boundary.
4746
*
4847
* @author Albert Cardona
4948
*/

‎src/main/java/org/scijava/plugins/scripting/jython/JavaStubs.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import java.util.function.Function;
6060
import java.util.stream.Collectors;
6161

62-
import org.scijava.code.api.ClassIndex;
62+
import org.scijava.code.lsp.ClassIndex;
6363

6464
/**
6565
* Writes Python type stubs ({@code .pyi}) of Java packages, so that a Python

‎src/main/java/org/scijava/plugins/scripting/jython/JythonAutoCompletions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import java.util.stream.Collectors;
4747

4848
import org.python.indexer.types.NModuleType;
49-
import org.scijava.code.api.ClassIndex;
49+
import org.scijava.code.lsp.ClassIndex;
5050
import org.eclipse.lsp4j.CompletionItem;
5151
import org.eclipse.lsp4j.CompletionItemKind;
5252
import org.eclipse.lsp4j.MarkupContent;

‎src/main/java/org/scijava/plugins/scripting/jython/JythonDialect.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import java.util.Set;
3535
import java.util.TreeSet;
3636

37-
import org.scijava.code.api.ScriptDialect;
37+
import org.scijava.code.lsp.ScriptDialect;
3838

3939
/**
4040
* How Jython scripts see their script parameters: as the Java objects

‎src/main/java/org/scijava/plugins/scripting/jython/JythonImports.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.eclipse.lsp4j.Position;
3636
import org.eclipse.lsp4j.Range;
3737
import org.eclipse.lsp4j.TextEdit;
38-
import org.scijava.code.lsp.LspClient;
38+
import org.scijava.code.lsp.Positions;
3939

4040
/**
4141
* Parses the {@code import} statements in a Jython script, and computes the
@@ -150,7 +150,7 @@ public static TextEdit autoImportEdit(final String text,
150150
}
151151
final int targetLine = imported.isEmpty() ? 0 : lastImportLine + 1;
152152
final int offset = offsetOfLine(text, targetLine);
153-
final Position at = LspClient.position(text, Math.min(offset, text
153+
final Position at = Positions.position(text, Math.min(offset, text
154154
.length()));
155155
return new TextEdit(new Range(at, at), importStatement + "\n");
156156
}

‎src/main/java/org/scijava/plugins/scripting/jython/JythonLanguageServer.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
import org.python.core.PyModule;
4949
import org.python.core.PyObject;
5050
import org.python.core.PyString;
51-
import org.scijava.code.api.ClassIndex;
52-
import org.scijava.code.api.CodeCompletionService;
51+
import org.scijava.code.lsp.ClassIndex;
52+
import org.scijava.code.lsp.LanguageServerService;
5353
import org.scijava.code.lsp.Callable;
5454
import org.scijava.code.lsp.Environment;
5555
import org.scijava.code.lsp.ScriptLanguageServer;
@@ -77,18 +77,18 @@ public class JythonLanguageServer extends ScriptLanguageServer {
7777
new Thread(ClassIndex::ensureCache, "Jython-ClassIndex-warmup").start();
7878
}
7979

80-
private final CodeCompletionService completion;
80+
private final LanguageServerService servers;
8181
private final JythonAutoCompletions engine = new JythonAutoCompletions();
8282

8383
/**
84-
* @param completion Reads the scripts' parameters.
84+
* @param servers Reads the scripts' parameters.
8585
* @param environment Where the scripts run (e.g. a live interpreter).
8686
*/
87-
public JythonLanguageServer(final CodeCompletionService completion,
87+
public JythonLanguageServer(final LanguageServerService servers,
8888
final Environment environment)
8989
{
9090
super(environment);
91-
this.completion = completion;
91+
this.servers = servers;
9292
}
9393

9494
@Override
@@ -230,8 +230,8 @@ private Map<String, DotAutocompletions> predefinedVariables(
230230
final String text)
231231
{
232232
final Map<String, DotAutocompletions> vars = new LinkedHashMap<>();
233-
if (completion != null) {
234-
completion.scriptParameters(text).forEach((name,
233+
if (servers != null) {
234+
servers.scriptParameters(text).forEach((name,
235235
type) -> vars.put(name, new VarDotAutocompletions(DIALECT.runtimeType(
236236
type))));
237237
}

‎src/main/java/org/scijava/plugins/scripting/jython/JythonPythonServerPlugin.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,10 @@
4444
import org.eclipse.lsp4j.services.LanguageClient;
4545
import org.eclipse.lsp4j.services.LanguageServer;
4646
import org.scijava.Priority;
47-
import org.scijava.code.api.CodeCompletionService;
48-
import org.scijava.code.api.ScriptDocument;
47+
import org.scijava.code.lsp.LanguageServerService;
48+
import org.scijava.code.lsp.ScriptDocument;
4949
import org.scijava.code.lsp.Environment;
5050
import org.scijava.code.lsp.LanguageServerPlugin;
51-
import org.scijava.code.lsp.LanguageServerService;
5251
import org.scijava.code.lsp.TransformingLanguageServer;
5352
import org.scijava.plugin.Parameter;
5453
import org.scijava.plugin.Plugin;
@@ -76,8 +75,6 @@ public class JythonPythonServerPlugin implements LanguageServerPlugin {
7675
@Parameter
7776
private LanguageServerService servers;
7877

79-
@Parameter(required = false)
80-
private CodeCompletionService completion;
8178

8279
private JavaStubs stubs;
8380

@@ -108,7 +105,7 @@ public LanguageServer create(final Environment environment) {
108105
final LanguageServer python = servers.launch("python", environment);
109106
return new TransformingLanguageServer(python, text -> ScriptDocument.of(
110107
text, parameters(text), JythonLanguageServer.DIALECT, environment
111-
.toContext()))
108+
))
112109
{
113110

114111
@Override
@@ -135,7 +132,7 @@ synchronized JavaStubs stubs() {
135132
}
136133

137134
private Map<String, Class<?>> parameters(final String text) {
138-
return completion == null ? Collections.emptyMap() : completion
135+
return servers == null ? Collections.emptyMap() : servers
139136
.scriptParameters(text);
140137
}
141138

‎src/main/java/org/scijava/plugins/scripting/jython/JythonServerPlugin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
import org.eclipse.lsp4j.services.LanguageServer;
3232
import org.scijava.Priority;
33-
import org.scijava.code.api.CodeCompletionService;
33+
import org.scijava.code.lsp.LanguageServerService;
3434
import org.scijava.code.lsp.Environment;
3535
import org.scijava.code.lsp.LanguageServerPlugin;
3636
import org.scijava.plugin.Parameter;
@@ -48,7 +48,7 @@
4848
public class JythonServerPlugin implements LanguageServerPlugin {
4949

5050
@Parameter(required = false)
51-
private CodeCompletionService completion;
51+
private LanguageServerService servers;
5252

5353
@Override
5454
public boolean supports(final ScriptLanguage language) {
@@ -57,7 +57,7 @@ public boolean supports(final ScriptLanguage language) {
5757

5858
@Override
5959
public LanguageServer create(final Environment environment) {
60-
return new JythonLanguageServer(completion, environment);
60+
return new JythonLanguageServer(servers, environment);
6161
}
6262

6363
/** Matches "Jython" and "Python (Jython)", without claiming CPython. */

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,9 @@
5050
import org.eclipse.lsp4j.TextDocumentItem;
5151
import org.junit.Test;
5252
import org.scijava.Context;
53-
import org.scijava.code.api.ClassIndex;
54-
import org.scijava.code.api.CodeCompletionService;
53+
import org.scijava.code.lsp.ClassIndex;
5554
import org.scijava.code.lsp.LanguageServerService;
56-
import org.scijava.code.lsp.LspClient;
55+
import org.scijava.code.lsp.Positions;
5756
import org.scijava.code.lsp.MergedLanguageServer;
5857
import org.scijava.code.lsp.RatedSignatureInformation;
5958
import org.scijava.script.ScriptLanguage;
@@ -72,7 +71,7 @@ public class JythonCompletionTest {
7271
@Test
7372
public void testMemberCompletionViaService() {
7473
final Context ctx = new Context(ScriptService.class,
75-
CodeCompletionService.class, LanguageServerService.class);
74+
LanguageServerService.class);
7675
try {
7776
final ScriptLanguage jython = ctx.service(ScriptService.class)
7877
.getLanguageByName("Jython");
@@ -256,7 +255,7 @@ public void testSignatureHelp() {
256255

257256
private static SignatureHelp help(final String code) {
258257
final Context ctx = new Context(ScriptService.class,
259-
CodeCompletionService.class, LanguageServerService.class);
258+
LanguageServerService.class);
260259
try {
261260
final ScriptLanguage jython = ctx.service(ScriptService.class)
262261
.getLanguageByName("Jython");
@@ -265,7 +264,7 @@ private static SignatureHelp help(final String code) {
265264
server.didOpen(new DidOpenTextDocumentParams(new TextDocumentItem(URI,
266265
"python", 1, code)));
267266
return server.signatureHelp(new SignatureHelpParams(
268-
new TextDocumentIdentifier(URI), LspClient.position(code, code
267+
new TextDocumentIdentifier(URI), Positions.position(code, code
269268
.length()))).get(30, TimeUnit.SECONDS);
270269
}
271270
catch (final Exception exc) {
@@ -298,7 +297,7 @@ private static List<String> labels(final List<CompletionItem> items) {
298297

299298
private static List<CompletionItem> completions(final String code) {
300299
final Context ctx = new Context(ScriptService.class,
301-
CodeCompletionService.class, LanguageServerService.class);
300+
LanguageServerService.class);
302301
try {
303302
final ScriptLanguage jython = ctx.service(ScriptService.class)
304303
.getLanguageByName("Jython");
@@ -318,7 +317,7 @@ private static List<CompletionItem> items(final MergedLanguageServer server,
318317
try {
319318
final List<CompletionItem> items = new java.util.ArrayList<>(server
320319
.completion(new CompletionParams(new TextDocumentIdentifier(URI),
321-
LspClient.position(code, code.length()))).get(30, TimeUnit.SECONDS)
320+
Positions.position(code, code.length()))).get(30, TimeUnit.SECONDS)
322321
.getRight().getItems());
323322
items.sort((a, b) -> a.getSortText().compareTo(b.getSortText()));
324323
return items;

0 commit comments

Comments
 (0)