diff --git a/build/package.json b/build/package.json index cb70e42902d..c717a1585da 100644 --- a/build/package.json +++ b/build/package.json @@ -52,7 +52,7 @@ "p-limit": "^3.1.0", "plist": "^3.0.1", "source-map": "0.6.1", - "typescript": "^4.3.0-dev.20210216", + "typescript": "^4.3.0-dev.20210226", "vsce": "1.48.0", "vscode-universal": "deepak1556/universal#61454d96223b774c53cda10f72c2098c0ce02d58" }, diff --git a/build/yarn.lock b/build/yarn.lock index 67dd26a7624..b73eb19d249 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -1884,10 +1884,10 @@ typescript@^4.1.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== -typescript@^4.3.0-dev.20210216: - version "4.3.0-dev.20210216" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210216.tgz#233327e6094008c02265ba140f8d9ece9133421e" - integrity sha512-pJLcC/kqnE+0rftTRc2/gYBkz9nl+kJfaU8sSOLYnzUvD8p+LOZMzXfaLoKPdGFJ6U9+Ox/sYV9HBTJVEjSTYg== +typescript@^4.3.0-dev.20210226: + version "4.3.0-dev.20210226" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210226.tgz#e754283dfaa01d79cea9df6d0f8a18114ace41ec" + integrity sha512-jxqKjVQsHkEMbyacr5CFpWnU3pv7H9QBljjORr3ct7qq+Q7ynHHmmFd5zQjU8HgHZYOMapIBhLsZSeqUeduQGQ== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.5" diff --git a/package.json b/package.json index 9787307140a..fcd852ff13c 100644 --- a/package.json +++ b/package.json @@ -191,7 +191,7 @@ "style-loader": "^1.0.0", "ts-loader": "^6.2.1", "tsec": "0.1.4", - "typescript": "^4.3.0-dev.20210216", + "typescript": "^4.3.0-dev.20210226", "typescript-formatter": "7.1.0", "underscore": "^1.8.2", "vinyl": "^2.0.0", diff --git a/src/vs/editor/contrib/hover/hover.ts b/src/vs/editor/contrib/hover/hover.ts index 071253cbd0c..276ad87a8ff 100644 --- a/src/vs/editor/contrib/hover/hover.ts +++ b/src/vs/editor/contrib/hover/hover.ts @@ -312,13 +312,9 @@ class ShowDefinitionPreviewHoverAction extends EditorAction { const range = new Range(position.lineNumber, position.column, position.lineNumber, position.column); const goto = GotoDefinitionAtPositionEditorContribution.get(editor); const promise = goto.startFindDefinitionFromCursor(position); - if (promise) { - promise.then(() => { - controller.showContentHover(range, HoverStartMode.Immediate, true); - }); - } else { + promise.then(() => { controller.showContentHover(range, HoverStartMode.Immediate, true); - } + }); } } diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts index 3dfc15e444a..e139c854bb0 100644 --- a/src/vs/platform/files/common/fileService.ts +++ b/src/vs/platform/files/common/fileService.ts @@ -79,9 +79,7 @@ export class FileService extends Disposable implements IFileService { this._onWillActivateFileSystemProvider.fire({ scheme, join(promise) { - if (promise) { - joiners.push(promise); - } + joiners.push(promise); }, }); diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts index 82f80545895..89390d4e240 100644 --- a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts +++ b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts @@ -289,9 +289,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe this._onWillShutdown.fire({ join(promise) { - if (promise) { - joiners.push(promise); - } + joiners.push(promise); } }); diff --git a/src/vs/platform/storage/test/electron-main/storageMainService.test.ts b/src/vs/platform/storage/test/electron-main/storageMainService.test.ts index 2a91d25b5d9..8c2556f79f0 100644 --- a/src/vs/platform/storage/test/electron-main/storageMainService.test.ts +++ b/src/vs/platform/storage/test/electron-main/storageMainService.test.ts @@ -48,9 +48,7 @@ suite('StorageMainService', function () { this._onWillShutdown.fire({ join(promise) { - if (promise) { - joiners.push(promise); - } + joiners.push(promise); } }); diff --git a/src/vs/workbench/api/browser/mainThreadTunnelService.ts b/src/vs/workbench/api/browser/mainThreadTunnelService.ts index 052f5a24516..5713bf1fddb 100644 --- a/src/vs/workbench/api/browser/mainThreadTunnelService.ts +++ b/src/vs/workbench/api/browser/mainThreadTunnelService.ts @@ -102,26 +102,23 @@ export class MainThreadTunnelService extends Disposable implements MainThreadTun const tunnelProvider: ITunnelProvider = { forwardPort: (tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions) => { const forward = this._proxy.$forwardPort(tunnelOptions, tunnelCreationOptions); - if (forward) { - return forward.then(tunnel => { - this.logService.trace(`MainThreadTunnelService: New tunnel established by tunnel provider: ${tunnel?.remoteAddress.host}:${tunnel?.remoteAddress.port}`); - if (!tunnel) { - return undefined; + return forward.then(tunnel => { + this.logService.trace(`MainThreadTunnelService: New tunnel established by tunnel provider: ${tunnel?.remoteAddress.host}:${tunnel?.remoteAddress.port}`); + if (!tunnel) { + return undefined; + } + return { + tunnelRemotePort: tunnel.remoteAddress.port, + tunnelRemoteHost: tunnel.remoteAddress.host, + localAddress: typeof tunnel.localAddress === 'string' ? tunnel.localAddress : makeAddress(tunnel.localAddress.host, tunnel.localAddress.port), + tunnelLocalPort: typeof tunnel.localAddress !== 'string' ? tunnel.localAddress.port : undefined, + public: tunnel.public, + dispose: async (silent?: boolean) => { + this.logService.trace(`MainThreadTunnelService: Closing tunnel from tunnel provider: ${tunnel?.remoteAddress.host}:${tunnel?.remoteAddress.port}`); + return this._proxy.$closeTunnel({ host: tunnel.remoteAddress.host, port: tunnel.remoteAddress.port }, silent); } - return { - tunnelRemotePort: tunnel.remoteAddress.port, - tunnelRemoteHost: tunnel.remoteAddress.host, - localAddress: typeof tunnel.localAddress === 'string' ? tunnel.localAddress : makeAddress(tunnel.localAddress.host, tunnel.localAddress.port), - tunnelLocalPort: typeof tunnel.localAddress !== 'string' ? tunnel.localAddress.port : undefined, - public: tunnel.public, - dispose: async (silent?: boolean) => { - this.logService.trace(`MainThreadTunnelService: Closing tunnel from tunnel provider: ${tunnel?.remoteAddress.host}:${tunnel?.remoteAddress.port}`); - return this._proxy.$closeTunnel({ host: tunnel.remoteAddress.host, port: tunnel.remoteAddress.port }, silent); - } - }; - }); - } - return undefined; + }; + }); } }; this.tunnelService.setTunnelProvider(tunnelProvider, features); diff --git a/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts b/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts index 09ea04d89b6..deefcdc30ba 100644 --- a/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts +++ b/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts @@ -193,12 +193,10 @@ class NativeContextMenuService extends Disposable implements IContextMenuService const context = delegate.getActionsContext ? delegate.getActionsContext(event) : undefined; const runnable = actionRunner.run(actionToRun, context); - if (runnable) { - try { - await runnable; - } catch (error) { - this.notificationService.error(error); - } + try { + await runnable; + } catch (error) { + this.notificationService.error(error); } } } diff --git a/src/vs/workbench/services/credentials/browser/credentialsService.ts b/src/vs/workbench/services/credentials/browser/credentialsService.ts index 8dd3d74ee49..1ec5f3f6565 100644 --- a/src/vs/workbench/services/credentials/browser/credentialsService.ts +++ b/src/vs/workbench/services/credentials/browser/credentialsService.ts @@ -40,9 +40,7 @@ export class BrowserCredentialsService extends Disposable implements ICredential deletePassword(service: string, account: string): Promise { const didDelete = this.credentialsProvider.deletePassword(service, account); - if (didDelete) { - this._onDidChangePassword.fire({ service, account }); - } + this._onDidChangePassword.fire({ service, account }); return didDelete; } diff --git a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts b/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts index 2d747614f9b..1741a9f870a 100644 --- a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts +++ b/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts @@ -148,13 +148,11 @@ export class NativeLifecycleService extends AbstractLifecycleService { this._onWillShutdown.fire({ join(promise, id) { - if (promise) { - joiners.push(promise); + joiners.push(promise); - // Track promise completion - pendingJoiners.add(id); - promise.finally(() => pendingJoiners.delete(id)); - } + // Track promise completion + pendingJoiners.add(id); + promise.finally(() => pendingJoiners.delete(id)); }, reason }); diff --git a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts index 82b6a3254fe..496af760bcc 100644 --- a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts +++ b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts @@ -65,9 +65,7 @@ export class NativeWorkspaceEditingService extends AbstractWorkspaceEditingServi private registerListeners(): void { this.lifecycleService.onBeforeShutdown(e => { const saveOperation = this.saveUntitledBeforeShutdown(e.reason); - if (saveOperation) { - e.veto(saveOperation, 'veto.untitledWorkspace'); - } + e.veto(saveOperation, 'veto.untitledWorkspace'); }); } diff --git a/yarn.lock b/yarn.lock index 0ca9d1b2885..1b855ccbfe2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9698,10 +9698,10 @@ typescript@^3.0.1: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== -typescript@^4.3.0-dev.20210216: - version "4.3.0-dev.20210216" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210216.tgz#233327e6094008c02265ba140f8d9ece9133421e" - integrity sha512-pJLcC/kqnE+0rftTRc2/gYBkz9nl+kJfaU8sSOLYnzUvD8p+LOZMzXfaLoKPdGFJ6U9+Ox/sYV9HBTJVEjSTYg== +typescript@^4.3.0-dev.20210226: + version "4.3.0-dev.20210226" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210226.tgz#e754283dfaa01d79cea9df6d0f8a18114ace41ec" + integrity sha512-jxqKjVQsHkEMbyacr5CFpWnU3pv7H9QBljjORr3ct7qq+Q7ynHHmmFd5zQjU8HgHZYOMapIBhLsZSeqUeduQGQ== typical@^4.0.0: version "4.0.0"