Load and wait in a job + support no source in the meanwhile

Author: laeubi

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

@@ -209,7 +209,7 @@ public ClassFileDocumentProvider() {
 	protected boolean setDocumentContent(IDocument document, IEditorInput editorInput, String encoding) throws CoreException {
 		if (editorInput instanceof IClassFileEditorInput) {
 			IClassFile classFile= ((IClassFileEditorInput) editorInput).getClassFile();
-			String source= classFile.getSource();
+			String source= getSourceIfPresent(classFile);
 			if (source == null)
 				source= ""; //$NON-NLS-1$
 			document.set(source);
@@ -218,6 +218,15 @@ protected boolean setDocumentContent(IDocument document, IEditorInput editorInpu
 		return super.setDocumentContent(document, editorInput, encoding);
 	}
 
+	private String getSourceIfPresent(IClassFile classFile) {
+		try {
+			return classFile.getSource();
+		} catch (JavaModelException e) {
+			//Assume no source...
+			return null;
+		}
+	}
+
 	/**
 	 * Creates an annotation model derived from the given class file editor input.
 	 *

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

@@ -39,6 +39,7 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 
@@ -73,10 +74,12 @@
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
 
 import org.eclipse.jdt.core.ClasspathContainerInitializer;
+import org.eclipse.jdt.core.ElementChangedEvent;
 import org.eclipse.jdt.core.IClassFile;
 import org.eclipse.jdt.core.IClasspathAttribute;
 import org.eclipse.jdt.core.IClasspathContainer;
 import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IElementChangedListener;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaModelStatusConstants;
 import org.eclipse.jdt.core.IJavaProject;
@@ -644,21 +647,45 @@ public boolean isEditorInputReadOnly() {
 	protected IEditorInput transformEditorInput(IEditorInput input) throws CoreException{
 		if (input instanceof HandleEditorInput handle) {
 			IJavaElement element= handle.getElement();
-			if (!element.exists() && element instanceof IOrdinaryClassFile) {
-				/*
-				 * Let's try to find the class file,
-				 * see https://bugs.eclipse.org/bugs/show_bug.cgi?id=83221
-				 */
-				IOrdinaryClassFile cf= (IOrdinaryClassFile)element;
-				IType type= cf.getType();
-				IJavaProject project= element.getJavaProject();
-				if (project != null) {
-					type= project.findType(type.getFullyQualifiedName());
-					if (type == null)
-						return null;
-					element= type.getParent();
+			new Job("Load in the background") { //$NON-NLS-1$
+
+				@Override
+				protected IStatus run(IProgressMonitor monitor) {
+					try {
+						Job.getJobManager().join(ClasspathContainerInitializer.class, null);
+					} catch (OperationCanceledException | InterruptedException e) {
+						// Ignore
+					}
+					try {
+						if (!element.exists() && element instanceof IOrdinaryClassFile) {
+							/*
+							 * Let's try to find the class file,
+							 * see https://bugs.eclipse.org/bugs/show_bug.cgi?id=83221
+							 */
+							IOrdinaryClassFile cf= (IOrdinaryClassFile)element;
+							IType type= cf.getType();
+							IJavaProject project= element.getJavaProject();
+							if (project != null) {
+								type= project.findType(type.getFullyQualifiedName());
+								if (type == null) {
+									JavaCore.addElementChangedListener(new IElementChangedListener() {
+										@Override
+										public void elementChanged(ElementChangedEvent e) {
+											JavaCore.removeElementChangedListener(this);
+											schedule();
+										}
+									});
+								} else {
+									setInput(EditorUtility.getEditorInput(type.getParent()));
+								}
+							}
+						}
+					} catch (CoreException e) {
+						return e.getStatus();
+					}
+					return Status.OK_STATUS;
 				}
-			}
+			}.schedule();
 			input= EditorUtility.getEditorInput(element);
 		}
 		if (input instanceof IFileEditorInput) {
@@ -694,21 +721,6 @@ private void doSetInputCached(IEditorInput input) throws CoreException {
 					message,
 					null));
 		}
-
-		JavaModelException e= probeInputForSource(input);
-		if (e != null) {
-			IClassFileEditorInput classFileEditorInput= (IClassFileEditorInput) input;
-			IClassFile file= classFileEditorInput.getClassFile();
-			IJavaProject javaProject= file.getJavaProject();
-			if (!javaProject.exists() || !javaProject.isOnClasspath(file)) {
-				throw new CoreException(JavaUIStatus.createError(
-						IJavaModelStatusConstants.INVALID_RESOURCE,
-						JavaEditorMessages.ClassFileEditor_error_classfile_not_on_classpath,
-						null));
-			}
-			throw e;
-		}
-
 		IDocumentProvider documentProvider= getDocumentProvider();
 		if (documentProvider instanceof ClassFileDocumentProvider) {
 			((ClassFileDocumentProvider) documentProvider).removeInputChangeListener(this);
@@ -799,23 +811,6 @@ private void createPartControlCached(Composite parent) {
 		}
 	}
 
-	private JavaModelException probeInputForSource(IEditorInput input) {
-		if (input == null) {
-			return null;
-		}
-
-		IClassFileEditorInput classFileEditorInput= (IClassFileEditorInput) input;
-		IClassFile file= classFileEditorInput.getClassFile();
-
-		try {
-			file.getSourceRange();
-		} catch (JavaModelException e) {
-			return e;
-		}
-
-		return null;
-	}
-
 	/**
 	 * Checks if the class file input has no source attached. If so, a source attachment form is shown.
 	 *
@@ -836,7 +831,7 @@ private void verifyInput(IEditorInput input) throws JavaModelException {
 		boolean wasUsingSourceCopyAction= fSourceCopyAction == getAction(ITextEditorActionConstants.COPY);
 
 		// show source attachment form if no source found
-		if (file.getSourceRange() == null) {
+		if (!hasSource(file)) {
 			// dispose old source attachment form
 			if (fSourceAttachmentForm != null) {
 				fSourceAttachmentForm.dispose();
@@ -925,6 +920,15 @@ public void run() {
 		}
 	}
 
+	private static boolean hasSource(IClassFile file) {
+		try {
+			return file.getSourceRange() != null;
+		} catch (JavaModelException e) {
+			//assume no source then...
+			return false;
+		}
+	}
+
 	/*
 	 * @see ClassFileDocumentProvider.InputChangeListener#inputChanged(IClassFileEditorInput)
 	 */