From 92366d50c68c2188b9ad1848a5c16c78e7a4a342 Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@gmail.com>
Date: Wed, 25 Sep 2024 12:57:55 +0200
Subject: [PATCH] fix relevance-based ranking for java proposals to be based on
 lsp4e core rank score computation

---
 org.eclipse.lsp4e.jdt/META-INF/MANIFEST.MF          |  2 +-
 .../lsp4e/jdt/LSJavaCompletionProposalComputer.java |  9 ++++-----
 .../src/org/eclipse/lsp4e/jdt/LSJavaProposal.java   | 13 ++++++++-----
 .../eclipse/lsp4e/jdt/LSJavaProposalExtension.java  | 10 +++++-----
 .../eclipse/lsp4e/jdt/LSJavaProposalExtension2.java |  4 ++--
 .../lsp4e/jdt/LspJavaQuickAssistProcessor.java      |  7 +++----
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/org.eclipse.lsp4e.jdt/META-INF/MANIFEST.MF b/org.eclipse.lsp4e.jdt/META-INF/MANIFEST.MF
index a78b0607d..a9038e787 100644
--- a/org.eclipse.lsp4e.jdt/META-INF/MANIFEST.MF
+++ b/org.eclipse.lsp4e.jdt/META-INF/MANIFEST.MF
@@ -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.13.1.qualifier
+Bundle-Version: 0.13.2.qualifier
 Automatic-Module-Name: org.eclipse.lsp4e.jdt
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ClassPath: .
diff --git a/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaCompletionProposalComputer.java b/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaCompletionProposalComputer.java
index 8fa5035e7..ef2d40984 100644
--- a/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaCompletionProposalComputer.java
+++ b/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaCompletionProposalComputer.java
@@ -84,19 +84,18 @@ private ICompletionProposal[] asJavaProposals(CompletableFuture<ICompletionPropo
 		// We assume that the original proposals are in the correct order, so we set relevance
 		// based on this existing order. Note that based on IJavaCompletionProposal javadoc,
 		// relevance values are [0,1000] so we start at 1000
-		int relevance = 1000;
 		final var javaProposals = new ICompletionProposal[originalProposals.length];
 
 		for (int i = 0; i < originalProposals.length; i++) {
 			if (originalProposals[i] instanceof ICompletionProposalExtension2) {
-				javaProposals[i] = new LSJavaProposalExtension2(originalProposals[i], relevance--);
+				javaProposals[i] = new LSJavaProposalExtension2(originalProposals[i]);
 			} else if (originalProposals[i] instanceof ICompletionProposalExtension) {
-				javaProposals[i] = new LSJavaProposalExtension(originalProposals[i], relevance--);
+				javaProposals[i] = new LSJavaProposalExtension(originalProposals[i]);
 			} else {
-				javaProposals[i] = new LSJavaProposal(originalProposals[i], relevance--);
+				javaProposals[i] = new LSJavaProposal(originalProposals[i]);
 			}
 		}
-
+		
 		return javaProposals;
 	}
 
