Show user path if no workspace path exists when editing the php path

dbaeumer · dbaeumer · commit 0106868ed4a4 · 2017-01-26T15:37:58.000+01:00
diff --git a/extensions/php/src/phpMain.ts b/extensions/php/src/phpMain.ts
@@ -86,7 +86,7 @@ export function activate(context: vscode.ExtensionContext): any {
 }
 
 function updateStatusBarItem(context: vscode.ExtensionContext, editor: vscode.TextEditor = vscode.window.activeTextEditor): void {
-	statusBarItem.tooltip = context.workspaceState.get<string>(PathKey, undefined) || vscode.workspace.getConfiguration('php.validate').get('executablePath', undefined);
+	statusBarItem.tooltip = getExecutablePath(context);
 	if (editor && editor.document && editor.document.languageId === 'php') {
 		statusBarItem.show();
 	} else {
@@ -95,7 +95,7 @@ function updateStatusBarItem(context: vscode.ExtensionContext, editor: vscode.Te
 }
 
 function onPathClicked(context: vscode.ExtensionContext, validator: PHPValidationProvider) {
-	let value = context.workspaceState.get<string>(PathKey);
+	let value = getExecutablePath(context);
 	vscode.window.showInputBox({ prompt: localize('php.enterPath', 'The path to the PHP executable'), value: value || '' }).then(value => {
 		if (!value) {
 			// User pressed Escape
@@ -108,6 +108,18 @@ function onPathClicked(context: vscode.ExtensionContext, validator: PHPValidatio
 	});
 }
 
+function getExecutablePath(context: vscode.ExtensionContext): string {
+	let result = context.workspaceState.get<string>(PathKey, undefined);
+	if (result) {
+		return result;
+	}
+	let section = vscode.workspace.getConfiguration('php.validate');
+	if (section) {
+		return section.get('executablePath', undefined);
+	}
+	return undefined;
+}
+
 function migrateExecutablePath(settingsExecutablePath: string): Thenable<string> {
 	return vscode.window.showInputBox(
 		{
