From 15e569164cc34a1752fa2bb4369571af325eb88f Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Tue, 28 Jan 2020 14:48:14 -0500 Subject: [PATCH] Bug 559725: Update to LSP4J 0.9.0 with its breaking API changes Change-Id: Idc4b9aca78be647824e642d168d0502db78080bb --- debug/org.eclipse.cdt.debug.dap/META-INF/MANIFEST.MF | 4 ++-- .../src/org/eclipse/cdt/debug/dap/DapDisassemblyBackend.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.dap/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.dap/META-INF/MANIFEST.MF index 18d0e48b89d..666dbad90d5 100644 --- a/debug/org.eclipse.cdt.debug.dap/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.dap/META-INF/MANIFEST.MF @@ -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", diff --git a/debug/org.eclipse.cdt.debug.dap/src/org/eclipse/cdt/debug/dap/DapDisassemblyBackend.java b/debug/org.eclipse.cdt.debug.dap/src/org/eclipse/cdt/debug/dap/DapDisassemblyBackend.java index 1ee81839428..7e02cae18aa 100644 --- a/debug/org.eclipse.cdt.debug.dap/src/org/eclipse/cdt/debug/dap/DapDisassemblyBackend.java +++ b/debug/org.eclipse.cdt.debug.dap/src/org/eclipse/cdt/debug/dap/DapDisassemblyBackend.java @@ -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 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) {