Copy annotation when adding candidate to candidate-list

https://bugzilla.redhat.com/show_bug.cgi?id=1136421
ueno · Sep 17, 2014 · 1debd7a · 1debd7a
1 parent 5c40313
commit 1debd7a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/libkkc/candidate-list.vala b/libkkc/candidate-list.vala
@@ -63,7 +63,7 @@ namespace Kkc {
             }
         }
 
-        Set<string> seen = new Gee.HashSet<string> ();
+        Map<string, Candidate> seen = new Gee.HashMap<string, Candidate> ();
 
         internal void clear () {
             bool is_populated = false;
@@ -94,12 +94,18 @@ namespace Kkc {
         }
 
         internal bool add (Candidate candidate) {
-            if (!(candidate.output in seen)) {
+            if (candidate.output in seen) {
+                var c = seen.get (candidate.output);
+                // If the given candidate has annotation and the
+                // existing one doesn't, copy it.
+                if (c.annotation == null && candidate.annotation != null)
+                    c.annotation = candidate.annotation;
+                return false;
+            } else {
                 _candidates.add (candidate);
-                seen.add (candidate.output);
+                seen.set (candidate.output, candidate);
                 return true;
             }
-            return false;
         }
 
         internal bool add_all (CandidateList other) {

diff --git a/tests/context.vala b/tests/context.vala
@@ -139,6 +139,17 @@ class ContextTests : Kkc.TestCase {
         context.reset ();
         context.clear_output ();
 
+        try {
+            context.process_key_events ("a i SPC RET a i SPC SPC");
+        } catch (Kkc.KeyEventFormatError e) {
+            assert_not_reached ();
+        }
+        assert (context.candidates.size > 0);
+        assert (context.candidates.get (0).output == "愛");
+        assert (context.candidates.get (0).annotation == "a");
+        context.reset ();
+        context.clear_output ();
+
         try {
             context.process_key_events ("k C-g");
         } catch (Kkc.KeyEventFormatError e) {