Add functions to retrieve project info from server

Author: zhengbli

typescript/commands/build.py

@@ -1,40 +1,41 @@
 import sublime_plugin
-import sublime
-import os
-from ..libs.global_vars import IS_ST2
+
+from ..libs.global_vars import *
+from ..libs import cli
 
 
 class TypescriptBuildCommand(sublime_plugin.WindowCommand):
     def run(self):
+        if get_node_path() is None:
+            print("Cannot found node. Build cancelled.")
+            return
+
         file_name = self.window.active_view().file_name()
-        directory = os.path.dirname(file_name)
-        if "tsconfig.json" in os.listdir(directory):
-            self.window.run_command("exec", {
-                "cmd": ["tsc"],
-                "file_regex": "^(.+?)\\((\\d+),(\\d+)\\): (.+)$",
-                "shell": True
-            })
-        else:
-            sublime.active_window().show_input_panel(
-                "Build parameters: ",
-                "",  # initial text
-                self.compile_inferred_project,
-                None,  # on change
-                None   # on cancel
-            )
+        project_info = cli.service.project_info(file_name)
+        if project_info["success"]:
+            if "configFileName" in project_info["body"]:
+                tsconfig_dir = dirname(project_info["body"]["configFileName"])
+                self.window.run_command("exec", {
+                    "cmd": [get_node_path(), TSC_PATH, "-p", tsconfig_dir],
+                    "file_regex": "^(.+?)\\((\\d+),(\\d+)\\): (.+)$",
+                    "shell": True
+                })
+            else:
+                sublime.active_window().show_input_panel(
+                    "Build parameters: ",
+                    "",  # initial text
+                    self.compile_inferred_project,
+                    None,  # on change
+                    None   # on cancel
+                )
 
     def compile_inferred_project(self, params=""):
         file_name = self.window.active_view().file_name()
-        if not IS_ST2:
-            cmd = "tsc {0} {1}".format(file_name, params)
-            self.window.run_command("exec", {
-                "shell_cmd": cmd,
-                "file_regex": "^(.+?)\\((\\d+),(\\d+)\\): (.+)$"
-            })
-        else:
-            cmd = "tsc {0} {1}".format(file_name, params)
-            self.window.run_command("exec", {
-                "cmd": [cmd],
-                "file_regex": "^(.+?)\\((\\d+),(\\d+)\\): (.+)$",
-                "shell": True
-            })
+        cmd = [get_node_path(), TSC_PATH, file_name]
+        if params != "":
+            cmd.extend(params.split(' '))
+        self.window.run_command("exec", {
+            "cmd": cmd,
+            "file_regex": "^(.+?)\\((\\d+),(\\d+)\\): (.+)$",
+            "shell": True
+        })

typescript/libs/global_vars.py

@@ -15,6 +15,13 @@
 PLUGIN_DIR = dirname(MODULE_DIR)
 PLUGIN_NAME = os.path.basename(PLUGIN_DIR)
 
+# The node path will be initialized in the node_client.py module
+_node_path = None
+def get_node_path():
+    return _node_path
+
+TSC_PATH = os.path.join(PLUGIN_DIR, "tsserver", "tsc.js")
+
 # only Sublime Text 3 build after 3072 support tooltip
 TOOLTIP_SUPPORT = int(sublime.version()) >= 3072
 

typescript/libs/node_client.py

@@ -8,6 +8,7 @@
 
 from .logger import log
 from . import json_helpers
+from . import global_vars
 
 # queue module name changed from Python 2 to 3
 if int(sublime.version()) < 3000:
@@ -60,6 +61,7 @@ def __init__(self, scriptPath):
             print("To specify the node executable file name, use the 'node_path' setting")
             self.__serverProc = None
         else:
+            global_vars._node_path = node_path
             print("Found node executable at " + node_path)
             try:
                 if os.name == "nt":

typescript/libs/service_proxy.py

@@ -178,6 +178,12 @@ def nav_to(self, search_text, file_name):
         response_dict = self.__comm.sendCmdSync(json_str, req_dict["seq"])
         return response_dict
 
+    def project_info(self, file_name, need_file_name_list=False):
+        args = {"file": file_name, "needFileNameList": need_file_name_list}
+        req_dict = self.create_req_dict("projectInfo", args)
+        json_str = json_helpers.encode(req_dict)
+        return self.__comm.sendCmdSync(json_str, req_dict["seq"])
+
     def create_req_dict(self, command_name, args=None):
         req_dict = {
             "command": command_name,