From 0f6a10b4b010586d799cd712d30ca54429a87efc Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Wed, 10 Feb 2016 12:09:06 +0100 Subject: [PATCH] Fixes #2856: [json] Warnings in status bar after updating to version 0.10.8 --- extensions/php/package.json | 2 +- extensions/typescript/package.json | 2 +- src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/php/package.json b/extensions/php/package.json index 7bcd6a79642..ce664487162 100644 --- 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 index 860f887fdd3..e18896fdb5a 100644 --- 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 index 90734ee79d2..046846d9d9b 100644 --- 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 },