From 4f5a256a4b980c2ccf97bb14e004afd1eeb8d2ca Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Mon, 29 Jan 2018 17:29:26 -0800
Subject: [PATCH] Allow vendor prefix in emmet #35951

---
 extensions/emmet/package.json     | 22 +++++++++++++++++++++-
 extensions/emmet/package.nls.json |  6 +++++-
 extensions/emmet/yarn.lock        |  6 +++---
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index 2e72c542ec0..f6651d7043c 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -178,6 +178,26 @@
                             "type": "boolean",
                             "default": false,
                             "description": "%emmetPreferencesAllowCompactBoolean%"
+                        },
+                        "css.webkitProperties": {
+                            "type": "string",
+                            "default": "",
+                            "description": "%emmetPreferencesCssWebkitProperties%"
+                        },
+                        "css.mozProperties": {
+                            "type": "string",
+                            "default": "",
+                            "description": "%emmetPreferencesCssMozProperties%"
+                        },
+                        "css.oProperties": {
+                            "type": "string",
+                            "default": "",
+                            "description": "%emmetPreferencesCssOProperties%"
+                        },
+                        "css.msProperties": {
+                            "type": "string",
+                            "default": "",
+                            "description": "%emmetPreferencesCssMsProperties%"
                         }
                     }
                 },
@@ -317,7 +337,7 @@
         "@emmetio/html-matcher": "^0.3.3",
         "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
         "@emmetio/math-expression": "^0.1.1",
-        "vscode-emmet-helper": "^1.1.22",
+        "vscode-emmet-helper": "^1.1.23",
         "vscode-languageserver-types": "^3.5.0",
         "image-size": "^0.5.2",
         "vscode-nls": "3.2.1"
diff --git a/extensions/emmet/package.nls.json b/extensions/emmet/package.nls.json
index 52df8adca11..6cd89fc26bb 100644
--- a/extensions/emmet/package.nls.json
+++ b/extensions/emmet/package.nls.json
@@ -47,5 +47,9 @@
 	"emmetPreferencesFilterCommentTrigger": "A comma-separated list of attribute names that should exist in abbreviation for the comment filter to be applied",
 	"emmetPreferencesFormatNoIndentTags": "An array of tag names that should not get inner indentation",
 	"emmetPreferencesFormatForceIndentTags": "An array of tag names that should always get inner indentation",
-	"emmetPreferencesAllowCompactBoolean": "If true, compact notation of boolean attributes are produced"
+	"emmetPreferencesAllowCompactBoolean": "If true, compact notation of boolean attributes are produced",
+	"emmetPreferencesCssWebkitProperties": "Comma separated css properties that get webkit vendor prefix when used in emmet abbreviation.",
+	"emmetPreferencesCssMozProperties": "Comma separated css properties that get moz vendor prefix when used in emmet abbreviation.",
+	"emmetPreferencesCssOProperties": "Comma separated css properties that get o vendor prefix when used in emmet abbreviation.",
+	"emmetPreferencesCssMsProperties": "Comma separated css properties that get ms vendor prefix when used in emmet abbreviation."
 }
diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock
index d5af69f3d44..c0a84e53ea5 100644
--- a/extensions/emmet/yarn.lock
+++ b/extensions/emmet/yarn.lock
@@ -2052,9 +2052,9 @@ vinyl@~2.0.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vscode-emmet-helper@^1.1.22:
-  version "1.1.22"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.22.tgz#3ba407f98e60d1153a8f1ed073ccaaa2587d2771"
+vscode-emmet-helper@^1.1.23:
+  version "1.1.23"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.23.tgz#2f30d76522322fe4313fcb2d58fa977591ae10ec"
   dependencies:
     "@emmetio/extract-abbreviation" "^0.1.4"
     jsonc-parser "^1.0.0"