Fix the decorators display issue

jdneo · jdneo · commit b397c2c772c7 · 2022-11-16T13:01:00.000+08:00
Signed-off-by: sheche &lt;sheche@microsoft.com&gt;
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionRanking.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionRanking.java
@@ -18,6 +18,16 @@
  * The ranking result of each completion proposal.
  */
 public class CompletionRanking {
+
+	/**
+	 * The allowed max score.
+	 */
+	public static final int MAX_SCORE = 100;
+
+	/**
+	 * The allowed min score.
+	 */
+	public static final int MIN_SCORE = 0;
 	/**
 	 * The score of the completion proposal. Score will be added to the proposal's relevance field.
 	 */
@@ -39,8 +49,9 @@ public class CompletionRanking {
 	/**
 	 * The score of the completion proposal. Score will be added to the proposal's relevance field.
 	 * <p>
-	 * The acceptable values are [0, 100]. When adding to the relevance, values larger than 100 will
-	 * be treated as 100 and value lower than 0 will be treated as 0.
+	 * The acceptable values are [{@link #MIN_SCORE}, {@link #MAX_SCORE}]. When adding to the relevance, values larger than
+	 * {@link #MAX_SCORE} will be treated as {@link #MAX_SCORE}.Values lower than {@link #MIN_SCORE} will be treated as
+	 * {@link #MIN_SCORE}.
 	 */
 	public int getScore() {
 		return score;
@@ -49,8 +60,9 @@ public int getScore() {
 	/**
 	 * The score of the completion proposal. Score will be added to the proposal's relevance field.
 	 * <p>
-	 * The acceptable values are [0, 100]. When adding to the relevance, values larger than 100 will
-	 * be treated as 100 and value lower than 0 will be treated as 0.
+	 * The acceptable values are [{@link #MIN_SCORE}, {@link #MAX_SCORE}]. When adding to the relevance, values larger than
+	 * {@link #MAX_SCORE} will be treated as {@link #MAX_SCORE}.Values lower than {@link #MIN_SCORE} will be treated as
+	 * {@link #MIN_SCORE}.
 	 */
 	public void setScore(int score) {
 		this.score = score;
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionRankingAggregation.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionRankingAggregation.java
@@ -12,10 +12,14 @@
  *******************************************************************************/
 package org.eclipse.jdt.ls.core.internal.handlers;
 
+import static org.eclipse.jdt.ls.core.internal.handlers.CompletionRanking.MAX_SCORE;
+import static org.eclipse.jdt.ls.core.internal.handlers.CompletionRanking.MIN_SCORE;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Aggregated result of all the ranking results from ranking providers.
@@ -41,25 +45,26 @@ public int getScore() {
 	}
 
 	/**
-	 * Add score from a ranking provider. The acceptable values are [0, 100].
-	 * When adding to the relevance, values larger than 100 will be treated as
-	 * 100 and value lower than 0 will be treated as 0.
+	 * Add score from a ranking provider. The acceptable values are [{@link CompletionRanking#MIN_SCORE},
+	 * {@link CompletionRanking#MAX_SCORE}]. When adding to the relevance, values larger than {@link CompletionRanking#MAX_SCORE}
+	 * will be treated as {@link CompletionRanking#MAX_SCORE} and value lower than {@link CompletionRanking#MIN_SCORE}
+	 * will be treated as {@link CompletionRanking#MIN_SCORE}.
 	 * @param score score from a ranking provider.
 	 */
 	public void addScore(int score) {
-		if (score <= 0) {
+		if (score <= MIN_SCORE) {
 			return;
 		}
 
-		this.score += score > 100 ? 100 : score;
+		this.score += score > MAX_SCORE ? MAX_SCORE : score;
 	}
 
 	/**
 	 * Get the aggregated decorators from all ranking providers.
 	 * The decorator chars will be de-duplicated and sorted.
 	 */
 	public String getDecorators() {
-		return String.valueOf(this.decorators.stream().sorted().toArray(Character[]::new));
+		return this.decorators.stream().sorted().map(String::valueOf).collect(Collectors.joining());
 	}
 
 	/**
