Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 03:29:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'microsoft:main' into main

Browse Source
This commit is contained in:
Simon McEnlly
2021-11-04 12:18:12 +10:00
committed by GitHub
parent b64259260d 323e7fd653
commit 6b0816e2c4
227 changed files with 1227 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/common/cache.ts
View File

@@ -34,6 +34,6 @@ export class Cache<T> {
if (!Cache.enableDebugLogging) {
return;
}
console.log(`${this.id} cache size — ${this._data.size}`);
console.log(`${this.id} cache size - ${this._data.size}`);
}
}

6
src/vs/workbench/api/common/extHostTerminalService.ts
View File

@@ -672,10 +672,14 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
public async $createContributedProfileTerminal(id: string, options: ICreateContributedTerminalProfileOptions): Promise<void> {
const token = new CancellationTokenSource().token;
const profile = await this._profileProviders.get(id)?.provideTerminalProfile(token);
let profile = await this._profileProviders.get(id)?.provideTerminalProfile(token);
if (token.isCancellationRequested) {
return;
}
if (profile && !('options' in profile)) {
profile = { options: profile };
}
if (!profile || !('options' in profile)) {
throw new Error(`No terminal profile options provided for id "${id}"`);
}

2
src/vs/workbench/api/common/extHostWebviewPanels.ts
View File

@@ -17,7 +17,7 @@ import * as extHostProtocol from './extHost.protocol';
import * as extHostTypes from './extHostTypes';
type IconPath = URI | { light: URI, dark: URI };
type IconPath = URI | { readonly light: URI, readonly dark: URI };
class ExtHostWebviewPanel extends Disposable implements vscode.WebviewPanel {