From c623dfadd1cc16d02652de14e23d27218ca3e609 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Mon, 1 May 2017 16:18:01 -0700 Subject: [PATCH] [WelcomeUX] Windows: Filter current folder from Recent section (fixes #25750) --- .../welcome/page/electron-browser/welcomePage.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts index 8992dda52fa..7231ee075f8 100644 --- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts +++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts @@ -36,6 +36,7 @@ import { tildify } from 'vs/base/common/labels'; import { editorBackground } from 'vs/platform/theme/common/colorRegistry'; import { Themable } from 'vs/workbench/common/theme'; import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; +import { isLinux } from 'vs/base/common/platform'; used(); @@ -174,7 +175,7 @@ class WelcomePage { recentlyOpened.then(({ folders }) => { if (this.contextService.hasWorkspace()) { const current = this.contextService.getWorkspace().resource.fsPath; - folders = folders.filter(folder => folder !== current); + folders = folders.filter(folder => !this.pathEquals(folder, current)); } if (!folders.length) { const recent = container.querySelector('.welcomePage') as HTMLElement; @@ -254,6 +255,15 @@ class WelcomePage { this.disposables.push(new WelcomeTheming(this.themeService, container)); } + private pathEquals(path1: string, path2: string): boolean { + if (!isLinux) { + path1 = path1.toLowerCase(); + path2 = path2.toLowerCase(); + } + + return path1 === path2; + } + private installKeymap(keymapName: string, keymapIdentifier: string): void { this.telemetryService.publicLog('installKeymap', { from: telemetryFrom, -- GitLab