Skip to content

Commit

Permalink
Fix silly logic error
Browse files Browse the repository at this point in the history
  • Loading branch information
trajamsmith committed May 1, 2020
1 parent 893ca44 commit 068e925
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -404,10 +404,18 @@ connection.onDidChangeConfiguration(change => {

specificValidatorPaths = [];
if (settings.yaml) {
yamlConfigurationSettings = settings.yaml.schemas || yamlConfigurationSettings;
yamlShouldValidate = settings.yaml.validate || yamlShouldValidate;
yamlShouldHover = settings.yaml.hover || yamlShouldHover;
yamlShouldCompletion = settings.yaml.completion || yamlShouldCompletion;
if (settings.yaml.hasOwnProperty('schemas')) {
yamlConfigurationSettings = settings.yaml.schemas;
}
if (settings.yaml.hasOwnProperty('validate')) {
yamlShouldValidate = settings.yaml.validate;
}
if (settings.yaml.hasOwnProperty('hover')) {
yamlShouldHover = settings.yaml.hover;
}
if (settings.yaml.hasOwnProperty('completion')) {
yamlShouldCompletion = settings.yaml.completion;
}
customTags = settings.yaml.customTags ? settings.yaml.customTags : [];

if (settings.yaml.schemaStore) {
Expand Down

0 comments on commit 068e925

Please sign in to comment.