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

Local terminal reconnection #116449

Merged
merged 79 commits into from
Feb 22, 2021
Merged

Local terminal reconnection #116449

merged 79 commits into from
Feb 22, 2021

Conversation

Tyriar
Copy link
Member

@Tyriar Tyriar commented Feb 11, 2021

Supersedes #116370

This PR is part of #20013

@Tyriar Tyriar added this to the February 2021 milestone Feb 11, 2021
@Tyriar
Copy link
Member Author

Tyriar commented Feb 11, 2021

I pushed the merged version of this into https://github.com/microsoft/vscode/tree/tyriar/megan_backup in case we needed it

src/vs/base/common/async.ts Show resolved Hide resolved
src/vs/base/parts/ipc/common/ipc.net.ts Outdated Show resolved Hide resolved
src/vs/platform/terminal/common/terminal.ts Outdated Show resolved Hide resolved
src/vs/platform/terminal/common/terminal.ts Outdated Show resolved Hide resolved
src/vs/platform/terminal/node/ptyService.ts Outdated Show resolved Hide resolved
src/vs/workbench/contrib/terminal/common/terminal.ts Outdated Show resolved Hide resolved
src/vs/workbench/contrib/terminal/common/terminal.ts Outdated Show resolved Hide resolved
src/vs/workbench/contrib/terminal/common/terminal.ts Outdated Show resolved Hide resolved
src/vs/workbench/contrib/terminal/common/terminal.ts Outdated Show resolved Hide resolved
src/vs/platform/terminal/common/environmentVariable.ts Outdated Show resolved Hide resolved
src/vs/platform/terminal/common/terminal.ts Outdated Show resolved Hide resolved
src/vs/platform/terminal/common/terminal.ts Outdated Show resolved Hide resolved
src/vs/platform/terminal/common/terminal.ts Outdated Show resolved Hide resolved
src/vs/platform/terminal/node/ptyService.ts Outdated Show resolved Hide resolved
src/vs/platform/terminal/node/ptyService.ts Outdated Show resolved Hide resolved
Copy link
Member Author

@Tyriar Tyriar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looked through all files, remaining to do:

  • Resolve the comments
  • Do a last check of TODOS
  • Fix remote conflicts and verify
  • Get CI passing

@Tyriar Tyriar self-assigned this Feb 22, 2021
@Tyriar Tyriar merged commit d6846fa into main Feb 22, 2021
@Tyriar Tyriar deleted the tyriar_megan_reconnect branch February 22, 2021 12:48
@github-actions github-actions bot locked and limited conversation to collaborators Apr 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants