From e7de8b25367f02f17b12a104dbbb28f76bad104f Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Thu, 29 Jun 2017 17:18:33 -0700
Subject: [PATCH] More trigger chars #29758

---
 extensions/emmet/npm-shrinkwrap.json |  6 +++---
 extensions/emmet/package.json        |  2 +-
 extensions/emmet/src/util.ts         | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/extensions/emmet/npm-shrinkwrap.json b/extensions/emmet/npm-shrinkwrap.json
index 73e25aa546a..feafae301ac 100644
--- a/extensions/emmet/npm-shrinkwrap.json
+++ b/extensions/emmet/npm-shrinkwrap.json
@@ -118,9 +118,9 @@
       "resolved": "https://registry.npmjs.org/@emmetio/variable-resolver/-/variable-resolver-0.2.1.tgz"
     },
     "vscode-emmet-helper": {
-      "version": "0.0.15",
-      "from": "vscode-emmet-helper@0.0.15",
-      "resolved": "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-0.0.15.tgz"
+      "version": "0.0.16",
+      "from": "vscode-emmet-helper@0.0.16",
+      "resolved": "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-0.0.16.tgz"
     }
   }
 }
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index 7ee1263d887..9a40fa5f461 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -73,6 +73,6 @@
         "@emmetio/html-matcher": "^0.3.1",
         "@emmetio/css-parser": "^0.3.0",
         "@emmetio/math-expression": "^0.1.1",
-        "vscode-emmet-helper":"0.0.15"
+        "vscode-emmet-helper":"0.0.16"
     }
 }
\ No newline at end of file
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index 396810c2373..9444dba3844 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -10,19 +10,19 @@ import { DocumentStreamReader } from './bufferStream';
 import { isStyleSheet } from 'vscode-emmet-helper';
 
 export const LANGUAGE_MODES: Object = {
-	'html': ['!', '.', '}', ':'],
-	'jade': ['!', '.', '}', ':'],
-	'slim': ['!', '.', '}', ':'],
-	'haml': ['!', '.', '}', ':'],
-	'xml': ['.', '}'],
-	'xsl': ['.', '}'],
+	'html': ['!', '.', '}', ':', '*', '$'],
+	'jade': ['!', '.', '}', ':', '*', '$'],
+	'slim': ['!', '.', '}', ':', '*', '$'],
+	'haml': ['!', '.', '}', ':', '*', '$'],
+	'xml': ['.', '}', '*', '$'],
+	'xsl': ['.', '}', '*', '$'],
 	'css': [':'],
 	'scss': [':'],
 	'sass': [':'],
 	'less': [':'],
 	'stylus': [':'],
-	'javascriptreact': ['.', '}'],
-	'typescriptreact': ['.', '}']
+	'javascriptreact': ['.', '}', '*', '$'],
+	'typescriptreact': ['.', '}', '*', '$']
 };
 
 // Explicitly map languages that have built-in grammar in VS Code to their parent language