CR feedback and refactor bug fix

Author: zhengbli

typescript/libs/node_client.py

@@ -25,7 +25,7 @@ def sendCmd(self, cmd, cb): pass
 
     def sendCmdSync(self, cmd): pass
 
-    def sendCmdAsync(self, cmd): pass
+    def sendCmdAsync(self, cmd, cb): pass
 
 
 class NodeCommClient(CommClient):
@@ -111,7 +111,7 @@ def makeTimeoutMsg(self, cmd, seq):
         }
         return timeoutMsg
 
-    def sendCmd(self, cmd, seq, cb):
+    def sendCmd(self, cmd, cb, seq):
         """
         send single-line command string; no sequence number; wait for response
         this assumes stdin/stdout; for TCP, need to add correlation with sequence numbers
@@ -133,7 +133,7 @@ def sendCmd(self, cmd, seq, cb):
             if (cb):
                 cb(self.makeTimeoutMsg(cmd, seq))
 
-    def sendCmdAsync(self, cmd, seq, cb):
+    def sendCmdAsync(self, cmd, cb, seq):
         """
         Sends the command and registers a callback
         """

typescript/libs/service_proxy.py

@@ -47,31 +47,31 @@ def completions(self, path, location=Location(1, 1), prefix="", on_completed=Non
         json_str = json_helpers.encode(req_dict)
         self.__comm.sendCmd(
             json_str,
-            req_dict["seq"],
-            lambda response_dict: None if on_completed is None else on_completed(response_dict)
+            lambda response_dict: None if on_completed is None else on_completed(response_dict),
+            req_dict["seq"]
         )
 
     def async_completions(self, path, location=Location(1, 1), prefix="", on_completed=None):
         args = {"file": path, "line": location.line, "offset": location.offset, "prefix": prefix}
         req_dict = self.create_req_dict("completions", args)
         json_str = json_helpers.encode(req_dict)
-        self.__comm.sendCmdAsync(json_str, req_dict["seq"], on_completed)
+        self.__comm.sendCmdAsync(json_str, on_completed, req_dict["seq"])
 
     def signature_help(self, path, location=Location(1, 1), prefix="", on_completed=None):
         args = {"file": path, "line": location.line, "offset": location.offset, "prefix": prefix}
         req_dict = self.create_req_dict("signatureHelp", args)
         json_str = json_helpers.encode(req_dict)
         self.__comm.sendCmd(
             json_str,
-            req_dict["seq"],
-            lambda response_dict: None if on_completed is None else on_completed(response_dict)
+            lambda response_dict: None if on_completed is None else on_completed(response_dict),
+            req_dict["seq"]
         )
 
     def async_signature_help(self, path, location=Location(1, 1), prefix="", on_completed=None):
         args = {"file": path, "line": location.line, "offset": location.offset, "prefix": prefix}
         req_dict = self.create_req_dict("signatureHelp", args)
         json_str = json_helpers.encode(req_dict)
-        self.__comm.sendCmdAsync(json_str, req_dict["seq"], on_completed)
+        self.__comm.sendCmdAsync(json_str, on_completed, req_dict["seq"])
 
     def definition(self, path, location=Location(1, 1)):
         args = {"file": path, "line": location.line, "offset": location.offset}
@@ -130,7 +130,7 @@ def reload_async(self, path, alternate_path, on_completed):
         args = {"file": path, "tmpfile": alternate_path}
         req_dict = self.create_req_dict("reload", args)
         json_str = json_helpers.encode(req_dict)
-        self.__comm.sendCmdAsync(json_str, req_dict["seq"], on_completed)
+        self.__comm.sendCmdAsync(json_str, on_completed, req_dict["seq"])
 
     def rename(self, path, location=Location(1, 1)):
         args = {"file": path, "line": location.line, "offset": location.offset}
@@ -160,14 +160,14 @@ def quick_info(self, path, location=Location(1, 1), on_completed=None):
         if not IS_ST2:
             self.__comm.sendCmdAsync(
                 json_str,
-                req_dict["seq"],
-                callback
+                callback,
+                req_dict["seq"]
             )
         else:
             self.__comm.sendCmd(
                 json_str,
-                req_dict["seq"],
-                callback
+                callback,
+                req_dict["seq"]
             )
 
     def get_event(self):

typescript/libs/view_helpers.py

@@ -106,7 +106,7 @@ def is_special_view(view):
     in that they cannot be the active_view of their windows, therefore their ids 
     shouldn't be equal to the current view id.
     """
-    return view.window() and view.id() != view.window().active_view().id()
+    return view is not None and view.window() and view.id() != view.window().active_view().id()
 
 
 def get_location_from_view(view):

typescript/listeners/rename.py

@@ -9,7 +9,7 @@ def on_load(self, view):
         if client_info and client_info.rename_on_load:
             view.run_command(
                 'typescript_delayed_rename_file',
-                {"locs_name": client_info.renameOnLoad}
+                {"locs_name": client_info.rename_on_load}
             )
             client_info.rename_on_load = None