5050import org .eclipse .lsp4j .TextDocumentItem ;
5151import org .junit .Test ;
5252import org .scijava .Context ;
53- import org .scijava .code .api .ClassIndex ;
54- import org .scijava .code .api .CodeCompletionService ;
53+ import org .scijava .code .lsp .ClassIndex ;
5554import org .scijava .code .lsp .LanguageServerService ;
56- import org .scijava .code .lsp .LspClient ;
55+ import org .scijava .code .lsp .Positions ;
5756import org .scijava .code .lsp .MergedLanguageServer ;
5857import org .scijava .code .lsp .RatedSignatureInformation ;
5958import 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