Skip to content

feat(vscode): update to version 1.54.2 #2862

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 35 commits into from
Mar 22, 2021
Merged

feat(vscode): update to version 1.54.2 #2862

Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e8cd17a
Squashed 'lib/vscode/' changes from 622cb03f7e0..fd6f3bce670
jsjoeio Mar 11, 2021
0cd3e39
chore(vscode): update to 1.54.2
jsjoeio Mar 11, 2021
548b6fb
fix(lib/vscode): package.json and yarn.lock
jsjoeio Mar 11, 2021
e79ca99
feat(lib/vscode): update src/vs/base/node/languagePacks.js
jsjoeio Mar 11, 2021
dac44ec
feat(update-vscode): use todo items for conflicts in pr body
jsjoeio Mar 11, 2021
dc5c271
fix(lib/vscode): replace doStore with getSotrage
jsjoeio Mar 11, 2021
325f21f
fix(lib/vscode): change doStore > doInitialize AbstractStorageService
jsjoeio Mar 11, 2021
d1ad3fa
fix(lib/vscode): update storageService getStorage methods
jsjoeio Mar 11, 2021
42ff0ec
fix(lib/vscode): update dialogHandler
jsjoeio Mar 11, 2021
8512be8
fix(lib/vscode): update electron-sandbox localizationService
jsjoeio Mar 11, 2021
cc8e4ee
fix(lib/vscode): update extensionManagementService
jsjoeio Mar 11, 2021
eaf63de
fix(lib/vscode): fix return type shutdown in ptyService
jsjoeio Mar 11, 2021
350ddc3
fix(lib/vscode): update log service in server.ts
jsjoeio Mar 11, 2021
c42240f
fix(lib/vscode): refactor mkdirp to fs.promises
jsjoeio Mar 11, 2021
e5b7438
fix(lib/vscode): update imports in channel.ts for terminal
jsjoeio Mar 11, 2021
dc08bc6
fix(lib/vscode): fix terminalLayoutInfoArgs
jsjoeio Mar 11, 2021
34189e4
fix(lib/vscode): add getAppRoot to VariableResolverService
jsjoeio Mar 11, 2021
25dbb5b
fix(lib/vscode0: localizations import in client
jsjoeio Mar 11, 2021
8f414b5
fix(lib/vscode): make mkdir recursive
jsjoeio Mar 11, 2021
875dfb6
fix(lib/vscode): update path for logService
jsjoeio Mar 12, 2021
050a1bb
Fix localizations service import
code-asher Mar 12, 2021
ae02023
fix(lib/vscode): register LogLevelChannel
jsjoeio Mar 15, 2021
0c27083
refactor: remove --home flag/feature
jsjoeio Mar 16, 2021
bcdca86
refactor: change goHome test to helpAbout
jsjoeio Mar 16, 2021
3d9d2e5
refactor: add helpAbout test instead of goHome
jsjoeio Mar 16, 2021
608871e
wip: change name back to goHome
jsjoeio Mar 16, 2021
445d7d6
fix: update testPathIgnorePatterns for jest
jsjoeio Mar 16, 2021
481dd1f
fixup: rename test
jsjoeio Mar 16, 2021
d3df963
Merge branch 'main' into jsjoeio/upgrade-vscode-1.54
jsjoeio Mar 16, 2021
36714da
fixup: move openHelpAbout
jsjoeio Mar 16, 2021
071c8e1
Merge branch 'main' into jsjoeio/upgrade-vscode-1.54
jsjoeio Mar 17, 2021
19c2f31
fixup: remove comment in server.ts
jsjoeio Mar 22, 2021
aae17cb
fixup: fix comment in server.ts
jsjoeio Mar 22, 2021
b04104c
Merge branch 'main' into jsjoeio/upgrade-vscode-1.54
jsjoeio Mar 22, 2021
f09ebc0
fix: add no-extra-semi off to eslint config
jsjoeio Mar 22, 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
10 changes: 1 addition & 9 deletions lib/vscode/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,18 @@

import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
<<<<<<< HEAD:lib/vscode/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts
=======
import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
>>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384:lib/vscode/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';

// @ts-ignore: interface is implemented via proxy
export class LocalizationsService implements ILocalizationsService {

declare readonly _serviceBrand: undefined;

constructor(
@IRemoteAgentService remoteAgentService: IRemoteAgentService,
@ISharedProcessService sharedProcessService: ISharedProcessService,
) {
<<<<<<< HEAD:lib/vscode/src/vs/workbench/services/localizations/electron-browser/localizationsService.ts
return createChannelSender<ILocalizationsService>(remoteAgentService.getConnection()!.getChannel('localizations'));
=======
return ProxyChannel.toService<ILocalizationsService>(sharedProcessService.getChannel('localizations'));
>>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384:lib/vscode/src/vs/workbench/services/localizations/electron-sandbox/localizationsService.ts
}
}

Expand Down