Moved from lsp4e 0.13.0 to 0.14.0.
Change-Id: Ib360948c9abb20aa9cb7872eba9584adce122be3
diff --git a/plugins/org.eclipse.acceleo.aql.ls/src/org/eclipse/acceleo/aql/ls/services/textdocument/AcceleoTextDocumentService.java b/plugins/org.eclipse.acceleo.aql.ls/src/org/eclipse/acceleo/aql/ls/services/textdocument/AcceleoTextDocumentService.java
index d552537..019affb 100644
--- a/plugins/org.eclipse.acceleo.aql.ls/src/org/eclipse/acceleo/aql/ls/services/textdocument/AcceleoTextDocumentService.java
+++ b/plugins/org.eclipse.acceleo.aql.ls/src/org/eclipse/acceleo/aql/ls/services/textdocument/AcceleoTextDocumentService.java
@@ -34,6 +34,8 @@
import org.eclipse.lsp4j.CompletionItem;
import org.eclipse.lsp4j.CompletionList;
import org.eclipse.lsp4j.CompletionParams;
+import org.eclipse.lsp4j.DeclarationParams;
+import org.eclipse.lsp4j.DefinitionParams;
import org.eclipse.lsp4j.Diagnostic;
import org.eclipse.lsp4j.DidChangeTextDocumentParams;
import org.eclipse.lsp4j.DidCloseTextDocumentParams;
@@ -47,7 +49,6 @@
import org.eclipse.lsp4j.PublishDiagnosticsParams;
import org.eclipse.lsp4j.SymbolInformation;
import org.eclipse.lsp4j.TextDocumentContentChangeEvent;
-import org.eclipse.lsp4j.TextDocumentPositionParams;
import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
import org.eclipse.lsp4j.jsonrpc.messages.Either;
import org.eclipse.lsp4j.services.LanguageClient;
@@ -296,7 +297,7 @@
@Override
public CompletableFuture<Either<List<? extends Location>, List<? extends LocationLink>>> declaration(
- TextDocumentPositionParams params) {
+ DeclarationParams params) {
final URI textDocumentUri = AcceleoLanguageServerServicesUtils.toUri(params.getTextDocument()
.getUri());
checkDocumentIsOpened(textDocumentUri);
@@ -335,7 +336,7 @@
@Override
public CompletableFuture<Either<List<? extends Location>, List<? extends LocationLink>>> definition(
- TextDocumentPositionParams params) {
+ DefinitionParams params) {
final URI textDocumentUri = AcceleoLanguageServerServicesUtils.toUri(params.getTextDocument()
.getUri());
checkDocumentIsOpened(textDocumentUri);
diff --git a/plugins/org.eclipse.acceleo.debug.ls/src/org/eclipse/acceleo/debug/ls/DSLDebugServer.java b/plugins/org.eclipse.acceleo.debug.ls/src/org/eclipse/acceleo/debug/ls/DSLDebugServer.java
index 8b66913..aab1e95 100644
--- a/plugins/org.eclipse.acceleo.debug.ls/src/org/eclipse/acceleo/debug/ls/DSLDebugServer.java
+++ b/plugins/org.eclipse.acceleo.debug.ls/src/org/eclipse/acceleo/debug/ls/DSLDebugServer.java
@@ -143,7 +143,7 @@
/**
* Mapping from a frame ID to its variables.
*/
- private final Map<Long, Map<String, Object>> frameIDToVariables = new HashMap<Long, Map<String, Object>>();
+ private final Map<Integer, Map<String, Object>> frameIDToVariables = new HashMap<Integer, Map<String, Object>>();
/**
* The EMF {@link ILabelProvider}.
@@ -270,10 +270,10 @@
source.setPath(dslSource.getPath());
responseBreakpoint.setVerified(true);
responseBreakpoint.setSource(source);
- responseBreakpoint.setLine(dslSource.getStartLine());
- responseBreakpoint.setColumn(dslSource.getStartColumn());
- responseBreakpoint.setEndLine(dslSource.getEndLine());
- responseBreakpoint.setEndColumn(dslSource.getEndColumn());
+ responseBreakpoint.setLine((int)dslSource.getStartLine());
+ responseBreakpoint.setColumn((int)dslSource.getStartColumn());
+ responseBreakpoint.setEndLine((int)dslSource.getEndLine());
+ responseBreakpoint.setEndColumn((int)dslSource.getEndColumn());
responseBreakpoints.add(responseBreakpoint);
}
}
@@ -397,7 +397,7 @@
return CompletableFuture.runAsync(new Runnable() {
public void run() {
- debugger.suspend(args.getThreadId());
+ debugger.suspend((long)args.getThreadId());
}
});
}
@@ -416,7 +416,7 @@
public ContinueResponse get() {
final ContinueResponse res = new ContinueResponse();
- debugger.resume(args.getThreadId());
+ debugger.resume((long)args.getThreadId());
res.setAllThreadsContinued(false);
return res;
@@ -434,7 +434,7 @@
return CompletableFuture.runAsync(new Runnable() {
public void run() {
- debugger.stepOver(args.getThreadId());
+ debugger.stepOver((long)args.getThreadId());
}
});
}
@@ -449,7 +449,7 @@
return CompletableFuture.runAsync(new Runnable() {
public void run() {
- debugger.stepInto(args.getThreadId());
+ debugger.stepInto((long)args.getThreadId());
}
});
}
@@ -485,8 +485,8 @@
return CompletableFuture.runAsync(new Runnable() {
public void run() {
- for (Long threadId : args.getThreadIds()) {
- debugger.terminate(threadId);
+ for (Integer threadId : args.getThreadIds()) {
+ debugger.terminate((long)threadId);
}
}
});
@@ -774,10 +774,10 @@
final StackTraceResponse res = new StackTraceResponse();
final List<StackFrame> resFrames = new ArrayList<StackFrame>();
- Deque<org.eclipse.acceleo.debug.util.StackFrame> stackFrames = debugger.getStackFrame(args
+ Deque<org.eclipse.acceleo.debug.util.StackFrame> stackFrames = debugger.getStackFrame((long)args
.getThreadId());
final Iterator<org.eclipse.acceleo.debug.util.StackFrame> it = stackFrames.descendingIterator();
- long id = 0;
+ int id = 0;
while (it.hasNext()) {
final org.eclipse.acceleo.debug.util.StackFrame currentFrame = it.next();
final StackFrame resFrame = new StackFrame();
@@ -789,10 +789,10 @@
// TODO ? resFrame.setModuleId(moduleId);
final DSLSource dslSource = debugger.getSource(currentFrame.getInstruction());
if (dslSource != null) {
- resFrame.setLine(dslSource.getStartLine());
- resFrame.setColumn(dslSource.getStartColumn());
- resFrame.setEndLine(dslSource.getEndLine());
- resFrame.setEndColumn(dslSource.getEndColumn());
+ resFrame.setLine((int)dslSource.getStartLine());
+ resFrame.setColumn((int)dslSource.getStartColumn());
+ resFrame.setEndLine((int)dslSource.getEndLine());
+ resFrame.setEndColumn((int)dslSource.getEndColumn());
final Source source = new Source();
source.setName(dslSource.getPath());
source.setPath(dslSource.getPath());
@@ -801,7 +801,7 @@
id++; // TODO id
}
}
- res.setTotalFrames((long)resFrames.size());
+ res.setTotalFrames(resFrames.size());
res.setStackFrames(resFrames.toArray(new StackFrame[resFrames.size()]));
return res;
@@ -822,7 +822,7 @@
final List<Thread> threads = new ArrayList<Thread>();
for (Entry<Long, String> entry : debugger.getThreads().entrySet()) {
final Thread thread = new Thread();
- thread.setId(entry.getKey());
+ thread.setId(entry.getKey().intValue());
thread.setName(entry.getValue());
threads.add(thread);
}
@@ -866,7 +866,7 @@
return CompletableFuture.runAsync(new Runnable() {
public void run() {
- debugger.stepReturn(args.getThreadId());
+ debugger.stepReturn((long)args.getThreadId());
}
});
}
@@ -944,7 +944,7 @@
protected void notifyClientStepIntoResumingReply(StepIntoResumingReply resumingReply) {
final ContinuedEventArguments eventArguments = new ContinuedEventArguments();
- eventArguments.setThreadId(Long.valueOf(resumingReply.getThreadID()));
+ eventArguments.setThreadId(resumingReply.getThreadID().intValue());
eventArguments.setAllThreadsContinued(false);
// client.continued(eventArguments);
@@ -954,7 +954,7 @@
protected void notifyClientStepOverResumingReply(StepOverResumingReply resumingReply) {
final ContinuedEventArguments eventArguments = new ContinuedEventArguments();
- eventArguments.setThreadId(Long.valueOf(resumingReply.getThreadID()));
+ eventArguments.setThreadId(resumingReply.getThreadID().intValue());
eventArguments.setAllThreadsContinued(false);
// client.continued(eventArguments);
@@ -964,7 +964,7 @@
protected void notifyClientStepReturnResumingReply(StepReturnResumingReply resumingReply) {
final ContinuedEventArguments eventArguments = new ContinuedEventArguments();
- eventArguments.setThreadId(Long.valueOf(resumingReply.getThreadID()));
+ eventArguments.setThreadId(resumingReply.getThreadID().intValue());
eventArguments.setAllThreadsContinued(false);
// client.continued(eventArguments);
@@ -974,7 +974,7 @@
protected void notifyClientResumedReply(ResumingReply resumingReply) {
final ContinuedEventArguments eventArguments = new ContinuedEventArguments();
- eventArguments.setThreadId(Long.valueOf(resumingReply.getThreadID()));
+ eventArguments.setThreadId(resumingReply.getThreadID().intValue());
eventArguments.setAllThreadsContinued(false);
// client.continued(eventArguments);
@@ -984,7 +984,7 @@
protected void notifyClientSpawnRunningThreadReply(SpawnRunningThreadReply spawnThreadReply) {
final ThreadEventArguments eventArguments = new ThreadEventArguments();
- eventArguments.setThreadId(Long.valueOf(spawnThreadReply.getThreadID()));
+ eventArguments.setThreadId(spawnThreadReply.getThreadID().intValue());
eventArguments.setReason(ThreadEventArgumentsReason.STARTED);
client.thread(eventArguments);
@@ -995,7 +995,7 @@
if (terminatedReply.getThreadID() != null) {
final ThreadEventArguments eventArguments = new ThreadEventArguments();
- eventArguments.setThreadId(Long.valueOf(terminatedReply.getThreadID()));
+ eventArguments.setThreadId(terminatedReply.getThreadID().intValue());
eventArguments.setReason(ThreadEventArgumentsReason.EXITED);
client.thread(eventArguments);
@@ -1012,7 +1012,7 @@
protected void notifyClientSteppedReply(SteppedReply suspendReply) {
final StoppedEventArguments argument = new StoppedEventArguments();
- argument.setThreadId(Long.valueOf(suspendReply.getThreadID()));
+ argument.setThreadId(suspendReply.getThreadID().intValue());
argument.setDescription("Paused after a step.");
argument.setPreserveFocusHint(true);
argument.setReason(StoppedEventArgumentsReason.STEP);
@@ -1025,7 +1025,7 @@
protected void notifyClientBreakpointReply(BreakpointReply suspendReply) {
final StoppedEventArguments argument = new StoppedEventArguments();
- argument.setThreadId(Long.valueOf(suspendReply.getThreadID()));
+ argument.setThreadId(suspendReply.getThreadID().intValue());
argument.setDescription("Paused after hitting a breakpoint.");
argument.setPreserveFocusHint(true);
argument.setReason(StoppedEventArgumentsReason.BREAKPOINT);
@@ -1038,7 +1038,7 @@
protected void notifyClientSuspendedReply(SuspendedReply suspendReply) {
final StoppedEventArguments argument = new StoppedEventArguments();
- argument.setThreadId(Long.valueOf(suspendReply.getThreadID()));
+ argument.setThreadId(suspendReply.getThreadID().intValue());
argument.setDescription("Paused after a client request.");
argument.setPreserveFocusHint(true);
argument.setReason(StoppedEventArgumentsReason.PAUSE);
diff --git a/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.target b/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.target
index 1ff9e4c..d87de94 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.target
+++ b/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Acceleo 2019-09 Target Platform" sequenceNumber="1622030916">
+<target name="Acceleo 2019-09 Target Platform" sequenceNumber="1622635963">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
@@ -24,7 +24,11 @@
<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
<unit id="a.jre.javase" version="0.0.0"/>
<unit id="config.a.jre.javase" version="0.0.0"/>
- <repository location="http://download.eclipse.org/lsp4e/releases/0.13.0/"/>
+ <repository location="http://download.eclipse.org/lsp4e/releases/0.14.0/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.mylyn.wikitext.markdown" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.rcptt.platform.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.target b/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.target
index e87ca8c..aabc28e 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.target
+++ b/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Acceleo 2020-09 Target Platform" sequenceNumber="1622030919">
+<target name="Acceleo 2020-09 Target Platform" sequenceNumber="1622635963">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
@@ -24,7 +24,11 @@
<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
<unit id="a.jre.javase" version="0.0.0"/>
<unit id="config.a.jre.javase" version="0.0.0"/>
- <repository location="http://download.eclipse.org/lsp4e/releases/0.13.0/"/>
+ <repository location="http://download.eclipse.org/lsp4e/releases/0.14.0/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.mylyn.wikitext.markdown" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.rcptt.platform.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.acceleo.targetplatforms/common/lsp.tpd b/releng/org.eclipse.acceleo.targetplatforms/common/lsp.tpd
index 072d5ce..17a5f62 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/common/lsp.tpd
+++ b/releng/org.eclipse.acceleo.targetplatforms/common/lsp.tpd
@@ -4,7 +4,7 @@
with source, requirements
-location "http://download.eclipse.org/lsp4e/releases/0.13.0/" {
+location "http://download.eclipse.org/lsp4e/releases/0.14.0/" {
org.eclipse.lsp4j lazy
org.eclipse.lsp4j.debug lazy
org.eclipse.lsp4j.jsonrpc lazy
@@ -17,3 +17,7 @@
a.jre.javase lazy
config.a.jre.javase lazy
}
+
+location "https://download.eclipse.org/mylyn/docs/releases/3.0.36/" {
+ org.eclipse.mylyn.wikitext.markdown lazy
+}
\ No newline at end of file
