Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: deprecate unity-launch flag #209471

Merged
merged 1 commit into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/linux/code.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Name=@@NAME_LONG@@
Comment=Code Editing. Redefined.
GenericName=Text Editor
Exec=@@EXEC@@ --unity-launch %F
Exec=@@EXEC@@ %F
Icon=@@ICON@@
Type=Application
StartupNotify=false
Expand Down
2 changes: 1 addition & 1 deletion src/vs/code/electron-main/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1356,7 +1356,7 @@ export class CodeApplication extends Disposable {
return windowsMainService.open({
context,
cli: args,
forceNewWindow: args['new-window'] || (!hasCliArgs && args['unity-launch']),
forceNewWindow: args['new-window'],
diffMode: args.diff,
mergeMode: args.merge,
noRecentEntry,
Expand Down
1 change: 0 additions & 1 deletion src/vs/platform/environment/common/argv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ export interface NativeParsedArgs {
add?: boolean;
goto?: boolean;
'new-window'?: boolean;
'unity-launch'?: boolean; // Always open a new window, except if opening the first window or opening a file or folder as part of the launch.
'reuse-window'?: boolean;
locale?: string;
'user-data-dir'?: string;
Expand Down
1 change: 0 additions & 1 deletion src/vs/platform/environment/node/argv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
'crash-reporter-directory': { type: 'string' },
'crash-reporter-id': { type: 'string' },
'skip-add-to-recently-opened': { type: 'boolean' },
'unity-launch': { type: 'boolean' },
'open-url': { type: 'boolean' },
'file-write': { type: 'boolean' },
'file-chmod': { type: 'boolean' },
Expand Down
2 changes: 1 addition & 1 deletion src/vs/platform/launch/electron-main/launchMainService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export class LaunchMainService implements ILaunchMainService {
let openNewWindow = false;

// Force new window
if (args['new-window'] || args['unity-launch'] || baseConfig.forceProfile || baseConfig.forceTempProfile) {
if (args['new-window'] || baseConfig.forceProfile || baseConfig.forceTempProfile) {
openNewWindow = true;
}

Expand Down
Loading