Merge remote-tracking branch 'origin/master' into tooltips

Conflicts:
	Default.sublime-keymap

Author: billti

Default.sublime-keymap

@@ -136,57 +136,6 @@
 
         ]
     },
-    {
-        "keys": [ "}" ],
-        "command": "typescript_format_on_key",
-        "args": { "key": "}" },
-        "context": [
-            { "key": "selector", "operator": "equal", "operand": "source.ts" },
-            { "key": "setting.typescript_auto_format", "operator": "equal", "operand": true },
-            { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
-            { "key": "num_selections", "operator": "equal", "operand": 1},
-            { "key": "selection_empty", "operator": "equal", "operand": true },
-
-            { "key": "preceding_text", "operator": "not_regex_contains", "operand": "\\{$" },
-            { "key": "following_text", "operator": "not_regex_contains", "operand": "^\\}" }
-        ]
-    },
-    // In case when auto match is disabled, format the block regardless
-    {
-        "keys": [ "}" ],
-        "command": "typescript_format_on_key",
-        "args": { "key": "}" },
-        "context": [
-            { "key": "num_selections", "operator": "equal", "operand": 1},
-            { "key": "setting.typescript_auto_format", "operator": "equal", "operand": true },
-            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
-            { "key": "selector", "operator": "equal", "operand": "source.ts" },
-            { "key": "setting.auto_match_enabled", "operator": "equal", "operand": false }
-        ]
-    },
-    {
-        "keys": [ ";" ],
-        "command": "typescript_format_on_key",
-        "args": { "key": ";" },
-        "context": [
-            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
-            { "key": "setting.typescript_auto_format", "operator": "equal", "operand": true },
-            { "key": "selector", "operator": "equal", "operand": "source.ts" }
-        ]
-    },
-    {
-        "keys": [ "enter" ],
-        "command": "typescript_format_on_key",
-        "args": { "key": "\n" },
-        "context": [
-            { "key": "setting.typescript_auto_indent", "operator": "equal", "operand": true },
-            { "key": "auto_complete_visible", "operator": "equal", "operand": false },
-            { "key": "selector", "operator": "not_equal", "operand": "meta.scope.between-tag-pair" },
-            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
-            { "key": "num_selections", "operator": "equal", "operand": 1},
-            { "key": "selector", "operator": "equal", "operand": "source.ts" }
-        ]
-    },
     {
         "keys": [ "enter" ],
         "command": "typescript_go_to_ref",

README.md

@@ -1,6 +1,8 @@
 TypeScript Plugin for Sublime Text
 ==================================
 
+[![Join the chat at https://gitter.im/Microsoft/TypeScript-Sublime-Plugin](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Microsoft/TypeScript-Sublime-Plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 The plugin uses an IO wrapper around the TypeScript language services to provide
 an enhanced Sublime Text experience when working with TypeScript code.
 

typescript/commands/format.py

@@ -14,11 +14,6 @@ def run(self, text, key="", insert_key=True):
         if 0 == len(key):
             return
         check_update_view(self.view)
-        loc = self.view.sel()[0].begin()
-
-        if insert_key:
-            active_view().run_command('hide_auto_complete')
-            insert_text(self.view, text, loc, key)
 
         format_response = cli.service.format_on_key(self.view.file_name(), get_location_from_view(self.view), key)
         if format_response["success"]:

typescript/libs/__init__.py

@@ -5,7 +5,6 @@
 from .popup_manager import get_popup_manager
 from .logger import log
 from . import logger
-
 __all__ = [
     'cli',
     'EditorClient',

typescript/libs/editor_client.py

@@ -34,6 +34,9 @@ def __init__(self):
         self.tab_size = 4
         self.indent_size = 4
         self.translate_tab_to_spaces = False
+        self.ts_auto_format_enabled = True
+        self.ts_auto_indent_enabled = True
+        self.auto_match_enabled = True
 
     def initialize(self):
         """
@@ -55,7 +58,14 @@ def initialize(self):
         self.service = ServiceProxy(self.node_client)
 
         # load formatting settings and set callbacks for setting changes
-        for setting_name in ['tab_size', 'indent_size', 'translate_tabs_to_spaces']:
+        for setting_name in [
+            'tab_size',
+            'indent_size',
+            'translate_tabs_to_spaces',
+            'typescript_auto_format',
+            'typescript_auto_indent',
+            'auto_match_enabled'
+        ]:
             settings.add_on_change(setting_name, self.load_format_settings)
         self.load_format_settings()
 
@@ -66,6 +76,9 @@ def load_format_settings(self):
         self.tab_size = settings.get('tab_size', 4)
         self.indent_size = settings.get('indent_size', 4)
         self.translate_tab_to_spaces = settings.get('translate_tabs_to_spaces', False)
+        self.ts_auto_format_enabled = settings.get("typescript_auto_format")
+        self.ts_auto_indent_enabled = settings.get("typescript_auto_indent")
+        self.auto_match_enabled = settings.get("auto_match_enabled")
         self.set_features()
 
     def set_features(self):

typescript/libs/global_vars.py

@@ -4,23 +4,34 @@
 import sublime
 from os.path import dirname
 
+# determine if the host is sublime text 2
+IS_ST2 = int(sublime.version()) < 3000
 
 # Get the directory path to this file;
-# Note: MODULE_DIR, PLUGIN_DIR and PLUGIN_NAME only works correctly when:
-# 1. Using sublime 3
-# 2. Using sublime 2, and the plugin folder is not a symbol link
-# On sublime 2 with the plugin folder being a symbol link, the PLUGIN_FOLDER will points
-# to the linked real path instead, and the PLUGIN_NAME will be wrong too.
-MODULE_DIR = dirname(dirname(os.path.abspath(__file__)))
-PLUGIN_DIR = dirname(MODULE_DIR)
+# Note: there are several ways this plugin can be installed
+# 1. from the package control -> the absolute path of __file__ is real and contains plugin name
+# 2. git clone directly to the sublime packages folder -> the absolute path of __file__ is real and contains plugin name
+# 3. git clone to somewhere else, and link to the sublime packages folder -> the absolute path is real in Sublime 3,
+# but is somewhere else in Sublime 2;and therefore in Sublime 2 there is no direct way to obtain the plugin name
+if not IS_ST2:
+    PLUGIN_DIR = dirname(dirname(dirname(os.path.abspath(__file__))))
+else:
+    _sublime_packages_dir = sublime.packages_path()
+    _cur_file_abspath = os.path.abspath(__file__)
+    if _sublime_packages_dir not in _cur_file_abspath:
+        # The plugin is installed as a link
+        for p in os.listdir(_sublime_packages_dir):
+            link_path = _sublime_packages_dir + os.sep + p
+            if os.path.realpath(link_path) in _cur_file_abspath:
+                PLUGIN_DIR = link_path
+                break
+    else:
+        PLUGIN_DIR = dirname(dirname(dirname(os.path.abspath(__file__))))
 PLUGIN_NAME = os.path.basename(PLUGIN_DIR)
 
 # only Sublime Text 3 build after 3072 support tooltip
 TOOLTIP_SUPPORT = int(sublime.version()) >= 3072
 
-# determine if the host is sublime text 2
-IS_ST2 = int(sublime.version()) < 3000
-
 # detect if quick info is available for symbol
 SUBLIME_WORD_MASK = 515
 

typescript/libs/node_client.py

@@ -21,11 +21,11 @@ def getEvent(self): pass
 
     def postCmd(self, cmd): pass
 
-    def sendCmd(self, cb, cmd): pass
+    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, cb, cmd, seq):
+    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, cb, cmd, seq):
             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/popup_manager.py

@@ -1,3 +1,5 @@
+import re
+
 from string import Template
 
 from .logger import log
@@ -270,6 +272,8 @@ def get_popup_manager():
 
             log.info('Popup resource path: {0}'.format(rel_path))
             popup_text = sublime.load_resource(rel_path)
+            re_remove = re.compile("[\n\t\r]")
+            popup_text = re_remove.sub("", popup_text)
             log.info('Loaded tooltip template from {0}'.format(rel_path))
 
             PopupManager.html_template = Template(popup_text)

typescript/libs/service_proxy.py

@@ -1,6 +1,7 @@
 import collections
 
 from . import json_helpers
+from .global_vars import IS_ST2
 from .node_client import CommClient
 from .text_helpers import Location
 
@@ -45,32 +46,32 @@ def completions(self, path, location=Location(1, 1), prefix="", on_completed=Non
         req_dict = self.create_req_dict("completions", args)
         json_str = json_helpers.encode(req_dict)
         self.__comm.sendCmd(
-            lambda json_dict: None if on_completed is None else on_completed(json_dict),
             json_str,
+            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(
-            lambda response_dict: None if on_completed is None else on_completed(response_dict),
             json_str,
+            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}
@@ -129,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}
@@ -151,15 +152,23 @@ def type(self, path, location=Location(1, 1)):
         response_dict = self.__comm.sendCmdSync(json_str, req_dict["seq"])
         return response_dict
 
-    def quick_info(self, path, location=Location(1, 1), onCompleted=None):
+    def quick_info(self, path, location=Location(1, 1), on_completed=None):
         args = {"file": path, "line": location.line, "offset": location.offset}
         req_dict = self.create_req_dict("quickinfo", args)
         json_str = json_helpers.encode(req_dict)
-        self.__comm.sendCmd(
-            lambda json_dict: None if onCompleted is None else onCompleted(json_dict),
-            json_str,
-            req_dict["seq"]
-        )
+        callback = on_completed or (lambda: None)
+        if not IS_ST2:
+            self.__comm.sendCmdAsync(
+                json_str,
+                callback,
+                req_dict["seq"]
+            )
+        else:
+            self.__comm.sendCmd(
+                json_str,
+                callback,
+                req_dict["seq"]
+            )
 
     def get_event(self):
         event_json_str = self.__comm.getEvent()

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):