diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/SLInspectDebugTest.java b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/SLInspectDebugTest.java index c5efd3660e9f..06e53410904f 100644 --- a/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/SLInspectDebugTest.java +++ b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/SLInspectDebugTest.java @@ -310,7 +310,7 @@ public void testStepping() throws Exception { "{\"name\":\"global\",\"type\":\"global\",\"object\":{\"description\":\"global\",\"type\":\"object\",\"objectId\":\"10\"}}]," + "\"this\":null," + "\"functionLocation\":{\"scriptId\":\"1\",\"columnNumber\":9,\"lineNumber\":0}," + - "\"location\":{\"scriptId\":\"1\",\"columnNumber\":19,\"lineNumber\":2}," + + "\"location\":{\"scriptId\":\"1\",\"columnNumber\":20,\"lineNumber\":2}," + "\"url\":\"" + slTestURI + "\"}]}}\n" )); tester.sendMessage("{\"id\":100,\"method\":\"Debugger.stepOut\"}"); @@ -537,7 +537,7 @@ public void testBreakpointDeactivation() throws Exception { "{\"name\":\"global\",\"type\":\"global\",\"object\":{\"description\":\"global\",\"type\":\"object\",\"objectId\":\"24\"}}]," + "\"this\":null," + "\"functionLocation\":{\"scriptId\":\"1\",\"columnNumber\":9,\"lineNumber\":0}," + - "\"location\":{\"scriptId\":\"1\",\"columnNumber\":15,\"lineNumber\":4}," + + "\"location\":{\"scriptId\":\"1\",\"columnNumber\":16,\"lineNumber\":4}," + "\"url\":\"" + srcURL + "\"}]}}\n" )); // Deactivate the breakpoints again: @@ -903,7 +903,7 @@ public void testNoInternalSources() throws Exception { "{\"name\":\"global\",\"type\":\"global\",\"object\":{\"description\":\"global\",\"type\":\"object\",\"objectId\":\"6\"}}]," + "\"this\":null," + "\"functionLocation\":{\"scriptId\":\"1\",\"columnNumber\":9,\"lineNumber\":0}," + - "\"location\":{\"scriptId\":\"1\",\"columnNumber\":0,\"lineNumber\":10}," + + "\"location\":{\"scriptId\":\"1\",\"columnNumber\":1,\"lineNumber\":10}," + "\"url\":\"" + publicSourceURI + "\"}]}}\n")); tester.sendMessage("{\"id\":51,\"method\":\"Debugger.stepOver\"}"); // at public:1 again (main -> public) @@ -995,7 +995,7 @@ public void testNoInternalSources() throws Exception { "{\"name\":\"global\",\"type\":\"global\",\"object\":{\"description\":\"global\",\"type\":\"object\",\"objectId\":\"22\"}}]," + "\"this\":null," + "\"functionLocation\":{\"scriptId\":\"1\",\"columnNumber\":9,\"lineNumber\":0}," + - "\"location\":{\"scriptId\":\"1\",\"columnNumber\":0,\"lineNumber\":10}," + + "\"location\":{\"scriptId\":\"1\",\"columnNumber\":1,\"lineNumber\":10}," + "\"url\":\"" + publicSourceURI + "\"}," + "{\"callFrameId\":\"1\",\"functionName\":\"public\"," + "\"scopeChain\":[{\"name\":\"public\",\"type\":\"local\",\"object\":{\"description\":\"public\",\"type\":\"object\",\"objectId\":\"23\"}}," + @@ -1015,7 +1015,7 @@ public void testNoInternalSources() throws Exception { "{\"name\":\"global\",\"type\":\"global\",\"object\":{\"description\":\"global\",\"type\":\"object\",\"objectId\":\"26\"}}]," + "\"this\":null," + "\"functionLocation\":{\"scriptId\":\"1\",\"columnNumber\":9,\"lineNumber\":0}," + - "\"location\":{\"scriptId\":\"1\",\"columnNumber\":26,\"lineNumber\":7}," + + "\"location\":{\"scriptId\":\"1\",\"columnNumber\":27,\"lineNumber\":7}," + "\"url\":\"" + publicSourceURI + "\"}," + "{\"callFrameId\":\"1\",\"functionName\":\"public\"," + "\"scopeChain\":[{\"name\":\"public\",\"type\":\"local\",\"object\":{\"description\":\"public\",\"type\":\"object\",\"objectId\":\"27\"}}," + @@ -1035,7 +1035,7 @@ public void testNoInternalSources() throws Exception { "{\"name\":\"global\",\"type\":\"global\",\"object\":{\"description\":\"global\",\"type\":\"object\",\"objectId\":\"30\"}}]," + "\"this\":null," + "\"functionLocation\":{\"scriptId\":\"1\",\"columnNumber\":9,\"lineNumber\":0}," + - "\"location\":{\"scriptId\":\"1\",\"columnNumber\":0,\"lineNumber\":10}," + + "\"location\":{\"scriptId\":\"1\",\"columnNumber\":1,\"lineNumber\":10}," + "\"url\":\"" + publicSourceURI + "\"}]}}\n")); tester.sendMessage("{\"id\":13,\"method\":\"Debugger.stepInto\"}"); // No more suspension (we're in internal sources) @@ -1294,7 +1294,7 @@ public void testRestartFrame() throws Exception { "{\"name\":\"global\",\"type\":\"global\",\"object\":{\"description\":\"global\",\"type\":\"object\",\"objectId\":\"10\"}}]," + "\"this\":null," + "\"functionLocation\":{\"scriptId\":\"1\",\"columnNumber\":9,\"lineNumber\":4}," + - "\"location\":{\"scriptId\":\"1\",\"columnNumber\":27,\"lineNumber\":8}," + + "\"location\":{\"scriptId\":\"1\",\"columnNumber\":28,\"lineNumber\":8}," + "\"url\":\"" + srcURL + "\"}," + "{\"callFrameId\":\"1\",\"functionName\":\"factorial\"," + "\"scopeChain\":[{\"name\":\"factorial\",\"type\":\"local\",\"object\":{\"description\":\"factorial\",\"type\":\"object\",\"objectId\":\"11\"}}," + @@ -1319,7 +1319,7 @@ public void testRestartFrame() throws Exception { "{\"name\":\"global\",\"type\":\"global\",\"object\":{\"description\":\"global\",\"type\":\"object\",\"objectId\":\"16\"}}]," + "\"this\":null," + "\"functionLocation\":{\"scriptId\":\"1\",\"columnNumber\":9,\"lineNumber\":0}," + - "\"location\":{\"scriptId\":\"1\",\"columnNumber\":13,\"lineNumber\":2}," + + "\"location\":{\"scriptId\":\"1\",\"columnNumber\":14,\"lineNumber\":2}," + "\"url\":\"" + srcURL + "\"}]}," + "\"id\":5}\n")); tester.sendMessage("{\"id\":6,\"method\":\"Debugger.resume\"}"); @@ -1449,7 +1449,7 @@ public void testReturnValue() throws Exception { "{\"name\":\"global\",\"type\":\"global\",\"object\":{\"description\":\"global\",\"type\":\"object\",\"objectId\":\"14\"}}]," + "\"this\":null," + "\"functionLocation\":{\"scriptId\":\"1\",\"columnNumber\":9,\"lineNumber\":10}," + - "\"location\":{\"scriptId\":\"1\",\"columnNumber\":0,\"lineNumber\":12}," + + "\"location\":{\"scriptId\":\"1\",\"columnNumber\":1,\"lineNumber\":12}," + "\"url\":\"" + slTestURI + "\"}," + "{\"callFrameId\":\"1\",\"functionName\":\"addThem\"," + "\"scopeChain\":[{\"name\":\"addThem\",\"type\":\"local\",\"object\":{\"description\":\"addThem\",\"type\":\"object\",\"objectId\":\"15\"}}," + @@ -1476,7 +1476,7 @@ public void testReturnValue() throws Exception { "{\"name\":\"global\",\"type\":\"global\",\"object\":{\"description\":\"global\",\"type\":\"object\",\"objectId\":\"20\"}}]," + "\"this\":null," + "\"functionLocation\":{\"scriptId\":\"1\",\"columnNumber\":9,\"lineNumber\":4}," + - "\"location\":{\"scriptId\":\"1\",\"columnNumber\":10,\"lineNumber\":5}," + + "\"location\":{\"scriptId\":\"1\",\"columnNumber\":11,\"lineNumber\":5}," + "\"url\":\"" + slTestURI + "\"}," + "{\"callFrameId\":\"1\",\"functionName\":\"main\"," + "\"scopeChain\":[{\"name\":\"main\",\"type\":\"local\",\"object\":{\"description\":\"main\",\"type\":\"object\",\"objectId\":\"21\"}}," + @@ -1550,7 +1550,7 @@ public void testReturnValue() throws Exception { "{\"name\":\"global\",\"type\":\"global\",\"object\":{\"description\":\"global\",\"type\":\"object\",\"objectId\":\"34\"}}]," + "\"this\":null," + "\"functionLocation\":{\"scriptId\":\"1\",\"columnNumber\":9,\"lineNumber\":4}," + - "\"location\":{\"scriptId\":\"1\",\"columnNumber\":10,\"lineNumber\":6}," + + "\"location\":{\"scriptId\":\"1\",\"columnNumber\":11,\"lineNumber\":6}," + "\"url\":\"" + slTestURI + "\"}," + "{\"callFrameId\":\"1\",\"functionName\":\"main\"," + "\"scopeChain\":[{\"name\":\"main\",\"type\":\"local\",\"object\":{\"description\":\"main\",\"type\":\"object\",\"objectId\":\"35\"}}," + @@ -1751,7 +1751,7 @@ public void testThrown() throws Exception { "{\"name\":\"global\",\"type\":\"global\",\"object\":{\"description\":\"global\",\"type\":\"object\",\"objectId\":\"2\"}}]," + "\"this\":null," + "\"functionLocation\":{\"scriptId\":\"1\",\"columnNumber\":9,\"lineNumber\":4}," + - "\"location\":{\"scriptId\":\"1\",\"columnNumber\":11,\"lineNumber\":5}," + + "\"location\":{\"scriptId\":\"1\",\"columnNumber\":12,\"lineNumber\":5}," + "\"url\":\"" + srcURL + "\"}," + "{\"callFrameId\":\"1\",\"functionName\":\"main\"," + "\"scopeChain\":[{\"name\":\"main\",\"type\":\"local\",\"object\":{\"description\":\"main\",\"type\":\"object\",\"objectId\":\"3\"}}," + diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/types/CallFrame.java b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/types/CallFrame.java index de31d0d80ea3..b6ae67df06cf 100644 --- a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/types/CallFrame.java +++ b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/types/CallFrame.java @@ -49,7 +49,7 @@ public CallFrame(DebugStackFrame frame, int depth, Script script, SourceSection if (anchor == SuspendAnchor.BEFORE) { this.location = new Location(script.getId(), sourceSection.getStartLine(), sourceSection.getStartColumn()); } else { - this.location = new Location(script.getId(), sourceSection.getEndLine(), sourceSection.getEndColumn()); + this.location = new Location(script.getId(), sourceSection.getEndLine(), sourceSection.getEndColumn() + 1); } if (functionSourceSection != null) { this.functionLocation = new Location(script.getId(), functionSourceSection.getStartLine(), functionSourceSection.getStartColumn()); diff --git a/tools/src/com.oracle.truffle.tools.dap.test/src/com/oracle/truffle/tools/dap/test/SimpleLanguageDAPTest.java b/tools/src/com.oracle.truffle.tools.dap.test/src/com/oracle/truffle/tools/dap/test/SimpleLanguageDAPTest.java index e6e96514fd36..77502e6987ba 100644 --- a/tools/src/com.oracle.truffle.tools.dap.test/src/com/oracle/truffle/tools/dap/test/SimpleLanguageDAPTest.java +++ b/tools/src/com.oracle.truffle.tools.dap.test/src/com/oracle/truffle/tools/dap/test/SimpleLanguageDAPTest.java @@ -257,7 +257,7 @@ public void testStepping() throws Exception { tester.sendMessage("{\"command\":\"threads\",\"type\":\"request\",\"seq\":14}"); tester.compareReceivedMessages("{\"success\":true,\"body\":{\"threads\":[{\"name\":\"testRunner\",\"id\":1}]},\"type\":\"response\",\"request_seq\":14,\"command\":\"threads\",\"seq\":26}"); tester.sendMessage("{\"command\":\"stackTrace\",\"arguments\":{\"threadId\":1},\"type\":\"request\",\"seq\":15}"); - tester.compareReceivedMessages("{\"success\":true,\"body\":{\"stackFrames\":[{\"line\":3,\"name\":\"main\",\"column\":20,\"id\":1,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}}],\"totalFrames\":1},\"type\":\"response\",\"request_seq\":15,\"command\":\"stackTrace\",\"seq\":27}"); + tester.compareReceivedMessages("{\"success\":true,\"body\":{\"stackFrames\":[{\"line\":3,\"name\":\"main\",\"column\":21,\"id\":1,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}}],\"totalFrames\":1},\"type\":\"response\",\"request_seq\":15,\"command\":\"stackTrace\",\"seq\":27}"); // Step out to finish: tester.sendMessage("{\"command\":\"stepOut\",\"arguments\":{\"threadId\":1},\"type\":\"request\",\"seq\":16}"); tester.compareReceivedMessages( @@ -774,7 +774,7 @@ public void testReturnValue() throws Exception { tester.sendMessage("{\"command\":\"threads\",\"type\":\"request\",\"seq\":14}"); tester.compareReceivedMessages("{\"success\":true,\"body\":{\"threads\":[{\"name\":\"testRunner\",\"id\":1}]},\"type\":\"response\",\"request_seq\":14,\"command\":\"threads\",\"seq\":26}"); tester.sendMessage("{\"command\":\"stackTrace\",\"arguments\":{\"threadId\":1},\"type\":\"request\",\"seq\":15}"); - tester.compareReceivedMessages("{\"success\":true,\"body\":{\"stackFrames\":[{\"line\":13,\"name\":\"fn\",\"column\":1,\"id\":1,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}},{\"line\":6,\"name\":\"addThem\",\"column\":7,\"id\":2,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}},{\"line\":2,\"name\":\"main\",\"column\":7,\"id\":3,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}}],\"totalFrames\":3},\"type\":\"response\",\"request_seq\":15,\"command\":\"stackTrace\",\"seq\":27}"); + tester.compareReceivedMessages("{\"success\":true,\"body\":{\"stackFrames\":[{\"line\":13,\"name\":\"fn\",\"column\":2,\"id\":1,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}},{\"line\":6,\"name\":\"addThem\",\"column\":7,\"id\":2,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}},{\"line\":2,\"name\":\"main\",\"column\":7,\"id\":3,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}}],\"totalFrames\":3},\"type\":\"response\",\"request_seq\":15,\"command\":\"stackTrace\",\"seq\":27}"); tester.sendMessage("{\"command\":\"scopes\",\"arguments\":{\"frameId\":1},\"type\":\"request\",\"seq\":16}"); tester.compareReceivedMessages("{\"success\":true,\"body\":{\"scopes\":[{\"name\":\"Local\",\"variablesReference\":4,\"expensive\":false},{\"name\":\"Global\",\"variablesReference\":5,\"expensive\":true}]},\"type\":\"response\",\"request_seq\":16,\"command\":\"scopes\",\"seq\":28}"); tester.sendMessage("{\"command\":\"variables\",\"arguments\":{\"variablesReference\":4},\"type\":\"request\",\"seq\":17}"); @@ -792,7 +792,7 @@ public void testReturnValue() throws Exception { tester.sendMessage("{\"command\":\"threads\",\"type\":\"request\",\"seq\":20}"); tester.compareReceivedMessages("{\"success\":true,\"body\":{\"threads\":[{\"name\":\"testRunner\",\"id\":1}]},\"type\":\"response\",\"request_seq\":20,\"command\":\"threads\",\"seq\":34}"); tester.sendMessage("{\"command\":\"stackTrace\",\"arguments\":{\"threadId\":1},\"type\":\"request\",\"seq\":21}"); - tester.compareReceivedMessages("{\"success\":true,\"body\":{\"stackFrames\":[{\"line\":6,\"name\":\"addThem\",\"column\":11,\"id\":1,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}},{\"line\":2,\"name\":\"main\",\"column\":7,\"id\":2,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}}],\"totalFrames\":2},\"type\":\"response\",\"request_seq\":21,\"command\":\"stackTrace\",\"seq\":35}"); + tester.compareReceivedMessages("{\"success\":true,\"body\":{\"stackFrames\":[{\"line\":6,\"name\":\"addThem\",\"column\":12,\"id\":1,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}},{\"line\":2,\"name\":\"main\",\"column\":7,\"id\":2,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}}],\"totalFrames\":2},\"type\":\"response\",\"request_seq\":21,\"command\":\"stackTrace\",\"seq\":35}"); tester.sendMessage("{\"command\":\"scopes\",\"arguments\":{\"frameId\":1},\"type\":\"request\",\"seq\":22}"); tester.compareReceivedMessages("{\"success\":true,\"body\":{\"scopes\":[{\"name\":\"Local\",\"variablesReference\":3,\"expensive\":false},{\"name\":\"Global\",\"variablesReference\":4,\"expensive\":true}]},\"type\":\"response\",\"request_seq\":22,\"command\":\"scopes\",\"seq\":36}"); tester.sendMessage("{\"command\":\"variables\",\"arguments\":{\"variablesReference\":3},\"type\":\"request\",\"seq\":23}"); @@ -833,7 +833,7 @@ public void testReturnValue() throws Exception { tester.sendMessage("{\"command\":\"threads\",\"type\":\"request\",\"seq\":33}"); tester.compareReceivedMessages("{\"success\":true,\"body\":{\"threads\":[{\"name\":\"testRunner\",\"id\":1}]},\"type\":\"response\",\"request_seq\":33,\"command\":\"threads\",\"seq\":53}"); tester.sendMessage("{\"command\":\"stackTrace\",\"arguments\":{\"threadId\":1},\"type\":\"request\",\"seq\":34}"); - tester.compareReceivedMessages("{\"success\":true,\"body\":{\"stackFrames\":[{\"line\":7,\"name\":\"addThem\",\"column\":11,\"id\":1,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}},{\"line\":2,\"name\":\"main\",\"column\":7,\"id\":2,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}}],\"totalFrames\":2},\"type\":\"response\",\"request_seq\":34,\"command\":\"stackTrace\",\"seq\":54}"); + tester.compareReceivedMessages("{\"success\":true,\"body\":{\"stackFrames\":[{\"line\":7,\"name\":\"addThem\",\"column\":12,\"id\":1,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}},{\"line\":2,\"name\":\"main\",\"column\":7,\"id\":2,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLTest.sl\",\"name\":\"SLTest.sl\"}}],\"totalFrames\":2},\"type\":\"response\",\"request_seq\":34,\"command\":\"stackTrace\",\"seq\":54}"); tester.sendMessage("{\"command\":\"scopes\",\"arguments\":{\"frameId\":1},\"type\":\"request\",\"seq\":35}"); tester.compareReceivedMessages("{\"success\":true,\"body\":{\"scopes\":[{\"name\":\"Local\",\"variablesReference\":3,\"expensive\":false},{\"name\":\"Global\",\"variablesReference\":4,\"expensive\":true}]},\"type\":\"response\",\"request_seq\":35,\"command\":\"scopes\",\"seq\":55}"); tester.sendMessage("{\"command\":\"variables\",\"arguments\":{\"variablesReference\":3},\"type\":\"request\",\"seq\":36}"); @@ -1000,7 +1000,7 @@ public void testExceptionBreakpoints() throws Exception { tester.sendMessage("{\"command\":\"threads\",\"type\":\"request\",\"seq\":6}"); tester.compareReceivedMessages("{\"success\":true,\"body\":{\"threads\":[{\"name\":\"testRunner\",\"id\":1}]},\"type\":\"response\",\"request_seq\":6,\"command\":\"threads\",\"seq\":12}"); tester.sendMessage("{\"command\":\"stackTrace\",\"arguments\":{\"threadId\":1},\"type\":\"request\",\"seq\":7}"); - tester.compareReceivedMessages("{\"success\":true,\"body\":{\"stackFrames\":[{\"line\":6,\"name\":\"invert\",\"column\":12,\"id\":2,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLThrow.sl\",\"name\":\"SLThrow.sl\"}},{\"line\":3,\"name\":\"main\",\"column\":10,\"id\":3,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLThrow.sl\",\"name\":\"SLThrow.sl\"}}],\"totalFrames\":2},\"type\":\"response\",\"request_seq\":7,\"command\":\"stackTrace\",\"seq\":13}"); + tester.compareReceivedMessages("{\"success\":true,\"body\":{\"stackFrames\":[{\"line\":6,\"name\":\"invert\",\"column\":13,\"id\":2,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLThrow.sl\",\"name\":\"SLThrow.sl\"}},{\"line\":3,\"name\":\"main\",\"column\":10,\"id\":3,\"source\":{\"sourceReference\":2,\"path\":\"/test/SLThrow.sl\",\"name\":\"SLThrow.sl\"}}],\"totalFrames\":2},\"type\":\"response\",\"request_seq\":7,\"command\":\"stackTrace\",\"seq\":13}"); // Ask for the exception info: tester.sendMessage("{\"command\":\"exceptionInfo\",\"arguments\":{\"threadId\":1},\"type\":\"request\",\"seq\":8}"); tester.compareReceivedMessages("{\"success\":true,\"body\":{\"exceptionId\":\"Error\",\"description\":\"Unsupported\",\"breakMode\":\"unhandled\"},\"type\":\"response\",\"request_seq\":8,\"command\":\"exceptionInfo\",\"seq\":14}"); diff --git a/tools/src/com.oracle.truffle.tools.dap/src/com/oracle/truffle/tools/dap/server/StackFramesHandler.java b/tools/src/com.oracle.truffle.tools.dap/src/com/oracle/truffle/tools/dap/server/StackFramesHandler.java index 664a59fdd63f..a4b72c366101 100644 --- a/tools/src/com.oracle.truffle.tools.dap/src/com/oracle/truffle/tools/dap/server/StackFramesHandler.java +++ b/tools/src/com.oracle.truffle.tools.dap/src/com/oracle/truffle/tools/dap/server/StackFramesHandler.java @@ -82,7 +82,7 @@ public List getStackTrace(ThreadsHandler.SuspendedThreadInfo info) { context.debuggerToClientLine(sourceSection.getStartLine()), context.debuggerToClientColumn(sourceSection.getStartColumn())).setSource(dapSource)); } else { sfs.add(StackFrame.create(info.getId(new FrameWrapper(frame, returnValue)), frame.getName(), - context.debuggerToClientLine(sourceSection.getEndLine()), context.debuggerToClientColumn(sourceSection.getEndColumn())).setSource(dapSource)); + context.debuggerToClientLine(sourceSection.getEndLine()), context.debuggerToClientColumn(sourceSection.getEndColumn() + 1)).setSource(dapSource)); } top = false; }