Bug 108568 - Debug console test failure

3 files changed, 24 insertions, 2 deletions

diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java
index 8142582ce..f4bd56d47 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java
@@ -389,7 +389,13 @@ public abstract class TextConsole extends AbstractConsole {
     /**
      * Returns a scheduling rule which can be used to prevent jobs from running
      * while this console's pattern matcher is active.
-     * 
+     * <p>
+     * Although this scheduling rule prevents jobs from running at the same time as
+     * pattern matching jobs for this console, it does not enforce any ordering of jobs.
+     * Since 3.2, pattern matching jobs belong to the job family identified by the console
+     * object that matching is occurring on. To ensure a job runs after all scheduled pattern
+     * matching is complete, clients must join on this console's job family.
+     * </p>
      * @return a scheduling rule which can be used to prevent jobs from running
      * while this console's pattern matcher is active
      */
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java
index 79565e7c1..beaa94c9b 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java
@@ -46,7 +46,6 @@ public class ConsolePatternMatcher implements IDocumentListener {
 
     public ConsolePatternMatcher(TextConsole console) {
         fConsole = console;
-        fMatchJob.setRule(fConsole.getSchedulingRule());
     }
 
     private class MatchJob extends Job {
@@ -164,6 +163,12 @@ public class ConsolePatternMatcher implements IDocumentListener {
 
             return Status.OK_STATUS;
         }
+
+        public boolean belongsTo(Object family) {
+            return family == fConsole;
+        }
+        
+        
     }
 
     private class CompiledPatternMatchListener {
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java
index f65337856..bb3d868d8 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java
@@ -17,7 +17,10 @@ import java.util.List;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobManager;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DocumentEvent;
@@ -608,6 +611,14 @@ public class IOConsolePartitioner implements IConsoleDocumentPartitioner, IDocum
          * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor)
          */
         public IStatus runInUIThread(IProgressMonitor monitor) {
+            IJobManager jobManager = Platform.getJobManager();
+            try {
+                jobManager.join(console, monitor);
+            } catch (OperationCanceledException e1) {
+                return Status.CANCEL_STATUS;
+            } catch (InterruptedException e1) {
+                return Status.CANCEL_STATUS;
+            }
         	if (document == null) {
         		return Status.OK_STATUS;
         	}