Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

This commit is contained in:
Anthony Dresser
2019-08-12 21:31:51 -07:00
committed by GitHub
parent 00250839fc
commit 7eba8c4c03
616 changed files with 9472 additions and 7087 deletions

View File

@@ -44,7 +44,7 @@ export class FileQuickOpenModel extends QuickOpenModel {
}
export class FileEntry extends EditorQuickOpenEntry {
private range: IRange | null;
private range: IRange | null = null;
constructor(
private resource: URI,
@@ -112,7 +112,7 @@ export interface IOpenFileOptions {
}
export class OpenFileHandler extends QuickOpenHandler {
private options: IOpenFileOptions;
private options: IOpenFileOptions | undefined;
private queryBuilder: QueryBuilder;
private cacheState: CacheState;
@@ -277,7 +277,7 @@ export class CacheState {
private query: IFileQuery;
private loadingPhase = LoadingPhase.Created;
private promise: Promise<void>;
private promise: Promise<void> | undefined;
constructor(cacheQuery: (cacheKey: string) => IFileQuery, private doLoad: (query: IFileQuery) => Promise<any>, private doDispose: (cacheKey: string) => Promise<void>, private previous: CacheState | null) {
this.query = cacheQuery(this._cacheKey);

View File

@@ -27,7 +27,7 @@ import { Schemas } from 'vs/base/common/network';
import { IOpenerService } from 'vs/platform/opener/common/opener';
class SymbolEntry extends EditorQuickOpenEntry {
private bearingResolve: Promise<this | undefined>;
private bearingResolve: Promise<this | undefined> | undefined;
constructor(
private bearing: IWorkspaceSymbol,