[JLINE-699] Make candidates for completion unique

jline · Sep 18, 2021 · 74c97a2 · 74c97a2
1 parent 9ca636f
commit 74c97a2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/reader/src/main/java/org/jline/reader/Candidate.java b/reader/src/main/java/org/jline/reader/Candidate.java
@@ -138,6 +138,19 @@ public int compareTo(Candidate o) {
         return value.compareTo(o.value);
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Candidate candidate = (Candidate) o;
+        return Objects.equals(value, candidate.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(value);
+    }
+
     @Override
     public String toString() {
         return "Candidate{" + value + "}";

diff --git a/reader/src/main/java/org/jline/reader/impl/CompletionMatcherImpl.java b/reader/src/main/java/org/jline/reader/impl/CompletionMatcherImpl.java
@@ -54,7 +54,7 @@ public List<Candidate> matches(List<Candidate> candidates) {
                 break;
             }
         }
-        return !matching.isEmpty() ? matching.entrySet().stream().flatMap(e -> e.getValue().stream()).collect(Collectors.toList())
+        return !matching.isEmpty() ? matching.entrySet().stream().flatMap(e -> e.getValue().stream()).distinct().collect(Collectors.toList())
                                    : new ArrayList<>();
     }
 

diff --git a/reader/src/test/java/org/jline/reader/impl/CompletionWithCustomMatcherTest.java b/reader/src/test/java/org/jline/reader/impl/CompletionWithCustomMatcherTest.java
@@ -12,8 +12,11 @@
 import org.junit.Test;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Map;
 
+import static org.junit.Assert.assertEquals;
+
 
 public class CompletionWithCustomMatcherTest extends ReaderTestSupport {
 
@@ -30,6 +33,8 @@ public void compile(Map<LineReader.Option, Boolean> options, boolean prefix, Com
                     // add custom matcher before typo matcher
                     int pos = matchers.size() + (LineReader.Option.COMPLETE_MATCHER_TYPO.isSet(options) ? -1 : 0);
                     matchers.add(pos, simpleMatcher(candidate -> camelMatch(line.word(), 0, candidate, 0)));
+                    Candidate c = new Candidate(line.word());
+                    assertEquals("Expected only one element", 1, matches(Arrays.asList(c, c)).size());
                 }
             }
         });