src/Palete/CompletionProvider.vala

diff --git a/src/Palete/CompletionProvider.vala b/src/Palete/CompletionProvider.vala
index bd2bef9..96e76a2 100644 (file)
--- a/src/Palete/CompletionProvider.vala
+++ b/src/Palete/CompletionProvider.vala
@@ -85,47 +85,10 @@ namespace Palete {
        
                public void populate (SourceCompletionContext context)
                {
-                       if (this.windowstate == null) {
-                               this.windowstate = this.editor.window.windowstate;
+                       this.fetchMatches(context, out has_matches);
+                       if (!has_matches) {
+                                   return;
                        }
-                       
-                       
-                       var buffer = context.completion.view.buffer;
-                       var  mark = buffer.get_insert ();
-                       TextIter end;
-
-                       buffer.get_iter_at_mark (out end, mark);
-                       var endpos = end;
-                       
-                       var searchpos = endpos;
-                       
-                       searchpos.backward_find_char(is_space, null);
-                       searchpos.forward_char();
-                       var search = endpos.get_text(searchpos);
-                       print("got search %s\n", search);
-                       
-                       if (search.length < 2) {
-                               return;
-                       }
-                       
-                       // now do our magic..
-                       var filtered_proposals = this.windowstate.file.palete().suggestComplete(
-                               this.windowstate.file,
-                               this.editor.node,
-                               this.editor.ptype,
-                               this.editor.key,
-                               search
-                       );
-                   
-                       print("GOT %d results\n", (int) filtered_proposals.length()); 
-                   
-                       if (filtered_proposals.length() < 2) {
-                           return;
-                       }
-                   
-                       filtered_proposals.sort((a, b) => {
-                               return ((string)(a.text)).collate((string)(b.text));
-                       });
                         
                        context.add_proposals (this, filtered_proposals, true);
                }