Fixes microsoft#2856: [json] Warnings in status bar after updating to version 0.10.8

aeschli · aeschli · commit 0f6a10b4b010 · 2016-02-10T14:04:53.000+01:00
diff --git a/extensions/php/package.json b/extensions/php/package.json
@@ -27,7 +27,7 @@
 					"description": "Whether php validation is enabled or not."
 				},
 				"php.validate.executablePath": {
-					"type": "string",
+					"type": ["string", "null"],
 					"default": null,
 					"description": "Points to the php executable."
 				},
diff --git a/extensions/typescript/package.json b/extensions/typescript/package.json
@@ -64,7 +64,7 @@
 					"description": "Complete functions with their parameter signature."
 				},
 				"typescript.tsdk": {
-					"type": "string",
+					"type": ["string", "null"],
 					"default": null,
 					"description": "Specifies the folder path containing the tsserver and lib*.d.ts files to use."
 				}
diff --git a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts
@@ -501,7 +501,7 @@ export function registerContributions(): void {
 				default: true
 			},
 			"git.path": {
-				type: 'string',
+				type: ['string', 'null'],
 				description: nls.localize('gitPath', "Path to the git executable"),
 				default: null
 			},

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@`
`64`	`64`	`"description": "Complete functions with their parameter signature."`
`65`	`65`	`},`
`66`	`66`	`"typescript.tsdk": {`
`67`		`- "type": "string",`
	`67`	`+ "type": ["string", "null"],`
`68`	`68`	`"default": null,`
`69`	`69`	`"description": "Specifies the folder path containing the tsserver and lib*.d.ts files to use."`
`70`	`70`	`}`