Skip to content

Supply proper information display string for completion proposal #1453

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

Merged
martinlippert merged 1 commit into from
Dec 5, 2025
Merged

Supply proper information display string for completion proposal #1453

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion org.eclipse.lsp4e.jdt/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JDT Integration for LSP4E
Bundle-SymbolicName: org.eclipse.lsp4e.jdt;singleton:=true
Bundle-Version: 0.14.0.qualifier
Bundle-Version: 0.14.1.qualifier
Export-Package: org.eclipse.lsp4e.jdt
Automatic-Module-Name: org.eclipse.lsp4e.jdt
Bundle-Activator: org.eclipse.lsp4e.jdt.LanguageServerJdtPlugin
Expand Down
29 changes: 9 additions & 20 deletions org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaProposal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2022, 2024 VMware Inc. and others.
* Copyright (c) 2022, 2025 VMware Inc. and others.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
Expand All @@ -18,25 +18,21 @@

import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.jdt.internal.codeassist.RelevanceConstants;
import org.eclipse.jdt.internal.ui.text.java.AbstractJavaCompletionProposal;
import org.eclipse.jdt.internal.ui.text.java.hover.JavadocBrowserInformationControlInput;
import org.eclipse.jdt.internal.ui.text.java.hover.JavadocHover;
import org.eclipse.jdt.ui.PreferenceConstants;
import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.jface.internal.text.html.BrowserInformationControl;
import org.eclipse.jface.internal.text.html.HTMLPrinter;
import org.eclipse.jface.resource.ColorRegistry;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.IInformationControlCreator;
import org.eclipse.lsp4e.LanguageServerPlugin;
import org.eclipse.lsp4e.operations.completion.LSCompletionProposal;
import org.eclipse.lsp4e.ui.UI;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchPart;
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;

Expand Down Expand Up @@ -98,21 +94,10 @@ private int computeBaseRelevance() {
return base;
}

/*
* Copied from org.eclipse.jdt.internal.ui.text.java.AbstractJavaCompletionProposal.getInformationControlCreator()
*/
@Override
public @Nullable IInformationControlCreator getInformationControlCreator() {
Shell shell= UI.getActiveShell();
if (shell == null || !BrowserInformationControl.isAvailable(shell))
return null;

if (infoControlCreator == null) {
/*
* see https://bugs.eclipse.org/bugs/show_bug.cgi?id=232024
*/
IWorkbenchPart part = UI.getActivePart();
JavadocHover.PresenterControlCreator presenterControlCreator= new JavadocHover.PresenterControlCreator(part == null ? null : part.getSite());
IInformationControlCreator presenterControlCreator = super.getInformationControlCreator();
infoControlCreator= new JavadocHover.HoverControlCreator(presenterControlCreator, true);
}
return infoControlCreator;
Expand All @@ -129,10 +114,14 @@ public Object getAdditionalProposalInfo(IProgressMonitor monitor) {
RGB bgRGB= registry.getRGB("org.eclipse.jdt.ui.Javadoc.backgroundColor"); //$NON-NLS-1$
HTMLPrinter.insertPageProlog(buffer, 0, fgRGB, bgRGB, getCSSStyles());
HTMLPrinter.addPageEpilog(buffer);
return new JavadocBrowserInformationControlInput(null, null, buffer.toString(), 0);

return buffer.toString();
}

@Override
public @NonNull String getInformationDisplayString() {
return item.getLabel();
}

/**
* Returns the style information for displaying HTML (Javadoc) content.
* Copied from org.eclipse.jdt.internal.ui.text.java.AbstractJavaCompletionProposal.getCSSStyles()
Expand Down