Finalize FoldingRangeProvider.onDidChangeFoldingRanges. Fixes #108929

This commit is contained in:
Martin Aeschlimann
2020-11-09 10:29:20 +01:00
parent 7ca4a47ba5
commit 875c2ced66
3 changed files with 8 additions and 15 deletions

View File

@@ -32,7 +32,6 @@ import { IdGenerator } from 'vs/base/common/idGenerator';
import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
import { Cache } from './cache';
import { StopWatch } from 'vs/base/common/stopwatch';
import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
// --- adapter
@@ -1814,7 +1813,7 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
return this._withAdapter(handle, ColorProviderAdapter, adapter => adapter.provideColorPresentations(URI.revive(resource), colorInfo, token), undefined);
}
registerFoldingRangeProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.FoldingRangeProvider2): vscode.Disposable {
registerFoldingRangeProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.FoldingRangeProvider): vscode.Disposable {
const handle = this._nextHandle();
const eventHandle = typeof provider.onDidChangeFoldingRanges === 'function' ? this._nextHandle() : undefined;
@@ -1823,8 +1822,7 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
let result = this._createDisposable(handle);
if (eventHandle !== undefined) {
checkProposedApiEnabled(extension);
const subscription = provider.onDidChangeFoldingRanges!(_ => this._proxy.$emitFoldingRangeEvent(eventHandle));
const subscription = provider.onDidChangeFoldingRanges!(() => this._proxy.$emitFoldingRangeEvent(eventHandle));
result = Disposable.from(result, subscription);
}