Remove WS_CARBON check

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java

@@ -15,7 +15,6 @@
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
@@ -56,31 +55,27 @@ abstract public class AbstractReconciler implements IReconciler {
 	/**
 	 * Background thread for the reconciling activity.
 	 */
-	private class BackgroundThread extends Job {
+	class BackgroundWorker implements Runnable {
 
 		/** Has the reconciler been canceled. */
-		private boolean fCanceled= false;
+		private boolean fCanceled;
 		/** Has the reconciler been reset. */
-		private boolean fReset= false;
+		private boolean fReset;
 		/** Some changes need to be processed. */
-		private boolean fIsDirty= false;
+		private boolean fIsDirty;
 		/** Is a reconciling strategy active. */
-		private boolean fIsActive= false;
+		private boolean fIsActive;
 
-		private volatile boolean fIsAlive;
+		private boolean fStarted;
 
-		private boolean started;
+		private String fName;
 
-		/**
-		 * Creates a new background thread. The thread
-		 * runs with minimal priority.
-		 *
-		 * @param name the thread's name
-		 */
-		public BackgroundThread(String name) {
-			super(name);
-			setPriority(Job.DECORATE);
-			setSystem(true);
+		private boolean fIsAlive;
+
+		private volatile Thread fThread;
+
+		public BackgroundWorker(String name) {
+			fName= name;
 		}
 
 		/**
@@ -105,7 +100,7 @@ public synchronized boolean isDirty() {
 		/**
 		 * Cancels the background thread.
 		 */
-		public void doCancel() {
+		public void cancel() {
 			fCanceled= true;
 			IProgressMonitor pm= fProgressMonitor;
 			if (pm != null)
@@ -160,9 +155,7 @@ public void reset() {
 					fDirtyRegionQueue.notifyAll();
 				}
 			}
-			synchronized (this) {
-				started= false;
-			}
+
 			informNotFinished();
 			reconcilerReset();
 		}
@@ -171,79 +164,91 @@ public void reset() {
 		 * The background activity. Waits until there is something in the
 		 * queue managing the changes that have been applied to the text viewer.
 		 * Removes the first change from the queue and process it.
-		 * <p>
-		 * Calls {@link AbstractReconciler#initialProcess()} on entrance.
-		 * </p>
 		 */
 		@Override
-		public IStatus run(IProgressMonitor monitor) {
-			fIsAlive= true;
-			delay();
-
-			if (fCanceled)
-				return Status.CANCEL_STATUS;
-
-			initialProcess();
-
-			while (!fCanceled) {
-
-				delay();
+		public void run() {
+			try {
+				while (!fCanceled) {
 
-				if (fCanceled)
-					break;
+					delay();
 
-				if (!isDirty()) {
-					waitFinish= false; //signalWaitForFinish() was called but nothing todo
-					continue;
-				}
+					if (fCanceled)
+						break;
 
-				synchronized (this) {
-					if (fReset) {
-						fReset= false;
+					if (!isDirty()) {
+						waitFinish= false; //signalWaitForFinish() was called but nothing todo
 						continue;
 					}
-				}
 
-				DirtyRegion r= null;
-				synchronized (fDirtyRegionQueue) {
-					r= fDirtyRegionQueue.removeNextDirtyRegion();
-				}
+					synchronized (this) {
+						if (fReset) {
+							fReset= false;
+							continue;
+						}
+					}
 
-				fIsActive= true;
+					DirtyRegion r= null;
+					synchronized (fDirtyRegionQueue) {
+						r= fDirtyRegionQueue.removeNextDirtyRegion();
+					}
 
-				fProgressMonitor.setCanceled(false);
+					fIsActive= true;
 
-				process(r);
+					fProgressMonitor.setCanceled(false);
 
-				synchronized (fDirtyRegionQueue) {
-					if (0 == fDirtyRegionQueue.getSize()) {
-						synchronized (this) {
-							fIsDirty= fProgressMonitor.isCanceled();
+					process(r);
+
+					synchronized (fDirtyRegionQueue) {
+						if (fDirtyRegionQueue.isEmpty()) {
+							synchronized (this) {
+								fIsDirty= fProgressMonitor.isCanceled();
+							}
+							fDirtyRegionQueue.notifyAll();
 						}
-						fDirtyRegionQueue.notifyAll();
 					}
+					fIsActive= false;
 				}
-
-				fIsActive= false;
+			} finally {
+				fIsAlive= false;
 			}
-			fIsAlive= false;
-			return Status.OK_STATUS;
 		}
 
-		public boolean isAlive() {
+		boolean isAlive() {
 			return fIsAlive;
 		}
 
-		public synchronized void start() {
-			if (!started) {
-				started= true;
-				schedule();
+		/**
+		 * Star the reconciling if not running (and calls
+		 * {@link AbstractReconciler#initialProcess()}) or {@link #reset()} otherwise.
+		 */
+		public void startReconciling() {
+			if (!fStarted) {
+				fIsAlive= true;
+				fStarted= true;
+				Job.createSystem("Delayed Reconciler startup for " + fName, m -> { //$NON-NLS-1$
+					//Until we process some code from the job, the reconciler thread is the current thread
+					fThread= Thread.currentThread();
+					delay();
+					if (fCanceled) {
+						return Status.CANCEL_STATUS;
+					}
+					initialProcess();
+					if (fCanceled) {
+						return Status.CANCEL_STATUS;
+					}
+					Thread thread= new Thread(this);
+					thread.setName(fName);
+					thread.setPriority(Thread.MIN_PRIORITY);
+					thread.setDaemon(true);
+					//we will no longer process any code here, so hand over to the worker thread.
+					fThread= thread;
+					thread.start();
+					return Status.OK_STATUS;
+				}).schedule();
+			} else {
+				reset();
 			}
-		}
 
-		@Override
-		public boolean belongsTo(Object family) {
-			return family == fViewer || AbstractReconciler.class == family;
 		}
 	}
 
@@ -259,7 +264,7 @@ public void documentAboutToBeChanged(DocumentEvent e) {
 		@Override
 		public void documentChanged(DocumentEvent e) {
 
-			if (fThread.isActive() || !fThread.isDirty() && fThread.isAlive()) {
+			if (fWorker.isActive() || !fWorker.isDirty() && fWorker.isAlive()) {
 				if (!fIsAllowedToModifyDocument && isRunningInReconcilerThread())
 					throw new UnsupportedOperationException("The reconciler thread is not allowed to modify the document"); //$NON-NLS-1$
 				aboutToBeReconciledInternal();
@@ -269,13 +274,13 @@ public void documentChanged(DocumentEvent e) {
 			 * The second OR condition handles the case when the document
 			 * gets changed while still inside initialProcess().
 			 */
-			if (fThread.isActive() || fThread.isDirty() && fThread.isAlive())
+			if (fWorker.isActive() || fWorker.isDirty() && fWorker.isAlive())
 				fProgressMonitor.setCanceled(true);
 
 			if (fIsIncrementalReconciler)
 				createDirtyRegion(e);
 
-			fThread.reset();
+			fWorker.reset();
 
 		}
 
@@ -291,11 +296,11 @@ public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput
 					synchronized (fDirtyRegionQueue) {
 						fDirtyRegionQueue.purgeQueue();
 					}
-					if (fDocument != null && fDocument.getLength() > 0 && fThread.isDirty() && fThread.isAlive()) {
+					if (fDocument != null && fDocument.getLength() > 0 && fWorker.isDirty() && fWorker.isAlive()) {
 						DocumentEvent e= new DocumentEvent(fDocument, 0, fDocument.getLength(), ""); //$NON-NLS-1$
 						createDirtyRegion(e);
-						fThread.reset();
-						fThread.suspendCallerWhileDirty();
+						fWorker.reset();
+						fWorker.suspendCallerWhileDirty();
 					}
 				}
 
@@ -315,7 +320,7 @@ public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
 
 			fDocument.addDocumentListener(this);
 
-			if (!fThread.isDirty())
+			if (!fWorker.isDirty())
 				aboutToBeReconciledInternal();
 
 			startReconciling();
@@ -325,7 +330,7 @@ public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
 	/** Queue to manage the changes applied to the text viewer. */
 	private DirtyRegionQueue fDirtyRegionQueue;
 	/** The background thread. */
-	private BackgroundThread fThread;
+	private BackgroundWorker fWorker;
 	/** Internal document and text input listener. */
 	private Listener fListener;
 	/** The background thread delay. */
@@ -474,9 +479,9 @@ public void install(ITextViewer textViewer) {
 		fViewer= textViewer;
 
 		synchronized (this) {
-			if (fThread != null)
+			if (fWorker != null)
 				return;
-			fThread= new BackgroundThread(getClass().getName());
+			fWorker= new BackgroundWorker(getClass().getName());
 		}
 
 		fDirtyRegionQueue= new DirtyRegionQueue();
@@ -510,9 +515,9 @@ public void uninstall() {
 
 			synchronized (this) {
 				// http://dev.eclipse.org/bugs/show_bug.cgi?id=19135
-				BackgroundThread bt= fThread;
-				fThread= null;
-				bt.doCancel();
+				BackgroundWorker bt= fWorker;
+				fWorker= null;
+				bt.cancel();
 			}
 		}
 	}
@@ -617,10 +622,10 @@ protected void forceReconciling() {
 
 		if (fDocument != null) {
 
-			if (!fThread.isDirty()&& fThread.isAlive())
+			if (!fWorker.isDirty()&& fWorker.isAlive())
 				aboutToBeReconciledInternal();
 
-			if (fThread.isActive())
+			if (fWorker.isActive())
 				fProgressMonitor.setCanceled(true);
 
 			if (fIsIncrementalReconciler) {
@@ -637,14 +642,10 @@ protected void forceReconciling() {
 	 * Clients may extend this method.
 	 */
 	protected synchronized void startReconciling() {
-		if (fThread == null)
+		if (fWorker == null)
 			return;
 
-		if (!fThread.isAlive()) {
-			fThread.start();
-		} else {
-			fThread.reset();
-		}
+		fWorker.startReconciling();
 	}
 
 	/**
@@ -661,9 +662,8 @@ protected void reconcilerReset() {
 	 * @since 3.4
 	 */
 	protected synchronized boolean isRunningInReconcilerThread() {
-		if (fThread == null) {
+		if (fWorker == null)
 			return false;
-		}
-		return Job.getJobManager().currentJob() == fThread;
+		return Thread.currentThread() == fWorker.fThread;
 	}
-}
+}

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/DirtyRegionQueue.java

@@ -85,6 +85,10 @@ public int getSize() {
 		return fDirtyRegions.size();
 	}
 
+	public boolean isEmpty() {
+		return fDirtyRegions.isEmpty();
+	}
+
 	/**
 	 * Throws away all entries in the queue.
 	 */

bundles/org.eclipse.jface/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jface;singleton:=true
-Bundle-Version: 3.37.100.qualifier
+Bundle-Version: 3.38.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jface,
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.jface,
  org.eclipse.jface.fieldassist,
  org.eclipse.jface.fieldassist.images,
  org.eclipse.jface.images,
- org.eclipse.jface.internal;x-friends:="org.eclipse.ui.workbench,org.eclipse.e4.ui.workbench.renderers.swt",
+ org.eclipse.jface.internal;x-friends:="org.eclipse.ui.workbench,org.eclipse.e4.ui.workbench.renderers.swt,org.eclipse.jface.tests",
  org.eclipse.jface.internal.provisional.action;x-friends:="org.eclipse.ui.workbench,org.eclipse.ui.ide",
  org.eclipse.jface.layout,
  org.eclipse.jface.menus,