From eeaffa91a3ba140ca7d6622abc901aa70d131150 Mon Sep 17 00:00:00 2001
From: Andre Weinand <aweinand@microsoft.com>
Date: Fri, 19 Jul 2019 11:29:39 +0200
Subject: [PATCH] add new variable ${relativeFileDirname}; fixes #77616

---
 .../configuration-editing/src/extension.ts    | 19 ++++++++++++++-----
 .../common/variableResolver.ts                |  7 +++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/extensions/configuration-editing/src/extension.ts b/extensions/configuration-editing/src/extension.ts
index 913c5288809..aff533d86d9 100644
--- a/extensions/configuration-editing/src/extension.ts
+++ b/extensions/configuration-editing/src/extension.ts
@@ -63,11 +63,20 @@ function registerVariableCompletions(pattern: string): vscode.Disposable {
 				const indexOf$ = document.lineAt(position.line).text.indexOf('$');
 				const startPosition = indexOf$ >= 0 ? new vscode.Position(position.line, indexOf$) : position;
 
-				return [{ label: 'workspaceFolder', detail: localize('workspaceFolder', "The path of the folder opened in VS Code") }, { label: 'workspaceFolderBasename', detail: localize('workspaceFolderBasename', "The name of the folder opened in VS Code without any slashes (/)") },
-				{ label: 'relativeFile', detail: localize('relativeFile', "The current opened file relative to ${workspaceFolder}") }, { label: 'file', detail: localize('file', "The current opened file") }, { label: 'cwd', detail: localize('cwd', "The task runner's current working directory on startup") },
-				{ label: 'lineNumber', detail: localize('lineNumber', "The current selected line number in the active file") }, { label: 'selectedText', detail: localize('selectedText', "The current selected text in the active file") },
-				{ label: 'fileDirname', detail: localize('fileDirname', "The current opened file's dirname") }, { label: 'fileExtname', detail: localize('fileExtname', "The current opened file's extension") }, { label: 'fileBasename', detail: localize('fileBasename', "The current opened file's basename") },
-				{ label: 'fileBasenameNoExtension', detail: localize('fileBasenameNoExtension', "The current opened file's basename with no file extension") }].map(variable => ({
+				return [
+					{ label: 'workspaceFolder', detail: localize('workspaceFolder', "The path of the folder opened in VS Code") },
+					{ label: 'workspaceFolderBasename', detail: localize('workspaceFolderBasename', "The name of the folder opened in VS Code without any slashes (/)") },
+					{ label: 'relativeFile', detail: localize('relativeFile', "The current opened file relative to ${workspaceFolder}") },
+					{ label: 'relativeFileDirname', detail: localize('relativeFileDirname', "The current opened file's dirname relative to ${workspaceFolder}") },
+					{ label: 'file', detail: localize('file', "The current opened file") },
+					{ label: 'cwd', detail: localize('cwd', "The task runner's current working directory on startup") },
+					{ label: 'lineNumber', detail: localize('lineNumber', "The current selected line number in the active file") },
+					{ label: 'selectedText', detail: localize('selectedText', "The current selected text in the active file") },
+					{ label: 'fileDirname', detail: localize('fileDirname', "The current opened file's dirname") },
+					{ label: 'fileExtname', detail: localize('fileExtname', "The current opened file's extension") },
+					{ label: 'fileBasename', detail: localize('fileBasename', "The current opened file's basename") },
+					{ label: 'fileBasenameNoExtension', detail: localize('fileBasenameNoExtension', "The current opened file's basename with no file extension") }
+				].map(variable => ({
 					label: '${' + variable.label + '}',
 					range: new vscode.Range(startPosition, position),
 					detail: variable.detail
diff --git a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
index 43d8013dc31..a07fb3a264d 100644
--- a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
@@ -237,6 +237,13 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 						}
 						return getFilePath();
 
+					case 'relativeFileDirname':
+						let dirname = paths.dirname(getFilePath());
+						if (folderUri) {
+							return paths.normalize(paths.relative(getFolderUri().fsPath, dirname));
+						}
+						return dirname;
+
 					case 'fileDirname':
 						return paths.dirname(getFilePath());