Issue eclipse#63 - getDocument(ITextEditor) incorrectly assumes an

implementation of AbstractTextEditor
mickaelistria · Feb 1, 2022 · 30e58bc · 30e58bc
1 parent f646fd8
commit 30e58bc
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java
@@ -521,7 +521,7 @@ public static void open(String uri, IWorkbenchPage page, Range optionalRange) {
 			}
 		} else {
 			openFileLocationInEditor(uri, page, optionalRange);
-		} 
+		}
 	}
 
 	protected static void openIntroURL(final String uri) {
@@ -604,15 +604,21 @@ protected static void openFileLocationInEditor(String uri, IWorkbenchPage page,
 	}
 
 	public static IDocument getDocument(ITextEditor editor) {
-		try {
-			Method getSourceViewerMethod= AbstractTextEditor.class.getDeclaredMethod("getSourceViewer"); //$NON-NLS-1$
-			getSourceViewerMethod.setAccessible(true);
-			ITextViewer viewer = (ITextViewer) getSourceViewerMethod.invoke(editor);
-			return viewer.getDocument();
-		} catch (Exception ex) {
-			LanguageServerPlugin.logError(ex);
-			return null;
+		IDocument res = getDocument(editor.getEditorInput());
+		if (res != null) {
+			return res;
 		}
+		if (editor instanceof AbstractTextEditor) {
+			try {
+				Method getSourceViewerMethod= AbstractTextEditor.class.getDeclaredMethod("getSourceViewer"); //$NON-NLS-1$
+				getSourceViewerMethod.setAccessible(true);
+				ITextViewer viewer = (ITextViewer) getSourceViewerMethod.invoke(editor);
+				return viewer.getDocument();
+			} catch (Exception ex) {
+				LanguageServerPlugin.logError(ex);
+			}
+		}
+		return null;
 	}
 
 	public static IDocument getDocument(IEditorInput editorInput) {