Skip to content

Commit bb21017

Browse files
gselzerclaude
andcommitted
Offer only a Jython dialect: the server moves to code-lsp-jython
JythonDialect is now a ScriptDialect plugin, showing Jython scripts to scijava-code-lsp-jython's server as plain Jython. Jackson is pinned to 2.19.2, which code-lsp-jedi now brings in. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent ae27804 commit bb21017

23 files changed

Lines changed: 39 additions & 3827 deletions

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ lines of script code based on SciJava events.
1717
The Script Editor completes code in Jython scripts: Java classes, their
1818
members and constructors (with their overloads), imports, the script's `#@`
1919
parameters and, in a live interpreter, its variables. This is Jython's own
20-
completion, which knows Java exactly.
20+
completion, which knows Java exactly, by `scijava-code-lsp-jython`'s language
21+
server; this plugin shows it the scripts as plain Jython (`JythonDialect`),
22+
their parameters declared.
2123

2224
A Python language server (jedi-language-server, offered by
2325
`scijava-code-lsp-jedi`, which runs it in a small environment of its own,

‎pom.xml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,11 @@
8686

8787
<scijava-common.version>2.101.0</scijava-common.version>
8888
<scijava-code-lsp.version>0.1.0-SNAPSHOT</scijava-code-lsp.version>
89-
<scijava-code-lsp-jedi.version>0.1.0-SNAPSHOT</scijava-code-lsp-jedi.version>
89+
<scijava-code-lsp-jython.version>0.1.0-SNAPSHOT</scijava-code-lsp-jython.version>
9090
<!-- NB: As Fiji ships, for scijava-code-lsp (lsp4j); newer than pom-scijava 34's. -->
9191
<gson.version>2.14.0</gson.version>
92+
<!-- NB: As scijava-code-lsp-jedi is built with; newer than pom-scijava 34's. -->
93+
<jackson.version>2.19.2</jackson.version>
9294

9395
<license.licenseName>bsd_2</license.licenseName>
9496
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
@@ -111,8 +113,8 @@
111113
</dependency>
112114
<dependency>
113115
<groupId>org.scijava</groupId>
114-
<artifactId>scijava-code-lsp-jedi</artifactId>
115-
<version>${scijava-code-lsp-jedi.version}</version>
116+
<artifactId>scijava-code-lsp-jython</artifactId>
117+
<version>${scijava-code-lsp-jython.version}</version>
116118
<!-- NB: Its server is found as a plugin, not used directly. -->
117119
<scope>runtime</scope>
118120
</dependency>
@@ -122,11 +124,6 @@
122124
<groupId>org.python</groupId>
123125
<artifactId>jython-slim</artifactId>
124126
</dependency>
125-
<!-- Used by JythonScriptParser to walk the Jython AST. -->
126-
<dependency>
127-
<groupId>org.antlr</groupId>
128-
<artifactId>antlr-runtime</artifactId>
129-
</dependency>
130127

131128
<!-- Test dependencies -->
132129
<dependency>
@@ -142,9 +139,10 @@
142139
<artifactId>maven-surefire-plugin</artifactId>
143140
<configuration>
144141
<!--
145-
NB: Without jedi-language-server, whose environment would be built
146-
(needing network access, and minutes) as tests first complete code:
147-
they test Jython's own analysis.
142+
NB: Without jedi-language-server (which scijava-code-lsp-jython
143+
brings), whose environment would be built (needing network access,
144+
and minutes) as tests first complete code: they test Jython's own
145+
analysis.
148146
-->
149147
<classpathDependencyExcludes>
150148
<classpathDependencyExclude>org.scijava:scijava-code-lsp-jedi</classpathDependencyExclude>

‎src/main/java/org/scijava/plugins/scripting/jython/completion/ClassDotAutocompletions.java‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

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

Lines changed: 0 additions & 128 deletions
This file was deleted.

‎src/main/java/org/scijava/plugins/scripting/jython/completion/ConstructorAutocompletions.java‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎src/main/java/org/scijava/plugins/scripting/jython/completion/DefVarDotAutocompletions.java‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)