Skip to content

feat(vscode): update to version 1.53.2 #2773

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.

Sign up for GitHub

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

Merged
merged 48 commits into from
Mar 5, 2021
Merged

feat(vscode): update to version 1.53.2 #2773

Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
69ca92f
chore: remove old reset-vscode script
jsjoeio Feb 24, 2021
977c579
feat: add update-vscode.sh script
jsjoeio Feb 24, 2021
db3a13b
chore: fix script
jsjoeio Feb 25, 2021
89b6e01
Squashed 'lib/vscode/' changes from 3e344b17b7b..622cb03f7e0
jsjoeio Feb 25, 2021
eae5d8c
chore(vscode): update to 1.53.2
jsjoeio Feb 25, 2021
c94697d
fix: resolve conflicts in .gitignore
jsjoeio Feb 25, 2021
2c5c485
fix: resolve conflicts in .eslintignore
jsjoeio Feb 25, 2021
7bf1fd9
fix: resolve conflicts in yarn.lock
jsjoeio Feb 25, 2021
262963c
fix: resolve conflict in extensionHostProcessSetup.ts
jsjoeio Feb 25, 2021
f255cdb
fix: update text for Extension Host
jsjoeio Feb 25, 2021
3fd6187
fix: update import in extensionsViewlet
jsjoeio Feb 25, 2021
b952616
fix: resolve conflict browserSocketFactory
jsjoeio Feb 25, 2021
9e61540
fix: resolve conflicts in package.json
jsjoeio Feb 25, 2021
ce1a8c8
fix: postinstall.js conflicts
jsjoeio Feb 25, 2021
2bd9b6e
fix: update web.main.ts
jsjoeio Feb 25, 2021
40d0c88
fix: extHostExtensionService
jsjoeio Feb 25, 2021
f214235
fix: resolve conflicts in build/lib/node.ts
jsjoeio Feb 25, 2021
502323a
fix: conflicts with remoteAgentConnection
jsjoeio Feb 25, 2021
ccf2fe2
fix: conflicts in remote.ts
jsjoeio Feb 25, 2021
6a6ab72
fix: resolve conflicts in eslintrc.json
jsjoeio Feb 25, 2021
1b9ed6e
chore: update yarn.lock for vscode
jsjoeio Feb 25, 2021
169b51e
chore: run yarn fmt
jsjoeio Feb 25, 2021
38f555e
chore: fix lint issues in update-vscode
jsjoeio Feb 25, 2021
c6e6f8e
chore: add missing semicolon in channel.ts
jsjoeio Feb 25, 2021
e002f14
revert: turn off two rules in eslint for vscode
jsjoeio Feb 25, 2021
b7e112a
chore: reorder package.json lib/vscode
jsjoeio Feb 25, 2021
b71c506
chore: update electron types
jsjoeio Feb 25, 2021
0f18d1f
fix: update import in channel.ts getSystemShell
jsjoeio Feb 25, 2021
22e7173
fix: update resolveCommonProperties in server
jsjoeio Feb 26, 2021
52acb50
fix: update WebSocketNodeSocket in protocol
jsjoeio Feb 26, 2021
1bf3036
fix(connection): onClose -> onDidDispose protocol
jsjoeio Feb 26, 2021
5f3afbf
fix: refactor performance in vscode.html
jsjoeio Feb 26, 2021
9ea1863
Merge branch 'master' into upgrade-vscode-1.53
jsjoeio Feb 26, 2021
019fe3c
docs(contributing): update updating vscode
jsjoeio Feb 26, 2021
36136fe
chore: formatting
jsjoeio Feb 26, 2021
9dea2e7
chore: fix lint issues
jsjoeio Feb 26, 2021
a83c909
fix: update deps import in coder.js
jsjoeio Feb 26, 2021
058e781
Await newly promisified func
code-asher Mar 1, 2021
ba4448e
Implement terminal layouts
code-asher Mar 2, 2021
150138e
Update env vars for extension host
code-asher Mar 2, 2021
4d3d1b8
Handle permessage-deflate on sockets
code-asher Mar 2, 2021
1632a19
chore: fix lint error in channel.ts
jsjoeio Mar 3, 2021
32cbaf2
Remove unused build import
code-asher Mar 4, 2021
ad24edd
Revert remaining remote agent connection changes
code-asher Mar 4, 2021
34b1e75
Remove old commented out postinstall steps
code-asher Mar 4, 2021
61b5c09
Allow our server code to be tracked in git
code-asher Mar 4, 2021
9cbf692
fix(ci): always upload test artifacts
jsjoeio Mar 5, 2021
e47eabf
fix: goHome test after location change
jsjoeio Mar 5, 2021
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
7 changes: 4 additions & 3 deletions lib/vscode/src/vs/server/node/channel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import * as terminal from 'vs/workbench/contrib/terminal/common/remoteTerminalCh
import { IShellLaunchConfig, ITerminalEnvironment, ITerminalLaunchError } from 'vs/workbench/contrib/terminal/common/terminal';
import { TerminalDataBufferer } from 'vs/workbench/contrib/terminal/common/terminalDataBuffering';
import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
import { getSystemShell } from 'vs/workbench/contrib/terminal/node/terminal';
import { getSystemShell } from 'vs/base/node/shell';
import { getMainProcessParentEnv } from 'vs/workbench/contrib/terminal/node/terminalEnvironment';
import { TerminalProcess } from 'vs/workbench/contrib/terminal/node/terminalProcess';
import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
Expand Down Expand Up @@ -263,6 +263,7 @@ export class ExtensionEnvironmentChannel implements IServerChannel {
workspaceStorageHome: this.environment.workspaceStorageHome,
userHome: this.environment.userHome,
os: platform.OS,
marks: []
};
}

Expand Down Expand Up @@ -681,7 +682,7 @@ export class TerminalProviderChannel implements IServerChannel<RemoteAgentConnec
const resolverService = new VariableResolverService(remoteAuthority, args, process.env as platform.IProcessEnvironment);
const resolver = terminalEnvironment.createVariableResolver(activeWorkspace, resolverService);

const getDefaultShellAndArgs = (): { executable: string; args: string[] | string } => {
const getDefaultShellAndArgs = async (): Promise<{ executable: string; args: string[] | string }> => {
if (shellLaunchConfig.executable) {
const executable = resolverService.resolve(activeWorkspace, shellLaunchConfig.executable);
let resolvedArgs: string[] | string = [];
Expand All @@ -698,7 +699,7 @@ export class TerminalProviderChannel implements IServerChannel<RemoteAgentConnec
const executable = terminalEnvironment.getDefaultShell(
(key) => args.configuration[key],
args.isWorkspaceShellAllowed,
getSystemShell(platform.platform),
await getSystemShell(platform.platform),
process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432'),
process.env.windir,
resolver,
Expand Down