From c61c23b4878c534e31fac45b66a1deffad0ec0de Mon Sep 17 00:00:00 2001 From: Jared Moore Date: Sat, 25 Nov 2017 02:39:31 -0500 Subject: [PATCH] Open File Handler now untildifies. Fixes #32736 --- src/vs/base/common/labels.ts | 8 ++++++++ src/vs/workbench/parts/search/browser/openFileHandler.ts | 3 +++ 2 files changed, 11 insertions(+) diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts index 7730a5dbf80..12244546332 100644 --- a/src/vs/base/common/labels.ts +++ b/src/vs/base/common/labels.ts @@ -106,6 +106,14 @@ export function tildify(path: string, userHome: string): string { return path; } +export function untildify(path: string, userHome: string): string { + if (platform.isMacintosh || platform.isLinux) { + path = path.replace(/^~($|\/|\\)/, `${userHome}$1`); + } + + return path; +} + /** * Shortens the paths but keeps them easy to distinguish. * Replaces not important parts with ellipsis. diff --git a/src/vs/workbench/parts/search/browser/openFileHandler.ts b/src/vs/workbench/parts/search/browser/openFileHandler.ts index 4e2a3042199..3a85e381b07 100644 --- a/src/vs/workbench/parts/search/browser/openFileHandler.ts +++ b/src/vs/workbench/parts/search/browser/openFileHandler.ts @@ -142,6 +142,9 @@ export class OpenFileHandler extends QuickOpenHandler { return TPromise.as(new FileQuickOpenModel([])); } + // Untildify file pattern + searchValue = labels.untildify(searchValue, this.environmentService.userHome); + // Do find results return this.doFindResults(searchValue, this.cacheState.cacheKey, maxSortedResults); } -- GitLab