Fixup

redhat-developer · Mar 20, 2019 · 767e655 · 767e655
1 parent f8c2cb1
commit 767e655
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/server.ts b/src/server.ts
@@ -224,15 +224,17 @@ connection.onDidChangeConfiguration((change) => {
 		}
 		if (settings.yaml.format) {
 			yamlFormatterSettings = {
-				singleQuote: settings.yaml.format.singleQuote || false,
 				proseWrap: settings.yaml.format.proseWrap || "preserve",
 				printWidth: settings.yaml.format.printWidth || 80
 			};
-			if (settings.yaml.format.bracketSpacing === false) {
-				yamlFormatterSettings.bracketSpacing = false;
+			if (settings.yaml.format.singleQuote !== undefined) {
+				yamlFormatterSettings.singleQuote = settings.yaml.format.singleQuote;
 			}
-			if (settings.yaml.format.enable) {
-				yamlFormatterSettings.enable = settings.yaml.format.enable || true;
+			if (settings.yaml.format.bracketSpacing !== undefined) {
+				yamlFormatterSettings.bracketSpacing = settings.yaml.format.bracketSpacing;
+			}
+			if (settings.yaml.format.enable !== undefined) {
+				yamlFormatterSettings.enable = settings.yaml.format.enable;
 			}
 		}		
 	}
@@ -323,8 +325,10 @@ function updateConfiguration() {
 		hover: yamlShouldHover,
 		completion: yamlShouldCompletion,
 		schemas: [],
-		customTags: customTags
+		customTags: customTags,
+		format: yamlFormatterSettings.enable
 	};
+
 	if (schemaAssociations) {
 		for (var pattern in schemaAssociations) {
 			let association = schemaAssociations[pattern];