Skip to content

Navigate to line on stack frame changes #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 30, 2022
Merged

Navigate to line on stack frame changes #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8f68b7
Navigate to line on stack frame changes
MrMineO5 Sep 30, 2022
4990f26
Check for non-null line number
MrMineO5 Sep 30, 2022
bcf3d62
fix: show execution point regression
BFergerson Sep 30, 2022
6187309
fix: check for non-null line number
BFergerson Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugin/src/main/java/spp/jetbrains/sourcemarker/status/BreakpointStatusBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public void mouseClicked(MouseEvent e) {
BreakpointHitWindowService.Companion.getInstance(inlayMark.getProject())
.clearContent();
BreakpointHitWindowService.Companion.getInstance(inlayMark.getProject())
.showBreakpointHit(shownBreakpointHit.get(), false);
.showBreakpointHit(shownBreakpointHit.get(), true);
});
}
}));
Expand Down
26 changes: 11 additions & 15 deletions .../kotlin/spp/jetbrains/sourcemarker/service/instrument/breakpoint/ExecutionPointManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@ import com.intellij.openapi.fileEditor.OpenFileDescriptor
import com.intellij.openapi.project.Project
import com.intellij.xdebugger.XDebuggerUtil
import com.intellij.xdebugger.impl.ui.ExecutionPointHighlighter
import spp.jetbrains.marker.SourceMarker
import spp.protocol.artifact.exception.qualifiedClassName
import spp.jetbrains.marker.impl.ArtifactNamingService
import spp.protocol.artifact.exception.sourceAsLineNumber

/**
* todo: probably don't need this as the breakpoint bar serves as the execution point indicator
* Shows the execution point in the editor for the selected stack frame.
*
* @since 0.3.0
* @author [Brandon Fergerson](mailto:bfergerson@apache.org)
Expand All @@ -47,18 +46,15 @@ class ExecutionPointManager(

override fun onChanged(stackFrameManager: StackFrameManager) {
if (!showExecutionPoint) return
val currentFrame = stackFrameManager.currentFrame
var fromClass = currentFrame!!.qualifiedClassName()

//check for inner class
val indexOfDollarSign = fromClass.indexOf("$")
if (indexOfDollarSign >= 0) {
fromClass = fromClass.substring(0, indexOfDollarSign)
}
val fileMarker = SourceMarker.getInstance(project).getSourceFileMarker(fromClass) ?: return
val virtualFile = fileMarker.psiFile.containingFile.virtualFile ?: return
val currentFrame = stackFrameManager.currentFrame ?: return
val psiFile = stackFrameManager.stackTrace.language?.let {
ArtifactNamingService.getService(it).findPsiFile(it, project, currentFrame)
} ?: return
val virtualFile = psiFile.containingFile.virtualFile ?: return
val document = FileDocumentManager.getInstance().getDocument(virtualFile) ?: return
val lineStartOffset = document.getLineStartOffset(currentFrame.sourceAsLineNumber()!!) - 1
val lineStartOffset = currentFrame.sourceAsLineNumber()?.let {
document.getLineStartOffset(it) - 1
} ?: return

ApplicationManager.getApplication().invokeLater {
try {
Expand All @@ -69,7 +65,7 @@ class ExecutionPointManager(
executionPointHighlighter.show(
XDebuggerUtil.getInstance().createPositionByOffset(
virtualFile, lineStartOffset
)!!, false, null
)!!, true, null
)
} catch (e: Throwable) {
log.error("Failed to set execution point", e)
Expand Down