Merge pull request #171 from Microsoft/fixCompletionIssue170

Fix completion issue 170 plus one more

Author: steveluc

TypeScript.py

@@ -510,6 +510,7 @@ def __init__(self):
         self.fileMap = {}
         self.pendingCompletions = []
         self.completionsReady = False
+        self.completionsLoc = None
         self.completionView = None
         self.mruFileList = []
         self.pendingTimeout = 0
@@ -520,6 +521,7 @@ def __init__(self):
         self.about_to_close_all = False
         self.was_paren_pressed = False
 
+
     def getInfo(self, view):
         info = None
         if view.file_name() is not None:
@@ -830,6 +832,9 @@ def on_selection_modified(self, view):
             # on_modified) what was inserted
             info.prevSel = copyRegionsStatic(view.sel())
             if self.mod:
+                # backspace past start of completion
+                if info.lastCompletionLoc and (info.lastCompletionLoc > view.sel()[0].begin()):
+                    view.run_command('hide_auto_complete')
                 self.setOnSelectionIdleTimer(1250)
             else:
                 self.setOnSelectionIdleTimer(50)
@@ -990,7 +995,7 @@ def on_query_completions(self, view, prefix, locations):
                view.add_regions("apresComp", decrLocsToRegions(locations, 0), flags=sublime.HIDDEN)
             if (not self.completionsReady) or cli.ST2():
                 if info.lastCompletionLoc:
-                    if (((len(prefix)-1)+info.lastCompletionLoc == locations[0]) and (prefix.startswith(info.lastCompletionPrefix))):
+                    if ((len(prefix) > 0) and ((len(prefix)-1)+info.lastCompletionLoc == locations[0]) and (prefix.startswith(info.lastCompletionPrefix))):
                         return (info.lastCompletions,
                                 sublime.INHIBIT_WORD_COMPLETIONS | sublime.INHIBIT_EXPLICIT_COMPLETIONS)
 
@@ -1001,9 +1006,9 @@ def on_query_completions(self, view, prefix, locations):
                 else:
                     cli.service.asyncCompletions(view.file_name(), location, prefix, self.handleCompletionInfo)
             completions = self.pendingCompletions
+            info.lastCompletionLoc = locations[0]
             if self.completionsReady:
                 info.lastCompletions = completions
-                info.lastCompletionLoc = locations[0]
                 info.lastCompletionPrefix = prefix
             self.pendingCompletions = []
             self.completionsReady = False

libs/serviceproxy.py

@@ -45,10 +45,10 @@ def completions(self, path, location=Location(1, 1), prefix="", on_completed=Non
         args = {"file": path, "line": location.line, "offset": location.offset, "prefix": prefix}
         req_dict = self.create_req_dict("completions", args)
         json_str = jsonhelpers.encode(req_dict)
-        self.__comm.sendCmdAsync(
+        self.__comm.sendCmd(
+            lambda json_dict: None if on_completed is None else on_completed(json_dict), 
             json_str, 
-            req_dict["seq"],
-            lambda response_dict: None if on_completed is None else on_completed(response_dict),
+            req_dict["seq"]
             )
 
     def asyncCompletions(self, path, location=Location(1, 1), prefix="", on_completed=None):