[html] attribute on separate line formatting. Fixes microsoft#2204

aeschli · aeschli · commit be716e241f3a · 2017-01-07T22:48:35.000-04:00
diff --git a/extensions/html/package.json b/extensions/html/package.json
@@ -126,6 +126,13 @@
           "default": "head, body, /html",
           "description": "%html.format.extraLiners.desc%"
         },
+        "html.format.wrapAttributes": {
+          "type": "string",
+          "default": "auto",
+          "enum": [ "auto", "force" ],
+          "enumDescriptions": ["%html.format.wrapAttributes.auto%", "%html.format.wrapAttributes.force%"],
+          "description": "%html.format.wrapAttributes.desc%"
+        },
         "html.suggest.angular1": {
           "type": "boolean",
           "default": true,
diff --git a/extensions/html/package.nls.json b/extensions/html/package.nls.json
@@ -8,6 +8,9 @@
 	"html.format.indentHandlebars.desc": "Format and indent {{#foo}} and {{/foo}}.",
 	"html.format.endWithNewline.desc": "End with a newline.",
 	"html.format.extraLiners.desc": "List of tags, comma separated, that should have an extra newline before them. 'null' defaults to \"head, body, /html\".",
+	"html.format.wrapAttributes.desc": "Wrap attributes always ('force') or only when line length is exceeded ('auto').",
+	"html.format.wrapAttributes.auto": "Wrap attributes when line length is exceeded.",
+	"html.format.wrapAttributes.force": "Always wrap attributes.",
 	"html.suggest.angular1.desc":  "Configures if the built-in HTML language support suggests Angular V1 tags and properties.",
 	"html.suggest.ionic.desc": "Configures if the built-in HTML language support suggests Ionic tags, properties and values.",
 	"html.suggest.html5.desc":"Configures if the built-in HTML language support suggests HTML5 tags, properties and values.",
diff --git a/extensions/html/server/npm-shrinkwrap.json b/extensions/html/server/npm-shrinkwrap.json
diff --git a/extensions/html/server/package.json b/extensions/html/server/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "vscode-css-languageservice": "^2.0.0-next.6",
-    "vscode-html-languageservice": "^2.0.0-next.3",
+    "vscode-html-languageservice": "^2.0.0-next.4",
     "vscode-languageserver": "3.0.1-alpha.2",
     "vscode-nls": "^1.0.7",
     "vscode-uri": "^1.0.0"
