Add waitForIndex to give user feedback

Hélios GILLES · Hélios GILLES · commit 3e0f95c50ba7 · 2025-06-19T09:56:03.000+02:00
diff --git a/org.moreunit.core/META-INF/MANIFEST.MF b/org.moreunit.core/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.ui,
  org.eclipse.ui.ide,
  org.eclipse.ui.forms,
- org.eclipse.ui.editors
+ org.eclipse.ui.editors,
+ org.eclipse.jdt.core
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Export-Package: org.moreunit.core;x-friends:="org.moreunit.core.test,org.moreunit.mock",
diff --git a/org.moreunit.core/src/org/moreunit/core/util/Jobs.java b/org.moreunit.core/src/org/moreunit/core/util/Jobs.java
@@ -7,6 +7,7 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jdt.internal.core.JavaModelManager;
 import org.eclipse.swt.widgets.Display;
 
 /**
@@ -19,14 +20,19 @@ private Jobs()
     {
     }
 
-    public static <T> void executeAndRunInUI(String jobName, Supplier<T> backgroundJob, Consumer<T> uiJob)
+    public static <T> void waitForIndexExecuteAndRunInUI(String jobName, Supplier<T> backgroundJob, Consumer<T> uiJob)
     {
         Job job = new Job(jobName)
         {
 
             @Override
             protected IStatus run(IProgressMonitor progressmonitor)
             {
+                JavaModelManager.getIndexManager().waitForIndex(true, progressmonitor);
+                if(progressmonitor.isCanceled())
+                {
+                    return Status.CANCEL_STATUS;
+                }
                 T result = backgroundJob.get();
                 if(progressmonitor.isCanceled())
                 {
diff --git a/org.moreunit.plugin/src/org/moreunit/actions/CreateTestMethodHierarchyAction.java b/org.moreunit.plugin/src/org/moreunit/actions/CreateTestMethodHierarchyAction.java
@@ -59,7 +59,7 @@ public void run(final IAction action)
     private void createTestMethod(IMethod method)
     {
         ICompilationUnit cu = method.getCompilationUnit();
-        Jobs.executeAndRunInUI("Create test method ... ", () -> {
+        Jobs.waitForIndexExecuteAndRunInUI("Create test method ... ", () -> {
             ProjectPreferences prefs = preferencesFor(cu);
             if(prefs != null)
             {
diff --git a/org.moreunit.plugin/src/org/moreunit/annotation/MoreUnitAnnotationModel.java b/org.moreunit.plugin/src/org/moreunit/annotation/MoreUnitAnnotationModel.java
@@ -1,15 +1,41 @@
 package org.moreunit.annotation;
 
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.source.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.texteditor.*;
-import org.moreunit.elements.*;
+import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.ISourceRange;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.core.JavaModelManager;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.AnnotationModelEvent;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.IAnnotationModelExtension;
+import org.eclipse.jface.text.source.IAnnotationModelListener;
+import org.eclipse.jface.text.source.IAnnotationModelListenerExtension;
+import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.moreunit.elements.ClassTypeFacade;
+import org.moreunit.elements.EditorPartFacade;
+import org.moreunit.elements.TypeFacade;
 import org.moreunit.log.LogHandler;
 import org.moreunit.preferences.Preferences;
 import org.moreunit.preferences.TestAnnotationMode;
@@ -152,6 +178,7 @@ private void updateAnnotations()
                 @Override
                 protected IStatus run(IProgressMonitor monitor)
                 {
+                    JavaModelManager.getIndexManager().waitForIndex(true, monitor);
                     if(monitor.isCanceled())
                     {
                         return Status.CANCEL_STATUS;
diff --git a/org.moreunit.plugin/src/org/moreunit/codemining/JumpCodeMining.java b/org.moreunit.plugin/src/org/moreunit/codemining/JumpCodeMining.java
@@ -118,7 +118,7 @@ else if(typeFacade instanceof TestCaseTypeFacade)
     public Consumer<MouseEvent> getAction()
     {
         return e -> {
-            Jobs.executeAndRunInUI("Jump to ... ", () -> {
+            Jobs.waitForIndexExecuteAndRunInUI("Jump to ... ", () -> {
             MethodSearchMode searchMode = Preferences.getInstance().getMethodSearchMode(element.getJavaProject());
 
             TypeFacade typeFacade = TypeFacade.createFacade(((IMember) element).getCompilationUnit());
diff --git a/org.moreunit.plugin/src/org/moreunit/handler/CreateTestMethodActionExecutor.java b/org.moreunit.plugin/src/org/moreunit/handler/CreateTestMethodActionExecutor.java
@@ -89,7 +89,7 @@ public void executeCreateTestMethodAction(IEditorPart editorPart)
         EditorPartFacade editorPartFacade = new EditorPartFacade(editorPart);
         ICompilationUnit compilationUnit = editorPartFacade.getCompilationUnit();
         IMethod originalMethod = editorPartFacade.getFirstNonAnonymousMethodSurroundingCursorPosition();
-        Jobs.executeAndRunInUI("Create test method ... ", () -> {
+        Jobs.waitForIndexExecuteAndRunInUI("Create test method ... ", () -> {
             // Creates an intermediate object to clarify code that follows
             CreationContext context = createContext(compilationUnit);
             if(context != null)
diff --git a/org.moreunit.plugin/src/org/moreunit/handler/JumpActionExecutor.java b/org.moreunit.plugin/src/org/moreunit/handler/JumpActionExecutor.java
@@ -93,7 +93,7 @@ public void executeJumpAction(IFile file)
 
     private void executeJumpAction(ICompilationUnit compilationUnit, IMethod methodUnderCursorPosition)
     {
-        Jobs.executeAndRunInUI("Jump to ... ", () -> {
+        Jobs.waitForIndexExecuteAndRunInUI("Jump to ... ", () -> {
             MethodSearchMode searchMode = Preferences.getInstance().getMethodSearchMode(compilationUnit.getJavaProject());
 
             TypeFacade typeFacade = TypeFacade.createFacade(compilationUnit);
diff --git a/org.moreunit.plugin/src/org/moreunit/handler/RunTestsActionExecutor.java b/org.moreunit.plugin/src/org/moreunit/handler/RunTestsActionExecutor.java
@@ -99,7 +99,7 @@ public void executeRunTestAction(ICompilationUnit compilationUnit, String launch
 
     private void executeRunAllTestsAction(ICompilationUnit compilationUnit, String launchMode)
     {
-        Jobs.executeAndRunInUI("Running tests ... ", () -> {
+        Jobs.waitForIndexExecuteAndRunInUI("Running tests ... ", () -> {
 
             Collection<IType> testCases = new LinkedHashSet<>();
             IType selectedJavaType = compilationUnit.findPrimaryType();
@@ -143,7 +143,7 @@ public void executeRunTestsOfSelectedMemberAction(IEditorPart editorPart, String
 
     private void executeRunTestsOfSelectedMemberAction(IEditorPart editorPart, ICompilationUnit compilationUnit, String launchMode)
     {
-        Jobs.executeAndRunInUI("Running tests ... ", () -> {
+        Jobs.waitForIndexExecuteAndRunInUI("Running tests ... ", () -> {
             Collection<IMember> testElements = new LinkedHashSet<>();
             IType selectedJavaType = compilationUnit.findPrimaryType();
 

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import org.eclipse.core.runtime.IStatus;`
`8`	`8`	`import org.eclipse.core.runtime.Status;`
`9`	`9`	`import org.eclipse.core.runtime.jobs.Job;`
	`10`	`+import org.eclipse.jdt.internal.core.JavaModelManager;`
`10`	`11`	`import org.eclipse.swt.widgets.Display;`
`11`	`12`
`12`	`13`	`/**`
`@@ -19,14 +20,19 @@ private Jobs()`
`19`	`20`	`{`
`20`	`21`	`}`
`21`	`22`
`22`		`- public static <T> void executeAndRunInUI(String jobName, Supplier<T> backgroundJob, Consumer<T> uiJob)`
	`23`	`+ public static <T> void waitForIndexExecuteAndRunInUI(String jobName, Supplier<T> backgroundJob, Consumer<T> uiJob)`
`23`	`24`	`{`
`24`	`25`	`Job job = new Job(jobName)`
`25`	`26`	`{`
`26`	`27`
`27`	`28`	`@Override`
`28`	`29`	`protected IStatus run(IProgressMonitor progressmonitor)`
`29`	`30`	`{`
	`31`	`+ JavaModelManager.getIndexManager().waitForIndex(true, progressmonitor);`
	`32`	`+ if(progressmonitor.isCanceled())`
	`33`	`+ {`
	`34`	`+ return Status.CANCEL_STATUS;`
	`35`	`+ }`
`30`	`36`	`T result = backgroundJob.get();`
`31`	`37`	`if(progressmonitor.isCanceled())`
`32`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public void run(final IAction action)`
`59`	`59`	`private void createTestMethod(IMethod method)`
`60`	`60`	`{`
`61`	`61`	`ICompilationUnit cu = method.getCompilationUnit();`
`62`		`- Jobs.executeAndRunInUI("Create test method ... ", () -> {`
	`62`	`+ Jobs.waitForIndexExecuteAndRunInUI("Create test method ... ", () -> {`
`63`	`63`	`ProjectPreferences prefs = preferencesFor(cu);`
`64`	`64`	`if(prefs != null)`
`65`	`65`	`{`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ else if(typeFacade instanceof TestCaseTypeFacade)`
`118`	`118`	`public Consumer<MouseEvent> getAction()`
`119`	`119`	`{`
`120`	`120`	`return e -> {`
`121`		`- Jobs.executeAndRunInUI("Jump to ... ", () -> {`
	`121`	`+ Jobs.waitForIndexExecuteAndRunInUI("Jump to ... ", () -> {`
`122`	`122`	`MethodSearchMode searchMode = Preferences.getInstance().getMethodSearchMode(element.getJavaProject());`
`123`	`123`
`124`	`124`	`TypeFacade typeFacade = TypeFacade.createFacade(((IMember) element).getCompilationUnit());`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public void executeJumpAction(IFile file)`
`93`	`93`
`94`	`94`	`private void executeJumpAction(ICompilationUnit compilationUnit, IMethod methodUnderCursorPosition)`
`95`	`95`	`{`
`96`		`- Jobs.executeAndRunInUI("Jump to ... ", () -> {`
	`96`	`+ Jobs.waitForIndexExecuteAndRunInUI("Jump to ... ", () -> {`
`97`	`97`	`MethodSearchMode searchMode = Preferences.getInstance().getMethodSearchMode(compilationUnit.getJavaProject());`
`98`	`98`
`99`	`99`	`TypeFacade typeFacade = TypeFacade.createFacade(compilationUnit);`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public void executeRunTestAction(ICompilationUnit compilationUnit, String launch`
`99`	`99`
`100`	`100`	`private void executeRunAllTestsAction(ICompilationUnit compilationUnit, String launchMode)`
`101`	`101`	`{`
`102`		`- Jobs.executeAndRunInUI("Running tests ... ", () -> {`
	`102`	`+ Jobs.waitForIndexExecuteAndRunInUI("Running tests ... ", () -> {`
`103`	`103`
`104`	`104`	`Collection<IType> testCases = new LinkedHashSet<>();`
`105`	`105`	`IType selectedJavaType = compilationUnit.findPrimaryType();`
`@@ -143,7 +143,7 @@ public void executeRunTestsOfSelectedMemberAction(IEditorPart editorPart, String`
`143`	`143`
`144`	`144`	`private void executeRunTestsOfSelectedMemberAction(IEditorPart editorPart, ICompilationUnit compilationUnit, String launchMode)`
`145`	`145`	`{`
`146`		`- Jobs.executeAndRunInUI("Running tests ... ", () -> {`
	`146`	`+ Jobs.waitForIndexExecuteAndRunInUI("Running tests ... ", () -> {`
`147`	`147`	`Collection<IMember> testElements = new LinkedHashSet<>();`
`148`	`148`	`IType selectedJavaType = compilationUnit.findPrimaryType();`
`149`	`149`