From 7ebc20495c4342314ee40d78b20f2d4059706a55 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 30 Oct 2017 13:51:25 +0100
Subject: [PATCH] Fix #37041

---
 extensions/json/client/src/jsonMain.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/extensions/json/client/src/jsonMain.ts b/extensions/json/client/src/jsonMain.ts
index 2509a46e38555..a2e394b6366b9 100644
--- a/extensions/json/client/src/jsonMain.ts
+++ b/extensions/json/client/src/jsonMain.ts
@@ -206,7 +206,6 @@ function getSchemaAssociation(context: ExtensionContext): ISchemaAssociations {
 
 function getSettings(): Settings {
 	let httpSettings = workspace.getConfiguration('http');
-	let jsonSettings = workspace.getConfiguration('json');
 
 	let settings: Settings = {
 		http: {
@@ -214,7 +213,7 @@ function getSettings(): Settings {
 			proxyStrictSSL: httpSettings.get('proxyStrictSSL')
 		},
 		json: {
-			format: jsonSettings.get('format'),
+			format: workspace.getConfiguration('json').get('format'),
 			schemas: [],
 		}
 	};
@@ -244,7 +243,7 @@ function getSettings(): Settings {
 	};
 
 	// merge global and folder settings. Qualify all file matches with the folder path.
-	let globalSettings = jsonSettings.get<JSONSchemaSettings[]>('schemas');
+	let globalSettings = workspace.getConfiguration('json', null).get<JSONSchemaSettings[]>('schemas');
 	if (Array.isArray(globalSettings)) {
 		collectSchemaSettings(globalSettings, workspace.rootPath);
 	}