Merge branch 'master' into octref/no-ionic-angular

This commit is contained in:
Pine
2019-02-06 10:57:08 -08:00
committed by GitHub
908 changed files with 26417 additions and 18898 deletions

View File

@@ -1,4 +1,5 @@
{
"enableProposedApi": true,
"name": "html-language-features",
"displayName": "%displayName%",
"description": "%description%",
@@ -31,13 +32,14 @@
"type": "object",
"title": "HTML",
"properties": {
"html.experimental.custom.tags": {
"html.experimental.customData": {
"type": "array",
"description": "A list of JSON file paths that define custom tags."
},
"html.experimental.custom.attributes": {
"type": "array",
"description": "A list of JSON file paths that define custom attributes."
"description": "A list of JSON file paths that define custom tags, properties and other HTML syntax constructs. Only workspace folder setting will be read.",
"default": [],
"items": {
"type": "string"
},
"scope": "resource"
},
"html.format.enable": {
"type": "boolean",
@@ -120,14 +122,18 @@
"force",
"force-aligned",
"force-expand-multiline",
"aligned-multiple"
"aligned-multiple",
"preserve",
"preserve-aligned"
],
"enumDescriptions": [
"%html.format.wrapAttributes.auto%",
"%html.format.wrapAttributes.force%",
"%html.format.wrapAttributes.forcealign%",
"%html.format.wrapAttributes.forcemultiline%",
"%html.format.wrapAttributes.alignedmultiple%"
"%html.format.wrapAttributes.alignedmultiple%",
"%html.format.wrapAttributes.preserve%",
"%html.format.wrapAttributes.preservealigned%"
],
"description": "%html.format.wrapAttributes.desc%"
},
@@ -170,7 +176,7 @@
}
},
"dependencies": {
"vscode-extension-telemetry": "0.1.0",
"vscode-extension-telemetry": "0.1.1",
"vscode-languageclient": "^5.1.0",
"vscode-nls": "^4.0.0"
},