Merge with MS Master

Author: zhengbli

Default.sublime-keymap

@@ -73,15 +73,6 @@
             { "key": "selector", "operator": "equal", "operand": "text.find-refs" }
         ]
     },
-    {
-        "keys": [ "alt+,"],
-        "command": "typescript_signature_popup",
-        "context": [
-            { "key": "selector", "operator": "equal", "operand": "source.ts" },
-            { "key": "tooltip_supported", "operator": "equal", "operand": true}
-
-        ]
-    },
     {
         "keys": [ "ctrl+t", "ctrl+q" ],
         "command": "typescript_quick_info_doc",
@@ -135,6 +126,15 @@
             { "key": "selector", "operator": "equal", "operand": "source.ts" },
             { "key": "is_popup_visible"}
         ]
+    },    // In case when auto match is enabled, only format if not within {}
+    {
+        "keys": [ "alt+,"],
+        "command": "typescript_signature_popup",
+        "context": [
+            { "key": "selector", "operator": "equal", "operand": "source.ts" },
+            { "key": "tooltip_supported", "operator": "equal", "operand": true}
+
+        ]
     },
     {
         "keys": [ "enter" ],

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.sublime-build

@@ -0,0 +1,4 @@
+{
+    "target": "typescript_build",
+    "selector": "source.ts"
+}

TypeScript.sublime-commands

@@ -11,5 +11,6 @@
  { "caption" : "TypeScript: PasteAndFormat", "command": "typescript_paste_and_format" },
  { "caption" : "TypeScript: FormatLine", "command": "typescript_format_line" },
  { "caption" : "TypeScript: FormatBlock", "command": "typescript_format_brackets" },
+ { "caption" : "TypeScript: SignatureInfo", "command": "typescript_signature_popup" },
  { "caption" : "TypeScript: ShowErrorList", "command": "typescript_project_error_list" }
 ]

TypeScript.sublime-commands.orig

@@ -0,0 +1,20 @@
+[
+ { "caption" : "TypeScript: GoToDefinition", "command": "typescript_go_to_definition" },
+ { "caption" : "TypeScript: QuickInfoDocumentation", "command": "typescript_quick_info_doc" },
+ { "caption" : "TypeScript: Overloads panel", "command": "typescript_signature_panel" },
+ { "caption" : "TypeScript: SaveTmp", "command": "typescript_save" },
+ { "caption" : "TypeScript: FormatSelection", "command": "typescript_format_selection" },
+ { "caption" : "TypeScript: FormatDocument", "command": "typescript_format_document" },
+ { "caption" : "TypeScript: FindReferences", "command": "typescript_find_references" },
+ { "caption" : "TypeScript: NavigateToSymbol", "command": "typescript_nav_to" },
+ { "caption" : "TypeScript: Rename", "command": "typescript_rename" },
+ { "caption" : "TypeScript: PasteAndFormat", "command": "typescript_paste_and_format" },
+ { "caption" : "TypeScript: FormatLine", "command": "typescript_format_line" },
+<<<<<<< HEAD
+ { "caption" : "TypeScript: FormatBlock", "command": "typescript_format_brackets" },
+ { "caption" : "TypeScript: ShowErrorList", "command": "typescript_project_error_list" }
+=======
+ { "caption" : "TypeScript: SignatureInfo", "command": "typescript_signature_popup" },
+ { "caption" : "TypeScript: FormatBlock", "command": "typescript_format_brackets" }
+>>>>>>> 88af18b997cba9d623e43ccdffb73b9814ea90a0
+]

snippets/get-()-{}.sublime-snippet

@@ -4,7 +4,7 @@ public get ${1:value}() : ${2:string} {
 	${3:return }
 }
 ]]></content>
-	<tabTrigger>get</tabTrigger>
+	<tabTrigger>getter</tabTrigger>
 	<scope>source.ts</scope>
     <description>get-property …</description>
 </snippet>

snippets/log.sublime-snippet

@@ -1,7 +1,7 @@
 <snippet>
     <content><![CDATA[console.log($1);
 $0]]></content>
-    <tabTrigger>log</tabTrigger>
+    <tabTrigger>clog</tabTrigger>
     <scope>source.ts</scope>
     <description>console log</description>
 </snippet>

snippets/set-()-{}.sublime-snippet

@@ -4,7 +4,7 @@ public set ${1:value}(v : ${2:string}) {
 	this.${3:_value} = v;
 }
 ]]></content>
-	<tabTrigger>set</tabTrigger>
+	<tabTrigger>setter</tabTrigger>
 	<scope>source.ts</scope>
     <description>set-property …</description>
 </snippet>

snippets/setTimeout.sublime-snippet

@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[setTimeout(() => {$0}${2:}, ${1:500});]]></content>
-    <tabTrigger>timeout</tabTrigger>
+    <tabTrigger>tout</tabTrigger>
     <scope>source.ts</scope>
     <description>setTimeout function</description>
 </snippet>