From 00998106fd889f614a12077807a6f40d98348610 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Tue, 27 Oct 2009 21:19:40 +0300
Subject: [PATCH] fix breakpoints activation in library sources

---
 .../BreakpointWithHighlighter.java            | 20 +++++++------------
 .../ui/breakpoints/LineBreakpoint.java        |  8 ++++++--
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
index b085db049c21..7b8c4d42c054 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
@@ -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() {
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java
index db0ac8c2e2ea..8a91d50ea141 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java
@@ -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;
   }