development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Opening recent from macOS dock creates a duplicate workspace (fix #208321) (#208372)

Browse source
This commit is contained in:
Benjamin Pasero 2024-03-22 08:42:50 +01:00 committed by GitHub
parent 16997b315c
commit 1e38af3424
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vs/code/electron-main/app.ts
View file

@ -120,6 +120,7 @@ import { NODE_REMOTE_RESOURCE_CHANNEL_NAME, NODE_REMOTE_RESOURCE_IPC_METHOD_NAME
import { Lazy } from 'vs/base/common/lazy';
import { IAuxiliaryWindowsMainService } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindows';
import { AuxiliaryWindowsMainService } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService';
import { normalizeNFC } from 'vs/base/common/normalization';
/**
* The main VS Code application. There will only ever be one instance,
@ -435,6 +436,8 @@ export class CodeApplication extends Disposable {
let macOpenFileURIs: IWindowOpenable[] = [];
let runningTimeout: NodeJS.Timeout | undefined = undefined;
app.on('open-file', (event, path) => {
path = normalizeNFC(path); // macOS only: normalize paths to NFC form
this.logService.trace('app#open-file: ', path);
event.preventDefault();
@ -1336,7 +1339,11 @@ export class CodeApplication extends Disposable {
return windowsMainService.open({
context: OpenContext.DOCK,
cli: args,
urisToOpen: macOpenFiles.map(path => (hasWorkspaceFileExtension(path) ? { workspaceUri: URI.file(path) } : { fileUri: URI.file(path) })),
urisToOpen: macOpenFiles.map(path => {
path = normalizeNFC(path); // macOS only: normalize paths to NFC form
return (hasWorkspaceFileExtension(path) ? { workspaceUri: URI.file(path) } : { fileUri: URI.file(path) });
}),
noRecentEntry,
waitMarkerFileURI,
initialStartup: true,