Fix microsoft#93217

sandy081 · sandy081 · commit bc6cf275077c · 2020-03-27T10:16:28.000+01:00
diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts
@@ -265,8 +265,12 @@ export function addToValueTree(settingsTreeRoot: any, key: string, value: any, c
 		curr = obj;
 	}
 
-	if (typeof curr === 'object') {
-		curr[last] = value; // workaround https://github.com/Microsoft/vscode/issues/13606
+	if (typeof curr === 'object' && curr !== null) {
+		try {
+			curr[last] = value; // workaround https://github.com/Microsoft/vscode/issues/13606
+		} catch (e) {
+			conflictReporter(`Ignoring ${key} as ${segments.join('.')} is ${JSON.stringify(curr)}`);
+		}
 	} else {
 		conflictReporter(`Ignoring ${key} as ${segments.join('.')} is ${JSON.stringify(curr)}`);
 	}

Original file line number	Diff line number	Diff line change
`@@ -265,8 +265,12 @@ export function addToValueTree(settingsTreeRoot: any, key: string, value: any, c`
`265`	`265`	`curr = obj;`
`266`	`266`	`}`
`267`	`267`
`268`		`- if (typeof curr === 'object') {`
`269`		`- curr[last] = value; // workaround https://github.com/Microsoft/vscode/issues/13606`
	`268`	`+ if (typeof curr === 'object' && curr !== null) {`
	`269`	`+ try {`
	`270`	`+ curr[last] = value; // workaround https://github.com/Microsoft/vscode/issues/13606`
	`271`	`+ } catch (e) {`
	`272`	+ conflictReporter(`Ignoring ${key} as ${segments.join('.')} is ${JSON.stringify(curr)}`);
	`273`	`+ }`
`270`	`274`	`} else {`
`271`	`275`	conflictReporter(`Ignoring ${key} as ${segments.join('.')} is ${JSON.stringify(curr)}`);
`272`	`276`	`}`