From 215fae1e5bdb161835f7e0502f574a915168ffd4 Mon Sep 17 00:00:00 2001
From: Vladyslav Zhukovskyi <vzhukovs@redhat.com>
Date: Mon, 9 Dec 2019 17:29:14 +0200
Subject: [PATCH] Deprecate current.project.path variable

Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>
---
 .../project-path-variable-resolver.ts         | 36 +++----------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/plugins/task-plugin/src/variable/project-path-variable-resolver.ts b/plugins/task-plugin/src/variable/project-path-variable-resolver.ts
index af3768b9f..aeb10ef7f 100644
--- a/plugins/task-plugin/src/variable/project-path-variable-resolver.ts
+++ b/plugins/task-plugin/src/variable/project-path-variable-resolver.ts
@@ -9,17 +9,17 @@
  **********************************************************************/
 
 import { injectable } from 'inversify';
-import Uri from 'vscode-uri';
 import * as che from '@eclipse-che/plugin';
 import * as theia from '@theia/plugin';
 import * as startPoint from '../task-plugin-backend';
 
 const VARIABLE_NAME = 'current.project.path';
-const SELECTED_CONTEXT_COMMAND = 'theia.plugin.workspace.selectedContext';
 const PROJECTS_ROOT_VARIABLE = 'CHE_PROJECTS_ROOT';
 const ERROR_MESSAGE_TEMPLATE = 'Can not resolve \'current.project.path\' variable.';
 /**
  * Contributes the variable for getting path for current project as a relative path to the first directory under the root workspace.
+ * 
+ * @deprecated will be removed soon. Use ${workspaceFolder} macro instead.
  */
 @injectable()
 export class ProjectPathVariableResolver {
@@ -38,33 +38,7 @@ export class ProjectPathVariableResolver {
             return this.onError('Projects root is not set');
         }
 
-        const selections = await theia.commands.executeCommand<Uri[]>(SELECTED_CONTEXT_COMMAND);
-        if (!selections || selections.length < 1) {
-            return this.onError('Please select a project.');
-        }
-
-        const selection = selections[0];
-        const selectionPath = selection.path;
-        const workspaceFolder = theia.workspace.getWorkspaceFolder(theia.Uri.file(selectionPath));
-        if (!workspaceFolder) {
-            return this.onError('Selection doesn\'t match any workspace folder.');
-        }
-
-        const workspaceFolderPath = workspaceFolder.uri.path;
-        if (workspaceFolderPath === this.projectsRoot) {
-            const splittedSelectionUri = selectionPath.substring(workspaceFolderPath.length).split('/');
-            const project = splittedSelectionUri.shift() || splittedSelectionUri.shift();
-
-            this.isResolved = true;
-            return `${this.projectsRoot}/${project}`;
-        }
-
-        if (workspaceFolderPath.startsWith(this.projectsRoot)) {
-            this.isResolved = true;
-            return workspaceFolderPath;
-        }
-
-        return this.onError('The selection isn\'t under the current workspace root folder.');
+        return this.projectsRoot;
     }
 
     private createVariable(): che.Variable {
@@ -76,10 +50,10 @@ export class ProjectPathVariableResolver {
         };
     }
 
-    private onError(error?: string) {
+    private onError(error: string) {
         this.isResolved = false;
 
-        const errorMessage = error ? `${ERROR_MESSAGE_TEMPLATE} ${error}` : ERROR_MESSAGE_TEMPLATE;
+        const errorMessage = `${ERROR_MESSAGE_TEMPLATE} ${error}`;
         theia.window.showErrorMessage(errorMessage);
         return Promise.reject(errorMessage);
     }