mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Bug 559725: Update to LSP4J 0.9.0 with its breaking API changes

Browse source 
Change-Id: Idc4b9aca78be647824e642d168d0502db78080bb
This commit is contained in:
Jonah Graham 2020-01-28 14:48:14 -05:00
parent c775a210e1
commit 15e569164c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debug/org.eclipse.cdt.debug.dap/META-INF/MANIFEST.MF
View file

@ -9,9 +9,9 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.lsp4j.jsonrpc,
org.eclipse.cdt.launch,
org.eclipse.lsp4e.debug;bundle-version="0.11.0",
org.eclipse.lsp4e.debug;bundle-version="0.12.0",
org.eclipse.debug.ui,
org.eclipse.lsp4j.debug,
org.eclipse.lsp4j.debug;bundle-version="0.9.0",
org.eclipse.lsp4j.jsonrpc.debug,
org.eclipse.xtext.xbase.lib,
org.eclipse.cdt.dsf.gdb;bundle-version="5.7.200",

4
debug/org.eclipse.cdt.debug.dap/src/org/eclipse/cdt/debug/dap/DapDisassemblyBackend.java
View file

@ -125,7 +125,7 @@ public class DapDisassemblyBackend extends AbstractDisassemblyBackend {
int lines, boolean mixed, boolean showSymbols, boolean showDisassembly, int linesHint) {
CDTDisassembleArguments args = new CDTDisassembleArguments();
args.setMemoryReference("0x" + startAddress.toString(16)); //$NON-NLS-1$
args.setInstructionCount((long) lines);
args.setInstructionCount(lines);
args.setEndMemoryReference("1+0x" + endAddress.toString(16)); //$NON-NLS-1$
CompletableFuture<DisassembleResponse> future = dspStackFrame.getDebugProtocolServer().disassemble(args);
future.thenAcceptAsync(res -> {
@ -188,7 +188,7 @@ public class DapDisassemblyBackend extends AbstractDisassemblyBackend {
if (location != null) {
file = location.getPath();
}
Long line = instruction.getLine();
Integer line = instruction.getLine();
int lineNumber = (line == null ? 0 : line.intValue()) - 1;
BigInteger address = getAddress(instruction);
if (startAddress == null) {