diff --git a/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaProposal.java b/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaProposal.java
index 8c87c9314..c74ee0f19 100644
--- a/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaProposal.java
+++ b/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaProposal.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022, 2023 VMware Inc. and others.
+ * Copyright (c) 2022, 2024 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/
@@ -16,17 +16,16 @@
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.lsp4e.operations.completion.LSCompletionProposal;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 
 class LSJavaProposal implements IJavaCompletionProposal {
 
 	protected ICompletionProposal delegate;
-	private int relevance;
 
-	public LSJavaProposal(ICompletionProposal delegate,  int relevance) {
+	public LSJavaProposal(ICompletionProposal delegate) {
 		this.delegate = delegate;
-		this.relevance = relevance;
 	}
 
 	@Override
@@ -61,7 +60,11 @@ public String getDisplayString() {
 
 	@Override
 	public int getRelevance() {
-		return relevance;
+		if (delegate instanceof LSCompletionProposal) {
+			int rankScore = ((LSCompletionProposal) delegate).getRankScore();
+			return 1000 - rankScore;
+		}
+		return -1;
 	}
 
 }
diff --git a/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaProposalExtension.java b/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaProposalExtension.java
index 3176ead64..e58b3f3c4 100644
--- a/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaProposalExtension.java
+++ b/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaProposalExtension.java
@@ -18,8 +18,8 @@
 
 class LSJavaProposalExtension extends LSJavaProposal implements ICompletionProposalExtension {
 
-	public LSJavaProposalExtension(ICompletionProposal delegate, int relevance) {
-		super(delegate, relevance);
+	public LSJavaProposalExtension(ICompletionProposal delegate) {
+		super(delegate);
 	}
 
 	@Override
@@ -32,7 +32,7 @@ public void apply(IDocument doc, char trigger, int offset) {
 	@Override
 	public int getContextInformationPosition() {
 		if (delegate instanceof ICompletionProposalExtension proposalExt) {
-			proposalExt.getContextInformationPosition();
+			return proposalExt.getContextInformationPosition();
 		}
 		return -1;
 	}
@@ -40,7 +40,7 @@ public int getContextInformationPosition() {
 	@Override
 	public char @Nullable [] getTriggerCharacters() {
 		if (delegate instanceof ICompletionProposalExtension proposalExt) {
-			proposalExt.getTriggerCharacters();
+			return proposalExt.getTriggerCharacters();
 		}
 		return null;
 	}
@@ -48,7 +48,7 @@ public int getContextInformationPosition() {
 	@Override
 	public boolean isValidFor(IDocument doc, int offset) {
 		if (delegate instanceof ICompletionProposalExtension proposalExt) {
-			proposalExt.isValidFor(doc, offset);
+			return proposalExt.isValidFor(doc, offset);
 		}
 		return false;
 	}
diff --git a/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaProposalExtension2.java b/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaProposalExtension2.java
index 14b65cc52..388c8caf8 100644
--- a/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaProposalExtension2.java
+++ b/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaProposalExtension2.java
@@ -20,8 +20,8 @@
 
 class LSJavaProposalExtension2 extends LSJavaProposal implements ICompletionProposalExtension2 {
 
-	public LSJavaProposalExtension2(ICompletionProposal delegate, int relevance) {
-		super(delegate, relevance);
+	public LSJavaProposalExtension2(ICompletionProposal delegate) {
+		super(delegate);
 	}
 
 	@Override
diff --git a/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LspJavaQuickAssistProcessor.java b/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LspJavaQuickAssistProcessor.java
index abc4c5893..e56da7142 100644
--- a/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LspJavaQuickAssistProcessor.java
+++ b/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LspJavaQuickAssistProcessor.java
@@ -29,7 +29,6 @@
 @SuppressWarnings("restriction")
 public class LspJavaQuickAssistProcessor extends LSPCodeActionQuickAssistProcessor implements IQuickAssistProcessor {
 
-	private static final int RELEVANCE = 100;
 	private static final IJavaCompletionProposal[] NO_JAVA_COMPLETION_PROPOSALS = new IJavaCompletionProposal[0];
 
 	private IQuickAssistInvocationContext getContext(IInvocationContext context) {
@@ -73,11 +72,11 @@ public boolean hasAssists(@NonNullByDefault({}) IInvocationContext context) thro
 			 * proper completion proposal extension
 			 */
 			if (proposals[i] instanceof ICompletionProposalExtension2) {
-				javaProposals[i] = new LSJavaProposalExtension2(proposals[i], RELEVANCE);
+				javaProposals[i] = new LSJavaProposalExtension2(proposals[i]);
 			} else if (proposals[i] instanceof ICompletionProposalExtension) {
-				javaProposals[i] = new LSJavaProposalExtension(proposals[i], RELEVANCE);
+				javaProposals[i] = new LSJavaProposalExtension(proposals[i]);
 			} else {
-				javaProposals[i] = new LSJavaProposal(proposals[i], RELEVANCE);
+				javaProposals[i] = new LSJavaProposal(proposals[i]);
 			}
 		}
 		return javaProposals;