Skip to content

Handle Javadoc for both old and new jdt.ls versions #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
datho7561 wants to merge 1 commit into from
Closed

Handle Javadoc for both old and new jdt.ls versions #524

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions ...lsp4mp.jdt.core/src/main/java/org/eclipse/lsp4mp/jdt/internal/core/ls/JDTUtilsLSImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
package org.eclipse.lsp4mp.jdt.internal.core.ls;

import java.io.Reader;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Optional;
import java.util.Scanner;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.jobs.Job;
Expand Down Expand Up @@ -131,8 +134,26 @@ public void discoverSource(IClassFile classFile, IProgressMonitor progress) thro
@Override
public String getJavadoc(IMember member, DocumentFormat documentFormat) throws JavaModelException {
boolean markdown = DocumentFormat.Markdown.equals(documentFormat);
return markdown ? JavadocContentAccess2.getMarkdownContent(member)
: JavadocContentAccess2.getPlainTextContent(member);
try {
Method getMarkdownContent = JavadocContentAccess2.class.getMethod("getMarkdownContent", IJavaElement.class);
Method getPlainTextContent = JavadocContentAccess2.class.getMethod("getPlainTextContent", IMember.class);
return markdown ? (String)getMarkdownContent.invoke(null, member) : (String)getPlainTextContent.invoke(null, member);
} catch (NoSuchMethodException e) {
try {
Method getMarkdownContentReader = JavadocContentAccess2.class.getMethod("getMarkdownContentReader", IJavaElement.class);
Method getPlainTextContentReader = JavadocContentAccess2.class.getMethod("getPlainTextContentReader", IMember.class);
return markdown ? toString((Reader)getMarkdownContentReader.invoke(null, member)) : toString((Reader)getPlainTextContentReader.invoke(null, member));
} catch (NoSuchMethodException e1) {
ILog.get().error("Cannot get Javadoc: cannot access method through reflection", e1);
return "";
} catch (IllegalAccessException | InvocationTargetException e1) {
ILog.get().error("Cannot get Javadoc: error when invoking method through reflection", e);
return "";
}
} catch (IllegalAccessException | InvocationTargetException e) {
ILog.get().error("Cannot get Javadoc: error when invoking method through reflection", e);
return "";
}
}

private static String toString(Reader reader) {
Expand Down