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

fix breakpoints activation in library sources

Browse Source
This commit is contained in:
Eugene Zhuravlev
2009-10-27 21:20:20 +03:00
parent 309dc64451
commit 00998106fd
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
+7 -13
View File
@@ -30,7 +30,6 @@ import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.colors.EditorColorsManager;
@@ -48,7 +47,6 @@ import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.psi.jsp.JspFile;
import com.intellij.ui.classFilter.ClassFilter;
import com.intellij.util.StringBuilderSpinAllocator;
@@ -327,26 +325,22 @@ public abstract class BreakpointWithHighlighter extends Breakpoint {
if (ApplicationManager.getApplication().isUnitTestMode()) {
return;
}
DebuggerInvocationUtil.invokeLater(getProject(), new Runnable() {
final Project project = getProject();
DebuggerInvocationUtil.swingInvokeLater(project, new Runnable() {
public void run() {
if (PsiManager.getInstance(myProject).isDisposed()) {
return;
}
if (!isValid()) {
return;
}
DebuggerContextImpl context = DebuggerManagerEx.getInstanceEx(myProject).getContext();
DebuggerContextImpl context = DebuggerManagerEx.getInstanceEx(project).getContext();
final DebugProcessImpl debugProcess = context.getDebugProcess();
if(debugProcess == null || !context.getDebuggerSession().isAttached()) {
if(debugProcess == null || !debugProcess.isAttached()) {
updateCaches(null);
updateGutter();
afterUpdate.run();
}
else {
final ModalityState modalityState = ModalityState.current();
debugProcess.getManagerThread().invoke(new DebuggerCommandImpl() {
protected void action() throws Exception {
ApplicationManager.getApplication().runReadAction(new Runnable() {
@@ -354,17 +348,17 @@ public abstract class BreakpointWithHighlighter extends Breakpoint {
updateCaches(debugProcess);
}
});
DebuggerInvocationUtil.invokeLater(getProject(), new Runnable() {
DebuggerInvocationUtil.swingInvokeLater(project, new Runnable() {
public void run() {
updateGutter();
afterUpdate.run();
}
}, modalityState);
});
}
});
}
}
}, ModalityState.defaultModalityState());
});
}
private void updateGutter() {
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java
+6 -2
View File
@@ -34,6 +34,7 @@ import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.markup.RangeHighlighter;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.Key;
@@ -102,7 +103,7 @@ public class LineBreakpoint extends BreakpointWithHighlighter {
protected void reload(PsiFile file) {
super.reload(file);
myMethodName = LineBreakpoint.findMethodName(file, getHighlighter().getStartOffset());
myMethodName = findMethodName(file, getHighlighter().getStartOffset());
}
protected void createOrWaitPrepare(DebugProcessImpl debugProcess, String classToBeLoaded) {
@@ -174,7 +175,10 @@ public class LineBreakpoint extends BreakpointWithHighlighter {
final SourcePosition position = getSourcePosition();
if (position != null) {
final GlobalSearchScope scope = debugProcess.getSearchScope();
return scope.accept(position.getFile().getVirtualFile());
final VirtualFile file = position.getFile().getVirtualFile();
if (file != null && ProjectRootManager.getInstance(debugProcess.getProject()).getFileIndex().isInContent(file)) {
return scope.accept(file);
}
}
return true;
}