VSCode merge (#4610)

* Merge from vscode e388c734f30757875976c7e326d6cfeee77710de

* fix yarn lcoks

* remove small issue
This commit is contained in:
Anthony Dresser
2019-03-20 10:39:09 -07:00
committed by GitHub
parent 87765e8673
commit c814b92557
310 changed files with 6606 additions and 2129 deletions

View File

@@ -417,7 +417,7 @@ export interface ISearchEngine<T> {
export interface ISerializedSearchSuccess {
type: 'success';
limitHit: boolean;
stats: IFileSearchStats | ITextSearchStats | null;
stats?: IFileSearchStats | ITextSearchStats;
}
export interface ISearchEngineSuccess {
@@ -454,7 +454,7 @@ export function isSerializedFileMatch(arg: ISerializedSearchProgressItem): arg i
}
export interface ISerializedFileMatch {
path?: string;
path: string;
results?: ITextSearchResult[];
numMatches?: number;
}