ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-21 04:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.31.1 (#4283)

Browse Source
This commit is contained in:
Matt Irvine
2019-03-15 13:09:45 -07:00
committed by GitHub
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/editor/contrib/folding/folding.ts
View File

@@ -36,7 +36,7 @@ export const ID = 'editor.contrib.folding';
export interface RangeProvider {
readonly id: string;
compute(cancelationToken: CancellationToken): Thenable<FoldingRegions | null>;
compute(cancelationToken: CancellationToken): Promise<FoldingRegions | null>;
dispose(): void;
}
@@ -70,7 +70,7 @@ export class FoldingController implements IEditorContribution {
private foldingStateMemento: FoldingStateMemento | null;
private foldingModelPromise: Thenable<FoldingModel | null> | null;
private foldingModelPromise: Promise<FoldingModel | null> | null;
private updateScheduler: Delayer<FoldingModel | null> | null;
private globalToDispose: IDisposable[];
@@ -136,10 +136,10 @@ export class FoldingController implements IEditorContribution {
}
if (this.foldingModel) { // disposed ?
let collapsedRegions = this.foldingModel.isInitialized ? this.foldingModel.getMemento() : this.hiddenRangeModel!.getMemento();
let provider = this.rangeProvider ? this.rangeProvider.id : void 0;
let provider = this.rangeProvider ? this.rangeProvider.id : undefined;
return { collapsedRegions, lineCount: model.getLineCount(), provider };
}
return void 0;
return undefined;
}
/**
@@ -432,7 +432,7 @@ abstract class FoldingAction<T> extends EditorAction {
abstract invoke(foldingController: FoldingController, foldingModel: FoldingModel, editor: ICodeEditor, args: T): void;
public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: T): void | Thenable<void> {
public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: T): void | Promise<void> {
let foldingController = FoldingController.get(editor);
if (!foldingController) {
return;