Support for this.constructor.html 0x00000001A#11

0x00000001A · 0x00000001A · commit 9c997ce276cf · 2018-08-13T22:23:35.000+10:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,4 +33,8 @@ The format is based on [Keep a Changelog] (http://keepachangelog.com/en/1.0.0/)
 
 ### [1.6.0] - 2018-08-13
 ### Added
-- SQL support. Beta
+- SQL support. Beta
+
+### [1.7.0] - 2018-08-14
+### Fixed
+- Improve html function support
diff --git a/README.md b/README.md
@@ -68,6 +68,12 @@ If this project help you reduce time to develop, you can give me a cup of coffee
 ### [1.6.0] - 2018-08-13
 - Add SQL support. Beta
 
+### [1.6.0] - 2018-08-13
+- Improve support for html function
+
+### [1.7.0] - 2018-08-14
+- Improve html function support
+
 -----------------------------------------------------------------------------------------------------------
 
 **Enjoy!**
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "es6-string-html",
   "displayName": "es6-string-html",
   "description": "Highlight different languages in es6 multiline strings",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "publisher": "Tobermory",
   "icon": "docs/logo.png",
   "engines": {
diff --git a/syntaxes/es6-inline-html.json b/syntaxes/es6-inline-html.json
@@ -17,11 +17,28 @@
 		}
 	},
 	"patterns": [
+		{
+			"begin": "(.?(html|template))(`)",
+			"end": "(`)",
+			"beginCaptures": {
+				"1": {
+					"name": "variable.parameter"
+				}
+			},
+			"patterns": [
+				{
+					"include": "source.ts#template-substitution-element"
+				},
+				{
+					"include": "text.html.basic"
+				}
+			]
+		},
 		{
 			"begin": "(\\s?\\/?\\*?\\s?(html|template|inline-html|inline-template)\\s?\\*?\\/?\\s?)(`)",
 			"beginCaptures": {
 				"1": {
-					"name": "punctuation.definition.comment.js"
+					"name": "comment.block"
 				}
 			},
 			"end": "(`)",
@@ -38,7 +55,7 @@
 			"begin": "(\\/\\/\\s?(html|template|inline-html|inline-template)\\s?)",
 			"beginCaptures": {
 				"1": {
-					"name": "punctuation.definition.comment.js"
+					"name": "comment.line"
 				}
 			},
 			"end": "(`)",
diff --git a/syntaxes/es6-inline-sql.json b/syntaxes/es6-inline-sql.json
@@ -17,11 +17,28 @@
 		}
 	},
 	"patterns": [
+		{
+			"begin": "(.?(sql))(`)",
+			"end": "(`)",
+			"beginCaptures": {
+				"1": {
+					"name": "variable.parameter"
+				}
+			},
+			"patterns": [
+				{
+					"include": "source.ts#template-substitution-element"
+				},
+				{
+					"include": "source.sql"
+				}
+			]
+		},
 		{
 			"begin": "(\\s?\\/?\\*?\\s?(sql|inline-sql)\\s?\\*?\\/?\\s?)(`)",
 			"beginCaptures": {
 				"1": {
-					"name": "punctuation.definition.comment.js"
+					"name": "comment.block"
 				}
 			},
 			"end": "(`)",
@@ -38,7 +55,7 @@
 			"begin": "(\\/\\/\\s?(sql|inline-sql)\\s?)",
 			"beginCaptures": {
 				"1": {
-					"name": "punctuation.definition.comment.js"
+					"name": "comment.line"
 				}
 			},
 			"end": "(`)",
