From 8927179c17dd159753526c8ca34abcccf0d066eb Mon Sep 17 00:00:00 2001 From: Adam Voss Date: Fri, 8 Sep 2017 22:46:06 -0500 Subject: [PATCH 1/3] Disable color decorators and legacy-compatible formatting --- CHANGELOG.md | 5 +++++ README.md | 1 - client/src/yamlMain.ts | 2 +- package.json | 5 ----- package.nls.json | 1 - server/package.json | 2 +- server/src/yamlServerMain.ts | 9 --------- 7 files changed, 7 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a94b83e..4d94733 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## Unreleased +- Update **vscode-yaml-languageservice** to 0.2.0 + - Disables legacy (pre-1.2) YAML compatibility when formatting. This gives cleaner results in some files (like `.travis.yml`) where this extension may have been forcing unnecessary escaping (quoting). + - Removes the (never-working) color symbol support + ## 0.0.8 - Update **vscode-json-languageservice** to the current latest version (2.0.14) by updating **vscode-yaml-languageservice**. - **vscode-yaml-languageservice** dependency is now managed by `npm`. This makes development easier. diff --git a/README.md b/README.md index b480ae0..50acb14 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,6 @@ Schemas are handled exactly [same way they are with JSON in Visual Studio Code]( ## Known Issues - No support has been implemented for include references. ([relevant code](https://github.com/adamvoss/vscode-yaml-languageservice/blob/9199669d241f8fb5fde801399c4cd5abd0bc6d52/src/parser/yamlParser.ts#L243-L247)) - - 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/client/src/yamlMain.ts b/client/src/yamlMain.ts index ee6c929..d081e10 100644 --- a/client/src/yamlMain.ts +++ b/client/src/yamlMain.ts @@ -83,7 +83,7 @@ export function activate(context: ExtensionContext) { return client.sendRequest(ColorSymbolRequest.type, uri).then(ranges => ranges.map(client.protocol2CodeConverter.asRange)); }; let isDecoratorEnabled = (languageId: string) => { - return workspace.getConfiguration().get(languageId + '.colorDecorators.enable'); + return false; }; disposable = activateColorDecorations(colorRequestor, { yaml: true }, isDecoratorEnabled); context.subscriptions.push(disposable); diff --git a/package.json b/package.json index 85b5c62..a6694f1 100644 --- a/package.json +++ b/package.json @@ -36,11 +36,6 @@ "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 9733acf..a034a73 100644 --- a/package.nls.json +++ b/package.nls.json @@ -1,4 +1,3 @@ { - "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 diff --git a/server/package.json b/server/package.json index d1ffe4b..f006e85 100644 --- a/server/package.json +++ b/server/package.json @@ -12,7 +12,7 @@ "request-light": "^0.2.1", "vscode-languageserver": "^3.1.0-alpha.1", "vscode-nls": "^2.0.2", - "vscode-yaml-languageservice": "^0.1.0" + "vscode-yaml-languageservice": "^0.2.0" }, "devDependencies": { "@types/node": "^6.0.51" diff --git a/server/src/yamlServerMain.ts b/server/src/yamlServerMain.ts index d370639..7ea98c4 100644 --- a/server/src/yamlServerMain.ts +++ b/server/src/yamlServerMain.ts @@ -322,14 +322,5 @@ connection.onDocumentFormatting(formatParams => { return languageService.format(document, formatParams.options); }); -connection.onRequest(ColorSymbolRequest.type, uri => { - let document = documents.get(uri); - if (document) { - let jsonDocument = getJSONDocument(document); - return languageService.findColorSymbols(document, jsonDocument); - } - return []; -}); - // Listen on the connection connection.listen(); From e3c7e2014f23f88e43945d2e11d457354c612d07 Mon Sep 17 00:00:00 2001 From: Adam Voss Date: Fri, 8 Sep 2017 23:07:41 -0500 Subject: [PATCH 2/3] Lock vscode-languageclient version Done in order to keep supporting older vscode versions instead of using latest and needing to require vscode 1.16 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a6694f1..e7792fd 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ } }, "dependencies": { - "vscode-languageclient": "^3.1.0-alpha.1", + "vscode-languageclient": "~3.3", "vscode-nls": "^2.0.2" }, "devDependencies": { From 1a292254927f40270108ddef1fcb83858f5aeb54 Mon Sep 17 00:00:00 2001 From: Adam Voss Date: Fri, 8 Sep 2017 22:47:23 -0500 Subject: [PATCH 3/3] Set version to 0.0.9 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d94733..9b16651 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log -## Unreleased +## 0.0.9 - Update **vscode-yaml-languageservice** to 0.2.0 - Disables legacy (pre-1.2) YAML compatibility when formatting. This gives cleaner results in some files (like `.travis.yml`) where this extension may have been forcing unnecessary escaping (quoting). - Removes the (never-working) color symbol support diff --git a/package.json b/package.json index e7792fd..017d8bd 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "yaml", "displayName": "YAML", "description": "YAML for Visual Studio Code", - "version": "0.0.8", + "version": "0.0.9", "publisher": "adamvoss", "license": "MIT", "repository": {