From dc358e584b526dc4bc2792a1e9b17c022e713968 Mon Sep 17 00:00:00 2001 From: Adam Voss Date: Fri, 30 Jun 2017 08:56:34 -0500 Subject: [PATCH 1/3] Sync the `json.schemas` setting so settings-defined schema work --- CHANGELOG.md | 1 + client/src/yamlMain.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4908d88..876ed49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Change Log ## Unreleased +- Fixes use of schemas defined in settings. Previously they did not work. - Update upstream language service dependencies ## 0.0.2 diff --git a/client/src/yamlMain.ts b/client/src/yamlMain.ts index 0c6ac5b..ee6c929 100644 --- a/client/src/yamlMain.ts +++ b/client/src/yamlMain.ts @@ -58,7 +58,7 @@ export function activate(context: ExtensionContext) { documentSelector: ['yaml'], synchronize: { // Synchronize the setting section 'yaml' to the server - configurationSection: ['yaml', 'http.proxy', 'http.proxyStrictSSL'], + configurationSection: ['yaml', 'json.schemas', 'http.proxy', 'http.proxyStrictSSL'], fileEvents: workspace.createFileSystemWatcher('**/*.?(e)y?(a)ml') } }; From 819f6d1ecfa3abd474daadf4bcd4790fcef3147b Mon Sep 17 00:00:00 2001 From: Adam Voss Date: Fri, 30 Jun 2017 08:59:25 -0500 Subject: [PATCH 2/3] Add needed configuration setting for color decorators --- README.md | 1 + package.json | 5 +++++ package.nls.json | 1 + 3 files changed, 7 insertions(+) diff --git a/README.md b/README.md index 239b61d..1d4f4ac 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ Schemas are handled exactly [same way they are with JSON in Visual Studio Code]( ## Known Issues - No support has been implemented for anchor reference or includes. ([relevant code](https://github.com/adamvoss/vscode-yaml-languageservice/blob/e878a9636fc3cf43d9105c8c1ba02f02fea6d18c/src/parser/yamlParser.ts#L237-L242)) - Only one document is supported per file. + - Color decorators (`yaml.colorDecorators.enable`) do not work even when enabled. ## Acknowledgments This extension would not have been possible without numerous open source projects. Please see [ACKNOWLEDGMENTS.md](ACKNOWLEDGMENTS.md). diff --git a/package.json b/package.json index ee4ebd0..a43b9ff 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,11 @@ "configuration": { "title": "YAML", "properties": { + "yaml.colorDecorators.enable": { + "type": "boolean", + "default": false, + "description": "%yaml.colorDecorators.enable.desc%" + }, "yaml.format.enable": { "type": "boolean", "default": true, diff --git a/package.nls.json b/package.nls.json index a034a73..9733acf 100644 --- a/package.nls.json +++ b/package.nls.json @@ -1,3 +1,4 @@ { + "yaml.colorDecorators.enable.desc": "Enables or disables color decorators", "yaml.format.enable.desc": "Enable/disable default YAML formatter (requires restart)" } \ No newline at end of file From c5f1e357bbf35c9f6ff7d4e769d363cc7ba1bfa5 Mon Sep 17 00:00:00 2001 From: Adam Voss Date: Fri, 30 Jun 2017 09:01:52 -0500 Subject: [PATCH 3/3] Set version to 0.0.3 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 876ed49..2d79c9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log -## Unreleased +## 0.0.3 - Fixes use of schemas defined in settings. Previously they did not work. - Update upstream language service dependencies diff --git a/package.json b/package.json index a43b9ff..5317472 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "yaml", "displayName": "YAML", "description": "YAML for Visual Studio Code", - "version": "0.0.2", + "version": "0.0.3", "publisher": "adamvoss", "license": "MIT", "repository": {