temp save

Author: zhengbli

Preferences.sublime-settings

@@ -1,5 +1,5 @@
 {
     "typescript_auto_format": true,
     "auto_complete_commit_on_tab": true,
-    "project_error_list": false
+    "project_error_list": true
 }

tsserver/tsserver.js

@@ -1,4 +1,4 @@
-from .reference import RefInfo
+from .reference import RefInfo
 from .node_client import NodeCommClient
 from .service_proxy import ServiceProxy
 from .global_vars import *

tsserver/tsserver.js.map

@@ -62,6 +62,7 @@ def __init__(self, scriptPath):
         # start node process
         pref_settings = sublime.load_settings('Preferences.sublime-settings')
         node_path = pref_settings.get('node_path')
+        project_error_list_enabled = pref_settings.get('project_error_list')
         if node_path:
             node_path = os.path.expandvars(node_path)
         if not node_path:
@@ -85,14 +86,20 @@ def __init__(self, scriptPath):
                     si.dwFlags |= subprocess.SW_HIDE | subprocess.STARTF_USESHOWWINDOW
                     self.__serverProc = subprocess.Popen([node_path, scriptPath],
                                                          stdin=subprocess.PIPE, stdout=subprocess.PIPE, startupinfo=si)
-                    self.__workerProc = subprocess.Popen([node_path, scriptPath],
-                                                         stdin=subprocess.PIPE, stdout=subprocess.PIPE, startupinfo=si)
+                    if project_error_list_enabled:
+                        self.__workerProc = subprocess.Popen([node_path, scriptPath],
+                                                             stdin=subprocess.PIPE, stdout=subprocess.PIPE, startupinfo=si)
+                    else:
+                        self.__workerProc = None
                 else:
                     log.debug("opening " + node_path + " " + scriptPath)
                     self.__serverProc = subprocess.Popen([node_path, scriptPath],
                                                          stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-                    self.__workerProc = subprocess.Popen([node_path, scriptPath],
-                                                         stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+                    if project_error_list_enabled:
+                        self.__workerProc = subprocess.Popen([node_path, scriptPath],
+                                                             stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+                    else:
+                        self.__workerProc = None
             except:
                 self.__serverProc = None
                 self.__workerProc = None
@@ -105,7 +112,7 @@ def __init__(self, scriptPath):
             readerThread.daemon = True
             readerThread.start()
 
-        if pref_settings.get('project_error_list'):
+        if project_error_list_enabled:
             # start the worker thread
             if self.__workerProc and not self.__workerProc.poll():
                 log.debug("worker proc {0}".format(self.__workerProc))

typescript/libs/editor_client.py

@@ -1,9 +1,6 @@
-import collections
-
 from . import json_helpers
 from .node_client import CommClient
 from .text_helpers import Location
-from .editor_client import cli
 
 
 class ServiceProxy:

typescript/libs/node_client.py

@@ -1,4 +1,4 @@
-import sublime
+import sublime
 
 from ..libs.view_helpers import *
 from ..libs.text_helpers import *

typescript/libs/service_proxy.py

@@ -3,8 +3,6 @@
 from ..libs import log
 from .event_hub import EventHub
 
-from ..commands import TypescriptProjectErrorList
-
 
 class IdleListener:
     def __init__(self):
@@ -60,8 +58,6 @@ def request_errors(self, view, info, error_delay):
                     check_update_view(group_active_view)
             if len(files) > 0:
                 cli.service.request_get_err(error_delay, files)
-                if cli.project_error_list_enabled:
-                    cli.service.request_get_err_for_project(error_delay, active_view().file_name())
                 self.error_info_requested_not_received = True
             self.wait_count = 0
             self.set_on_idle_timer(error_delay + 300)
@@ -160,15 +156,6 @@ def handle_time_out(self):
         if self.pending_timeout == 0:
             self.on_idle()
 
-    def update_project_error_list(self):
-        # Retrieve the project wide errors
-        test_ev = cli.service.get_event_from_worker()
-        error_list_panel = TypescriptProjectErrorList.error_list_panel
-        if is_view_visible(error_list_panel):
-            while test_ev:
-                error_list_panel.run_command("append", {"characters": str(test_ev) + "\n"})
-                test_ev = cli.service.get_event_from_worker()
-
     def on_idle(self):
         """Callback after the idle status is confirmed
 
@@ -178,9 +165,6 @@ def on_idle(self):
         view = active_view()
         log.debug("call get_event from on_idle")
 
-        if cli.project_error_list_enabled:
-            self.update_project_error_list()
-
         ev = cli.service.get_event()
         if ev is not None:
             self.error_info_requested_not_received = False

typescript/listeners/completion.py

@@ -0,0 +1,74 @@
+from ..libs.view_helpers import *
+from ..libs.text_helpers import *
+from ..libs import log
+from .event_hub import EventHub
+
+from ..commands import TypescriptProjectErrorList
+
+
+class ProjectErrorListener:
+
+    def __init__(self):
+        self.just_changed_focus = False
+        self.modified = False
+        self.error_info_requested_not_received = False
+
+    def on_activated_with_info(self, view, info):
+        # Ask server for initial error diagnostics
+        self.request_errors(view, info, 200)
+        self.set_on_idle_timer(IDLE_TIME_LENGTH)
+        self.just_changed_focus = True
+
+    def post_on_modified(self, view):
+        if not is_special_view(view):
+            self.modified = True
+            self.set_on_idle_timer(100)
+
+    def set_on_idle_timer(self, ms):
+        """Set timer to go off when file not being modified"""
+        self.pending_timeout += 1
+        sublime.set_timeout(self.handle_time_out, ms)
+
+    def handle_time_out(self):
+        self.pending_timeout -= 1
+        # Only process one idle request during the timeout period
+        if self.pending_timeout == 0:
+            self.on_idle()
+
+    def on_idle(self):
+        if cli.project_error_list_enabled:
+            self.update_project_error_list()
+
+        view = active_view()
+        info = get_info(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 (
+            self.just_changed_focus or
+            info.change_count_when_last_err_req_sent < change_count(view)
+        ):
+            self.just_changed_focus = False
+            cli.service.request_get_err_for_project(error_delay, view.file_name())
+            self.set_on_idle_timer(error_delay + 300)
+
+    def update_project_error_list(self):
+        # Retrieve the project wide errors
+        error_list_panel = TypescriptProjectErrorList.error_list_panel
+        test_ev = cli.service.get_event_from_worker()
+        if test_ev:
+            self.error_info_requested_not_received = False
+            if is_view_visible(error_list_panel):
+                while test_ev:
+                    error_list_panel.run_command("append", {"characters": str(test_ev) + "\n"})
+                    test_ev = cli.service.get_event_from_worker()
+            self.set_on_idle_timer(50)
+        elif self.error_info_requested_not_received:
+            self.set_on_idle_timer(50)
+
+listener = ProjectErrorListener()
+EventHub.subscribe("on_activated_with_info", listener.on_activated_with_info)
+EventHub.subscribe("post_on_modified", listener.post_on_modified)