temp save

Author: zhengbli

typescript/commands/__init__.py

@@ -1,4 +1,5 @@
-from .error_info import TypescriptErrorInfo, TypescriptProjectErrorList
+from .error_info import TypescriptErrorInfo
+from .error_list import TypescriptProjectErrorList
 from .go_to_definition import TypescriptGoToDefinitionCommand
 from .go_to_type import TypescriptGoToTypeCommand
 from .nav_to import TypescriptNavToCommand

typescript/commands/error_info.py

@@ -1,7 +1,7 @@
 import sublime_plugin
 
-from ..libs.view_helpers import cli
-from .base_command import TypeScriptBaseTextCommand, TypeScriptBaseWindowCommand
+from ..libs.view_helpers import *
+from .base_command import TypeScriptBaseTextCommand
 
 
 class TypescriptErrorInfo(TypeScriptBaseTextCommand):
@@ -24,21 +24,4 @@ def run(self, text):
         if len(error_text) > 0:
             self.view.set_status("typescript_error", error_text)
         else:
-            self.view.erase_status("typescript_error")
-
-
-class TypescriptProjectErrorList(TypeScriptBaseWindowCommand):
-
-    error_list_panel = None
-
-    def run(self):
-        if not self.is_panel_active():
-            TypescriptProjectErrorList.error_list_panel = self.window.create_output_panel("errorList")
-            cli.node_client.startWorker()
-        self.window.run_command("show_panel", {"panel": "output.errorList"})
-        
-    def is_panel_active(self):
-        view = TypescriptProjectErrorList.error_list_panel
-        return view is not None and is_view_visible(view)
-
-
+            self.view.erase_status("typescript_error")

typescript/commands/error_list.py

@@ -0,0 +1,27 @@
+from ..libs import global_vars
+from .base_command import TypeScriptBaseWindowCommand
+
+class TypescriptProjectErrorList(TypeScriptBaseWindowCommand):
+
+    error_list_panel = None
+
+    def run(self):
+        if not TypescriptProjectErrorList.error_list_panel:
+            TypescriptProjectErrorList.error_list_panel = self.window.create_output_panel("errorList")
+
+        if not cli.node_client.workerStarted():
+            view = active_view()
+            # start worker process
+            cli.node_client.startWorker()       
+            # load the active project
+            get_info(view)
+            # send the first error request
+            cli.service.request_get_err_for_project(0, view.file_name())
+
+        global_vars._is_worker_active = True
+        self.window.run_command("show_panel", {"panel": "output.errorList"})
+
+    @staticmethod
+    def is_worker_active():
+        panel = TypescriptProjectErrorList.error_list_panel  
+        return panel is not None and is_view_visible(panel)

typescript/libs/global_vars.py

@@ -36,10 +36,6 @@ def get_node_path():
 
 TSC_PATH = os.path.join(PLUGIN_DIR, "tsserver", "tsc.js")
 
-_project_error_list_started = False
-def is_project_error_list_started():
-    return _project_error_list_started
-
 # only Sublime Text 3 build after 3072 support tooltip
 TOOLTIP_SUPPORT = int(sublime.version()) >= 3072
 
@@ -55,3 +51,8 @@ def is_project_error_list_started():
 
 # idle time length in millisecond
 IDLE_TIME_LENGTH = 200
+
+# if the worker process for error list is running
+_is_worker_active = False
+def is_worker_active():
+    return _is_worker_active

typescript/libs/service_proxy.py

@@ -120,6 +120,13 @@ def open(self, path):
         if self.__comm.workerStarted():
             self.__comm.postCmdToWorker(json_str)
 
+    def open_on_worker(self, path):
+        args = {"file": path}
+        req_dict = self.create_req_dict("open", args)
+        json_str = json_helpers.encode(req_dict)
+        if self.__comm.workerStarted():
+            self.__comm.postCmdToWorker(json_str)
+
     def close(self, path):
         args = {"file": path}
         req_dict = self.create_req_dict("close", args)

typescript/libs/view_helpers.py

@@ -1,4 +1,4 @@
-import codecs
+import codecs
 
 from .global_vars import *
 from .editor_client import cli
@@ -32,6 +32,7 @@ def __init__(self, filename, cc):
 
 
 _file_map = dict()
+_file_map_on_worker = dict()
 
 
 def get_info(view):
@@ -57,9 +58,17 @@ def get_info(view):
                         reload_buffer(view, info.client_info)
                     else:
                         info.client_info.pending_changes = True
-                        # if info in most_recent_used_file_list:
-                        #     most_recent_used_file_list.remove(info)
-                        # most_recent_used_file_list.append(info)
+                        
+            if is_worker_active():
+                info_on_worker = _file_map_on_worker.get(file_name)
+                if not info_on_worker:
+                    _file_map_on_worker[file_name] = info
+                    open_file_on_worker(view)
+                    if view.is_dirty():
+                        if not view.is_loading():
+                            reload_buffer_on_worker(view)
+            else:
+                _file_map_on_worker.clear()
     return info
 
 
@@ -133,6 +142,9 @@ def open_file(view):
     """Open the file on the server"""
     cli.service.open(view.file_name())
 
+def open_file_on_worker(view):
+    """Open the file on the worker process"""
+    cli.service.open_on_worker(view.file_name())
 
 def reconfig_file(view):
     host_info = "Sublime Text version " + str(sublime.version())
@@ -213,6 +225,22 @@ def reload_buffer(view, client_info=None):
             client_info.change_count = info.modify_count
         client_info.pending_changes = False
 
+def reload_buffer_on_worker(view):
+    """Reload the buffer content on the worker process
+
+    Note: the worker process won't change the client_info object to avoid synchronization issues
+    """
+    if not view.is_loading():
+        tmpfile_name = get_tempfile_name()
+        tmpfile = codecs.open(tmpfile_name, "w", "utf-8")
+        text = view.substr(sublime.Region(0, view.size()))
+        tmpfile.write(text)
+        tmpfile.flush()
+        if not IS_ST2:
+            cli.service.reload_async(view.file_name(), tmpfile_name, recv_reload_response)
+        else:
+            reload_response = cli.service.reload(view.file_name(), tmpfile_name)
+            recv_reload_response(reload_response)
 
 def reload_required(view):
     client_info = cli.get_or_add_file(view.file_name())

typescript/listeners/project_error_list.py

@@ -15,7 +15,7 @@ def __init__(self):
 
     def on_activated_with_info(self, view, info):
         # Ask server for initial error diagnostics
-        if is_project_error_list_started():
+        if is_worker_active():
             self.request_errors(view, info, 200)
             self.set_on_idle_timer(IDLE_TIME_LENGTH)
             self.just_changed_focus = True
@@ -37,18 +37,16 @@ def handle_time_out(self):
             self.on_idle()
 
     def on_idle(self):
-        if cli.project_error_list_enabled:
-            self.update_project_error_list()
+        self.update_project_error_list()
 
-        view = active_view()
-        info = get_info(view)
+        info = get_info(active_view())
         if info:
             log.debug("asking for project errors")
             # request errors
             self.request_errors(view, info, 500)
 
     def request_errors(self, view, info, error_delay):
-        if info and cli.project_error_list_enabled and (
+        if info and (
             self.just_changed_focus or
             info.change_count_when_last_err_req_sent < change_count(view)
         ):