Improve typescript_tsdk lookup

Author: alecmev

typescript/libs/editor_client.py

@@ -49,17 +49,46 @@ def initialize(self):
         initialized during loading time
         """
 
-        # retrieve the path to tsserver.js
-        # first see if user set the path to the file
-        settings = sublime.load_settings("Preferences.sublime-settings")
-        tsdk_location = settings.get("typescript_tsdk")
-        if tsdk_location:
-            proc_file = os.path.join(tsdk_location, "tsserver.js")
-            global_vars._tsc_path = os.path.join(tsdk_location, "tsc.js")
-        else:
-            # otherwise, get tsserver.js from package directory
-            proc_file = os.path.join(PLUGIN_DIR, "tsserver", "tsserver.js")
-            global_vars._tsc_path = os.path.join(PLUGIN_DIR, "tsserver", "tsc.js")
+        # Fall back to the bundled TypeScript server if the one  provided by
+        # user doesn't exist.
+        proc_file = os.path.join(PLUGIN_DIR, "tsserver", "tsserver.js")
+        global_vars._tsc_path = os.path.join(PLUGIN_DIR, "tsserver", "tsc.js")
+
+        is_tsdk_location_good = lambda x: (
+            os.path.isfile(os.path.join(x, "tsserver.js")) and
+            os.path.isfile(os.path.join(x, "tsc.js"))
+        )
+
+        active_view = sublime.active_window().active_view()
+        settings = active_view.settings()
+        custom_tsdk_setting = settings.get("typescript_tsdk")
+        if custom_tsdk_setting:
+            tsdk_location = None
+            if os.path.isabs(custom_tsdk_setting):
+                if is_tsdk_location_good(custom_tsdk_setting):
+                    tsdk_location = custom_tsdk_setting
+            else:
+                folders = sublime.active_window().folders()
+                for folder in folders:
+                    x = os.path.join(folder, custom_tsdk_setting)
+                    if is_tsdk_location_good(x):
+                        tsdk_location = x
+                        break
+
+                if not tsdk_location:
+                    active_file = active_view.file_name()
+                    if active_file:
+                        x = os.path.join(
+                            os.path.dirname(active_file),
+                            custom_tsdk_setting
+                        )
+                        if is_tsdk_location_good(x):
+                            tsdk_location = x
+
+            if tsdk_location:
+                proc_file = os.path.join(tsdk_location, "tsserver.js")
+                global_vars._tsc_path = os.path.join(tsdk_location, "tsc.js")
+
         log.debug("Path of tsserver.js: " + proc_file)
         log.debug("Path of tsc.js: " + get_tsc_path())