[html] update jsbeautify (for #2204)

This commit is contained in:
Martin Aeschlimann 2017-01-07 23:44:02 -04:00
parent be716e241f
commit c53041b780
5 changed files with 26 additions and 10 deletions

View file

@ -1,7 +1,7 @@
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
[{
"name": "js-beautify",
"version": "1.6.4",
"version": "1.6.8",
"license": "MIT",
"repositoryURL": "https://github.com/beautify-web/js-beautify"
},{

View file

@ -87,9 +87,17 @@
"string",
"null"
],
"default": "a, abbr, acronym, b, bdo, big, br, button, cite, code, dfn, em, i, img, input, kbd, label, map, object, pre, q, samp, select, small, span, strong, sub, sup, textarea, tt, var",
"default": "a, abbr, acronym, b, bdo, big, br, button, cite, code, dfn, em, i, img, input, kbd, label, map, object, q, samp, select, small, span, strong, sub, sup, textarea, tt, var",
"description": "%html.format.unformatted.desc%"
},
"html.format.contentUnformatted": {
"type": [
"string",
"null"
],
"default": "pre",
"description": "%html.format.contentUnformatted.desc%"
},
"html.format.indentInnerHtml": {
"type": "boolean",
"default": false,
@ -129,8 +137,8 @@
"html.format.wrapAttributes": {
"type": "string",
"default": "auto",
"enum": [ "auto", "force" ],
"enumDescriptions": ["%html.format.wrapAttributes.auto%", "%html.format.wrapAttributes.force%"],
"enum": [ "auto", "force", "force-align", "force-expand-multiline" ],
"enumDescriptions": ["%html.format.wrapAttributes.auto%", "%html.format.wrapAttributes.force%", "%html.format.wrapAttributes.forcealign%", "%html.format.wrapAttributes.forcemultiline%"],
"description": "%html.format.wrapAttributes.desc%"
},
"html.suggest.angular1": {

View file

@ -2,15 +2,18 @@
"html.format.enable.desc": "Enable/disable default HTML formatter (requires restart)",
"html.format.wrapLineLength.desc": "Maximum amount of characters per line (0 = disable).",
"html.format.unformatted.desc": "List of tags, comma separated, that shouldn't be reformatted. 'null' defaults to all tags listed at https://www.w3.org/TR/html5/dom.html#phrasing-content.",
"html.format.contentUnformatted.desc": "List of tags, comma separated, where the content shouldn't be reformatted. 'null' defaults to the 'pre' tag.",
"html.format.indentInnerHtml.desc": "Indent <head> and <body> sections.",
"html.format.preserveNewLines.desc": "Whether existing line breaks before elements should be preserved. Only works before elements, not inside tags or for text.",
"html.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk. Use 'null' for unlimited.",
"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.format.wrapAttributes.desc": "Wrap attributes.",
"html.format.wrapAttributes.auto": "Wrap attributes only when line length is exceeded.",
"html.format.wrapAttributes.force": "Wrap each attribute except first.",
"html.format.wrapAttributes.forcealign": "Wrap each attribute except first and keep aligned.",
"html.format.wrapAttributes.forcemultiline": "Wrap each attribute.",
"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.",

View file

@ -2,15 +2,20 @@
"name": "vscode-html-languageserver",
"version": "1.0.0",
"dependencies": {
"@types/node": {
"version": "6.0.58",
"from": "@types/node@>=6.0.51 <7.0.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.58.tgz"
},
"vscode-css-languageservice": {
"version": "2.0.0-next.6",
"from": "vscode-css-languageservice@next",
"resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.0.0-next.6.tgz"
},
"vscode-html-languageservice": {
"version": "2.0.0-next.4",
"version": "2.0.0-next.5",
"from": "vscode-html-languageservice@next",
"resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-2.0.0-next.4.tgz"
"resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-2.0.0-next.5.tgz"
},
"vscode-jsonrpc": {
"version": "3.0.1-alpha.2",

View file

@ -9,7 +9,7 @@
},
"dependencies": {
"vscode-css-languageservice": "^2.0.0-next.6",
"vscode-html-languageservice": "^2.0.0-next.4",
"vscode-html-languageservice": "^2.0.0-next.5",
"vscode-languageserver": "3.0.1-alpha.2",
"vscode-nls": "^1.0.7",
"vscode-uri": "^1.0.0"