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

Do not preserve editSessionId on a reload #158295

Merged
merged 1 commit into from Aug 16, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/vs/code/electron-main/app.ts
Expand Up @@ -900,13 +900,6 @@ export class CodeApplication extends Disposable {
// or if no window is open (macOS only)
shouldOpenInNewWindow ||= isMacintosh && windowsMainService.getWindowCount() === 0;

// Pass along edit session id
if (params.get('editSessionId') !== null) {
environmentService.editSessionId = params.get('editSessionId') ?? undefined;
params.delete('editSessionId');
uri = uri.with({ query: params.toString() });
}

// Check for URIs to open in window
const windowOpenableFromProtocolLink = app.getWindowOpenableFromProtocolLink(uri);
logService.trace('app#handleURL: windowOpenableFromProtocolLink = ', windowOpenableFromProtocolLink);
Expand Down
1 change: 0 additions & 1 deletion src/vs/platform/windows/electron-main/windowImpl.ts
Expand Up @@ -959,7 +959,6 @@ export class CodeWindow extends Disposable implements ICodeWindow {

configuration.isInitialStartup = false; // since this is a reload
configuration.policiesData = this.policyService.serialize(); // set policies data again
configuration.editSessionId = this.environmentMainService.editSessionId; // set latest edit session id
configuration.profiles = {
all: this.userDataProfilesService.profiles,
current: this.profile || this.userDataProfilesService.defaultProfile,
Expand Down
Expand Up @@ -1356,7 +1356,6 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
accessibilitySupport: app.accessibilitySupportEnabled,
colorScheme: this.themeMainService.getColorScheme(),
policiesData: this.policyService.serialize(),
editSessionId: this.environmentMainService.editSessionId,
};

let window: ICodeWindow | undefined;
Expand Down