Merge PR #11965: Partial revert of #11817.

Reviewed-by: ejgallego

1 files changed, 11 insertions, 1 deletions

diff --git a/ide/wg_Completion.ml b/ide/wg_Completion.ml
index a7f8c70499..dcb71d96a1 100644
--- a/ide/wg_Completion.ml
+++ b/ide/wg_Completion.ml
@@ -8,7 +8,17 @@
 (*         *     (see LICENSE file for the text of the license)         *)
 (************************************************************************)
 
-module Proposals = CString.Set
+module StringOrd =
+struct
+  type t = string
+  let compare s1 s2 =
+    (* we use first size, then usual comparison *)
+    let d = String.length s1 - String.length s2 in
+    if d <> 0 then d
+    else compare s1 s2
+end
+
+module Proposals = Set.Make(StringOrd)
 
 (** Retrieve completion proposals in the buffer *)
 let get_syntactic_completion (buffer : GText.buffer) pattern accu =