Skip to content
This repository was archived by the owner on Apr 21, 2023. It is now read-only.

Commit 7050b2f

Browse files
cdietrichcdietrich
authored
Merge pull request #1375 from eclipse/cd_lsp4j090Snapshot
[#1244] lsp4j 0.9.0
2 parents fb5344d + 0766f69 commit 7050b2f

File tree

8 files changed

+39
-36
lines changed

8 files changed

+39
-36
lines changed

‎org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
1414
org.eclipse.core.runtime;bundle-version="3.13.0",
1515
org.eclipse.xtext.ide,
1616
org.junit;bundle-version="4.12.0",
17-
org.eclipse.lsp4j;bundle-version="[0.8.1,0.9.0)";resolution:=optional,
18-
org.eclipse.lsp4j.jsonrpc;bundle-version="[0.8.1,0.9.0)";resolution:=optional,
17+
org.eclipse.lsp4j;bundle-version="[0.9.0,0.10.0)";resolution:=optional,
18+
org.eclipse.lsp4j.jsonrpc;bundle-version="[0.9.0,0.10.0)";resolution:=optional,
1919
org.eclipse.xtext.testlanguages,
2020
org.eclipse.xtext.testlanguages.ide
2121
Import-Package: org.apache.log4j;version="1.2.15"

‎org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/signatureHelp/SignatureHelpServiceImpl.xtend

+3-7
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ import java.util.List
1515
import org.eclipse.emf.ecore.EObject
1616
import org.eclipse.lsp4j.ParameterInformation
1717
import org.eclipse.lsp4j.SignatureHelp
18+
import org.eclipse.lsp4j.SignatureHelpParams
1819
import org.eclipse.lsp4j.SignatureInformation
1920
import org.eclipse.xtext.EcoreUtil2
21+
import org.eclipse.xtext.ide.server.Document
2022
import org.eclipse.xtext.ide.server.signatureHelp.ISignatureHelpService
2123
import org.eclipse.xtext.ide.tests.testlanguage.testLanguage.Operation
2224
import org.eclipse.xtext.ide.tests.testlanguage.testLanguage.OperationCall
@@ -29,8 +31,6 @@ import org.eclipse.xtext.nodemodel.util.NodeModelUtils
2931
import org.eclipse.xtext.resource.EObjectAtOffsetHelper
3032
import org.eclipse.xtext.resource.XtextResource
3133
import org.eclipse.xtext.scoping.IScopeProvider
32-
import org.eclipse.xtext.ide.server.Document
33-
import org.eclipse.lsp4j.TextDocumentPositionParams
3434
import org.eclipse.xtext.util.CancelIndicator
3535

3636
/**
@@ -71,12 +71,8 @@ class SignatureHelpServiceImpl implements ISignatureHelpService {
7171

7272
extension TestLanguagePackage = TestLanguagePackage.eINSTANCE;
7373

74-
override getSignatureHelp(Document document, XtextResource resource, TextDocumentPositionParams params, CancelIndicator cancelIndicator) {
74+
override getSignatureHelp(Document document, XtextResource resource, SignatureHelpParams params, CancelIndicator cancelIndicator) {
7575
val offset = document.getOffSet(params.position)
76-
return getSignatureHelp(resource, offset)
77-
}
78-
79-
override getSignatureHelp(XtextResource resource, int offset) {
8076

8177
Preconditions.checkNotNull(resource, "resource");
8278
Preconditions.checkArgument(offset >= 0, "offset >= 0. Was: " + offset);

‎org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/signatureHelp/SignatureHelpServiceImpl.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import org.eclipse.emf.ecore.EObject;
2020
import org.eclipse.lsp4j.ParameterInformation;
2121
import org.eclipse.lsp4j.SignatureHelp;
22+
import org.eclipse.lsp4j.SignatureHelpParams;
2223
import org.eclipse.lsp4j.SignatureInformation;
23-
import org.eclipse.lsp4j.TextDocumentPositionParams;
2424
import org.eclipse.xtend2.lib.StringConcatenation;
2525
import org.eclipse.xtext.EcoreUtil2;
2626
import org.eclipse.xtext.ide.server.Document;
@@ -100,13 +100,8 @@ public class SignatureHelpServiceImpl implements ISignatureHelpService {
100100
private TestLanguagePackage _testLanguagePackage = TestLanguagePackage.eINSTANCE;
101101

102102
@Override
103-
public SignatureHelp getSignatureHelp(final Document document, final XtextResource resource, final TextDocumentPositionParams params, final CancelIndicator cancelIndicator) {
103+
public SignatureHelp getSignatureHelp(final Document document, final XtextResource resource, final SignatureHelpParams params, final CancelIndicator cancelIndicator) {
104104
final int offset = document.getOffSet(params.getPosition());
105-
return this.getSignatureHelp(resource, offset);
106-
}
107-
108-
@Override
109-
public SignatureHelp getSignatureHelp(final XtextResource resource, final int offset) {
110105
Preconditions.<XtextResource>checkNotNull(resource, "resource");
111106
Preconditions.checkArgument((offset >= 0), ("offset >= 0. Was: " + Integer.valueOf(offset)));
112107
final EObject object = this.offsetHelper.resolveContainedElementAt(resource, offset);

‎org.eclipse.xtext.ide/META-INF/MANIFEST.MF

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
1111
org.eclipse.xtend.lib,
1212
org.eclipse.core.runtime;bundle-version="3.13.0";resolution:=optional;x-installation:=greedy,
1313
org.eclipse.equinox.common;bundle-version="3.9.0",
14-
org.eclipse.lsp4j;bundle-version="[0.8.1,0.9.0)";resolution:=optional,
15-
org.eclipse.lsp4j.jsonrpc;bundle-version="[0.8.1,0.9.0)";resolution:=optional,
14+
org.eclipse.lsp4j;bundle-version="[0.9.0,0.10.0)";resolution:=optional,
15+
org.eclipse.lsp4j.jsonrpc;bundle-version="[0.9.0,0.10.0)";resolution:=optional,
1616
org.eclipse.emf.ecore.change;bundle-version="[2.14.0,3)"
1717
Import-Package: org.apache.log4j;version="1.2.15"
1818
Export-Package: org.eclipse.xtext.ide;x-friends:="org.eclipse.xtend.ide,

‎org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
import org.eclipse.lsp4j.ServerCapabilities;
7373
import org.eclipse.lsp4j.SignatureHelp;
7474
import org.eclipse.lsp4j.SignatureHelpOptions;
75+
import org.eclipse.lsp4j.SignatureHelpParams;
7576
import org.eclipse.lsp4j.SymbolInformation;
7677
import org.eclipse.lsp4j.TextDocumentClientCapabilities;
7778
import org.eclipse.lsp4j.TextDocumentIdentifier;
@@ -697,22 +698,22 @@ public CompletableFuture<CompletionItem> resolveCompletionItem(CompletionItem un
697698
}
698699

699700
@Override
700-
public CompletableFuture<SignatureHelp> signatureHelp(TextDocumentPositionParams params) {
701+
public CompletableFuture<SignatureHelp> signatureHelp(SignatureHelpParams params) {
701702
return requestManager.runRead((cancelIndicator) -> signatureHelp(params, cancelIndicator));
702703
}
703704

704705
/**
705706
* Compute the signature help. Executed in a read request.
706707
* @since 2.20
707708
*/
708-
protected SignatureHelp signatureHelp(TextDocumentPositionParams params, CancelIndicator cancelIndicator) {
709+
protected SignatureHelp signatureHelp(SignatureHelpParams params, CancelIndicator cancelIndicator) {
709710
URI uri = getURI(params);
710711
ISignatureHelpService helper = getService(uri, ISignatureHelpService.class);
711712
if (helper == null) {
712713
return ISignatureHelpService.EMPTY;
713714
}
714715
return workspaceManager.doRead(uri,
715-
(doc, resource) -> helper.getSignatureHelp(doc, resource, params, cancelIndicator));
716+
(doc, resource) -> helper.getSignatureHelp(doc, resource, (TextDocumentPositionParams) params, cancelIndicator));
716717
}
717718

718719
@Override

‎org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/signatureHelp/ISignatureHelpService.java

+18-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2016, 2017 TypeFox GmbH (http://www.typefox.io) and others.
2+
* Copyright (c) 2016, 2020 TypeFox GmbH (http://www.typefox.io) and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v1.0
55
* which accompanies this distribution, and is available at
@@ -10,6 +10,7 @@
1010
import static java.util.Collections.*;
1111

1212
import org.eclipse.lsp4j.SignatureHelp;
13+
import org.eclipse.lsp4j.SignatureHelpParams;
1314
import org.eclipse.lsp4j.TextDocumentPositionParams;
1415
import org.eclipse.xtext.ide.server.Document;
1516
import org.eclipse.xtext.resource.XtextResource;
@@ -32,7 +33,18 @@ public interface ISignatureHelpService {
3233
*/
3334
SignatureHelp EMPTY = new SignatureHelp(emptyList(), null, null);
3435

35-
SignatureHelp getSignatureHelp(Document document, XtextResource resource, TextDocumentPositionParams params, CancelIndicator cancelIndicator);
36+
/**
37+
* @deprecated please override/call {@link #getSignatureHelp(Document, XtextResource, SignatureHelpParams, CancelIndicator)} instead.
38+
*/
39+
@Deprecated
40+
default SignatureHelp getSignatureHelp(Document document, XtextResource resource, TextDocumentPositionParams params, CancelIndicator cancelIndicator) {
41+
if (params instanceof SignatureHelpParams) {
42+
return getSignatureHelp(document, resource, (SignatureHelpParams) params, cancelIndicator);
43+
}
44+
throw new IllegalArgumentException("params is not a SignatureHelpParams");
45+
}
46+
47+
SignatureHelp getSignatureHelp(Document document, XtextResource resource, SignatureHelpParams params, CancelIndicator cancelIndicator);
3648

3749
/**
3850
* Returns with a {@link SignatureHelp signature help} instance for a
@@ -47,7 +59,9 @@ public interface ISignatureHelpService {
4759
* @return a signature help instance.
4860
*/
4961
@Deprecated
50-
SignatureHelp getSignatureHelp(final XtextResource resource, final int offset);
62+
default SignatureHelp getSignatureHelp(final XtextResource resource, final int offset) {
63+
return EMPTY;
64+
}
5165

5266
/**
5367
* NOOP {@link ISignatureHelpService signature help service} implementation.
@@ -56,14 +70,9 @@ public interface ISignatureHelpService {
5670
*/
5771
@Singleton
5872
public static class Noop implements ISignatureHelpService {
59-
60-
@Override
61-
public SignatureHelp getSignatureHelp(final XtextResource resource, final int offset) {
62-
return EMPTY;
63-
}
6473

6574
@Override
66-
public SignatureHelp getSignatureHelp(Document document, XtextResource resource, TextDocumentPositionParams params, CancelIndicator cancelIndicator) {
75+
public SignatureHelp getSignatureHelp(Document document, XtextResource resource, SignatureHelpParams params, CancelIndicator cancelIndicator) {
6776
return EMPTY;
6877
}
6978

‎org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractLanguageServerTest.xtend

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2016, 2019 TypeFox GmbH (http://www.typefox.io) and others.
2+
* Copyright (c) 2016, 2020 TypeFox GmbH (http://www.typefox.io) and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v1.0
55
* which accompanies this distribution, and is available at
@@ -84,6 +84,7 @@ import org.junit.jupiter.api.BeforeEach
8484

8585
import static extension org.eclipse.lsp4j.util.Ranges.containsRange
8686
import static extension org.eclipse.xtext.util.Strings.*
87+
import org.eclipse.lsp4j.SignatureHelpParams
8788

8889
/**
8990
* @author Sven Efftinge - Initial contribution and API
@@ -549,7 +550,7 @@ abstract class AbstractLanguageServerTest implements Endpoint {
549550
550551
val fileUri = initializeContext(configuration).uri
551552
552-
val signatureHelpFuture = languageServer.signatureHelp(new TextDocumentPositionParams => [
553+
val signatureHelpFuture = languageServer.signatureHelp(new SignatureHelpParams => [
553554
textDocument = new TextDocumentIdentifier(fileUri)
554555
position = new Position(line, column)
555556
]);

‎org.eclipse.xtext.testing/xtend-gen/org/eclipse/xtext/testing/AbstractLanguageServerTest.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2016, 2019 TypeFox GmbH (http://www.typefox.io) and others.
2+
* Copyright (c) 2016, 2020 TypeFox GmbH (http://www.typefox.io) and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v1.0
55
* which accompanies this distribution, and is available at
@@ -64,6 +64,7 @@
6464
import org.eclipse.lsp4j.SemanticHighlightingInformation;
6565
import org.eclipse.lsp4j.SemanticHighlightingParams;
6666
import org.eclipse.lsp4j.SignatureHelp;
67+
import org.eclipse.lsp4j.SignatureHelpParams;
6768
import org.eclipse.lsp4j.SignatureInformation;
6869
import org.eclipse.lsp4j.SymbolInformation;
6970
import org.eclipse.lsp4j.TextDocumentClientCapabilities;
@@ -1149,16 +1150,16 @@ protected void testSignatureHelp(final Procedure1<? super SignatureHelpConfigura
11491150
configuration.setFilePath(("MyModel." + this.fileExtension));
11501151
configurator.apply(configuration);
11511152
final String fileUri = this.initializeContext(configuration).getUri();
1152-
TextDocumentPositionParams _textDocumentPositionParams = new TextDocumentPositionParams();
1153-
final Procedure1<TextDocumentPositionParams> _function = (TextDocumentPositionParams it) -> {
1153+
SignatureHelpParams _signatureHelpParams = new SignatureHelpParams();
1154+
final Procedure1<SignatureHelpParams> _function = (SignatureHelpParams it) -> {
11541155
TextDocumentIdentifier _textDocumentIdentifier = new TextDocumentIdentifier(fileUri);
11551156
it.setTextDocument(_textDocumentIdentifier);
11561157
int _line = configuration.getLine();
11571158
int _column = configuration.getColumn();
11581159
Position _position = new Position(_line, _column);
11591160
it.setPosition(_position);
11601161
};
1161-
TextDocumentPositionParams _doubleArrow = ObjectExtensions.<TextDocumentPositionParams>operator_doubleArrow(_textDocumentPositionParams, _function);
1162+
SignatureHelpParams _doubleArrow = ObjectExtensions.<SignatureHelpParams>operator_doubleArrow(_signatureHelpParams, _function);
11621163
final CompletableFuture<SignatureHelp> signatureHelpFuture = this.languageServer.signatureHelp(_doubleArrow);
11631164
final SignatureHelp signatureHelp = signatureHelpFuture.get();
11641165
Procedure1<? super SignatureHelp> _assertSignatureHelp = configuration.getAssertSignatureHelp();

0 commit comments

Comments
 (0)