Skip to content

Commit

Permalink
Merge pull request #3 from adamvoss/settingsFixes
Browse files Browse the repository at this point in the history
Corrects some defects related to settings
  • Loading branch information
adamvoss authored Jun 30, 2017
2 parents a3b125c + c5f1e35 commit 124b995
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 3 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Change Log

## Unreleased
## 0.0.3
- Fixes use of schemas defined in settings. Previously they did not work.
- Update upstream language service dependencies

## 0.0.2
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion client/src/yamlMain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
};
Expand Down
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions package.nls.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"yaml.colorDecorators.enable.desc": "Enables or disables color decorators",
"yaml.format.enable.desc": "Enable/disable default YAML formatter (requires restart)"
}

0 comments on commit 124b995

Please sign in to comment.