MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

augmenting IDEA-148802 Java Scratch files debugging: debugger ignores breakpoints in module classes and doesn't show their sources

Browse Source
This commit is contained in:
Eugene Zhuravlev
2015-12-03 12:14:44 +01:00
parent ce62f8ca65
commit 47efd29972
2 changed files with 99 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/scratch/JavaScratchPositionManager.java
+53 -13
View File
@@ -16,8 +16,10 @@
package com.intellij.execution.scratch;
import com.intellij.debugger.NoDataException;
import com.intellij.debugger.SourcePosition;
import com.intellij.debugger.engine.DebugProcessImpl;
import com.intellij.debugger.engine.PositionManagerImpl;
import com.intellij.debugger.requests.ClassPrepareRequestor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
@@ -27,8 +29,13 @@ import com.intellij.psi.PsiJavaFile;
import com.intellij.psi.PsiManager;
import com.sun.jdi.Location;
import com.sun.jdi.ReferenceType;
import com.sun.jdi.request.ClassPrepareRequest;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.List;
/**
* @author Eugene Zhuravlev
* Date: 11-Sep-15
@@ -41,7 +48,52 @@ public class JavaScratchPositionManager extends PositionManagerImpl{
myScratchFile = scratchFile;
}
private PsiFile getScratchPsiFileByLocation(Project project, Location location) {
@NotNull
@Override
public List<Location> locationsOfLine(@NotNull ReferenceType type, @NotNull SourcePosition position) throws NoDataException {
checkPosition(position);
try {
return super.locationsOfLine(type, position);
}
catch (NoDataException e) {
return Collections.emptyList();
}
}
@NotNull
@Override
public List<ClassPrepareRequest> createPrepareRequests(@NotNull ClassPrepareRequestor requestor,
@NotNull SourcePosition position) throws NoDataException {
checkPosition(position);
try {
return super.createPrepareRequests(requestor, position);
}
catch (NoDataException e) {
return Collections.emptyList();
}
}
@NotNull
@Override
public List<ReferenceType> getAllClasses(@NotNull SourcePosition position) throws NoDataException {
checkPosition(position);
try {
return super.getAllClasses(position);
}
catch (NoDataException e) {
return Collections.emptyList();
}
}
private void checkPosition(@NotNull SourcePosition position) throws NoDataException{
if (!myScratchFile.equals(position.getFile().getVirtualFile())) {
throw NoDataException.INSTANCE;
}
}
@Nullable
@Override
protected PsiFile getPsiFileByLocation(Project project, Location location) {
if (location == null) {
return null;
}
@@ -77,16 +129,4 @@ public class JavaScratchPositionManager extends PositionManagerImpl{
return null;
}
@Nullable
@Override
protected PsiFile getPsiFileByLocation(Project project, Location location) throws NoDataException {
PsiFile file = getScratchPsiFileByLocation(project, location);
if (file != null) {
return file;
}
else {
throw NoDataException.INSTANCE;
}
}
}