remove isReconciled

Author: tobias-melcher

org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/codemining/ParameterNamesCodeMiningTest.java

@@ -106,7 +106,7 @@ private void waitReconciled(JavaEditor editor, JavaSourceViewer viewer) {
 		assertTrue(new DisplayHelper() {
 			@Override
 			protected boolean condition() {
-				return JavaCodeMiningReconciler.isReconciled(editor);
+				return JavaCodeMiningReconciler.getFuture(editor).isDone();
 			}
 		}.waitForCondition(viewer.getTextWidget().getDisplay(), 2000), "Editor not reconciled");
 	}

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaCodeMiningReconciler.java

@@ -58,8 +58,7 @@ public void reconciled(CompilationUnit ast, boolean forced, IProgressMonitor pro
 		final ISourceViewerExtension5 sourceViewer= fSourceViewer;
 		if (editor != null && sourceViewer != null) {
 			sourceViewer.updateCodeMinings();
-			// Use remove() to ensure atomicity
-			CompletableFuture<ITypeRoot> future= typeRootFutureByEditor.remove(editor);
+			CompletableFuture<ITypeRoot> future= typeRootFutureByEditor.get(editor);
 			if (future != null && !future.isDone() && ast.getTypeRoot() != null) {
 				future.complete(ast.getTypeRoot());
 			}
@@ -125,9 +124,4 @@ public void uninstall() {
 		fEditor= null;
 		fSourceViewer= null;
 	}
-
-	public static boolean isReconciled(ITextEditor editor) {
-		CompletableFuture<ITypeRoot> future= getFuture(editor);
-		return future.isDone() && !future.isCompletedExceptionally();
-	}
 }

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/codemining/JavaElementCodeMiningProvider.java

@@ -104,11 +104,6 @@ private List<? extends ICodeMining> computeCodeMinings(ITextViewer viewer, IText
 			IJavaElement[] elements= unit.getChildren();
 			List<ICodeMining> minings= new ArrayList<>(elements.length);
 			collectMinings(unit, textEditor, unit.getChildren(), minings, viewer, monitor);
-			// interrupt if editor was marked to be reconciled in the meantime
-			if (!JavaCodeMiningReconciler.isReconciled(textEditor)) {
-				monitor.setCanceled(true);
-			}
-			monitor.isCanceled();
 			return minings;
 		} catch (JavaModelException e) {
 			// Should never occur

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/codemining/JavaMethodParameterCodeMiningProvider.java

@@ -51,7 +51,7 @@ public CompletableFuture<List<? extends ICodeMining>> provideCodeMinings(ITextVi
 		ITextEditor textEditor= super.getAdapter(ITextEditor.class);
 		CompletableFuture<ITypeRoot> future= JavaCodeMiningReconciler.getFuture(textEditor);
 		return future.thenApplyAsync(typeRoot -> {
-			return computeCodeMinings(textEditor, monitor, typeRoot);
+			return computeCodeMinings(typeRoot);
 		}).handle((result, ex) -> {
 			if (ex instanceof CompletionException ce &&
 					ce.getCause() instanceof CancellationException) {
@@ -61,19 +61,14 @@ public CompletableFuture<List<? extends ICodeMining>> provideCodeMinings(ITextVi
 		});
 	}
 
-	private List<? extends ICodeMining> computeCodeMinings(ITextEditor textEditor, IProgressMonitor monitor, ITypeRoot unit) {
+	private List<? extends ICodeMining> computeCodeMinings(ITypeRoot unit) {
 		if (unit == null) {
 			return Collections.emptyList();
 		}
 		try {
 			IJavaElement[] elements= unit.getChildren();
 			List<ICodeMining> minings= new ArrayList<>(elements.length);
 			collectLineContentCodeMinings(unit, minings);
-			if (!JavaCodeMiningReconciler.isReconciled(textEditor)) {
-				// the provider isn't able to return code minings for non-reconciled viewers
-				monitor.setCanceled(true);
-			}
-			monitor.isCanceled();
 			return minings;
 		} catch (JavaModelException e) {
 			// TODO: what should we done when there are some errors?