Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/extensions/pug/test/colorize-fixtures/test-4287.pug

@@ -0,0 +1,3 @@
+.ssdsd
+
+    // asdsdas

lib/vscode/extensions/pug/test/colorize-fixtures/test.pug

@@ -0,0 +1,27 @@
+// h1(name=maintainer.name)
+//   | Maintainer:
+//   = ' ' + maintainer.name
+table
+  tr
+    td(style='width: '+(100/2)+'%').
+      Twitter
+    td= maintainer.twitter
+  tr
+    td(style='width: '+(100/2)+'%').
+      Blog
+    td= maintainer.blog
+
+- var user = { name: 'John' }
+if user
+  div.welcomebox
+    // Filtered inline output
+    p.
+      Welcome, #{user.name}
+else
+  div.loginbox
+    form(name="login", action="/login", method="post")
+      input(type="text", name="user")
+      input(type="password", name="pass")
+      input(type="submit", value="login")
+
+p #[code samp] — Regular text. #[samp This is sample text] more text.

lib/vscode/extensions/pug/test/colorize-results/test-4287_pug.json

@@ -0,0 +1,24 @@
+[
+	{
+		"c": ".ssdsd",
+		"t": "text.pug entity.other.attribute-name.class.pug",
+		"r": {
+			"dark_plus": "entity.other.attribute-name: #9CDCFE",
+			"light_plus": "entity.other.attribute-name: #FF0000",
+			"dark_vs": "entity.other.attribute-name: #9CDCFE",
+			"light_vs": "entity.other.attribute-name: #FF0000",
+			"hc_black": "entity.other.attribute-name: #9CDCFE"
+		}
+	},
+	{
+		"c": "    // asdsdas",
+		"t": "text.pug string.comment.buffered.block.pug",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string.comment.buffered.block.pug: #0000FF",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string.comment.buffered.block.pug: #0000FF",
+			"hc_black": "string: #CE9178"
+		}
+	}
+]