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

@@ -46,7 +46,7 @@ class BaseTreeItem {
private _showedMoreThanOne: boolean;
private _children = new Map<string, BaseTreeItem>();
private _source: Source;
private _source: Source | undefined;
constructor(private _parent: BaseTreeItem | undefined, private _label: string) {
this._showedMoreThanOne = false;
@@ -184,7 +184,7 @@ class BaseTreeItem {
}
// skips intermediate single-child nodes
getSource(): Source {
getSource(): Source | undefined {
const child = this.oneChild();
if (child) {
return child.getSource();
@@ -381,13 +381,13 @@ class SessionTreeItem extends BaseTreeItem {
export class LoadedScriptsView extends ViewletPanel {
private treeContainer: HTMLElement;
private treeContainer!: HTMLElement;
private loadedScriptsItemType: IContextKey<string>;
private tree: WorkbenchAsyncDataTree<LoadedScriptsItem, LoadedScriptsItem, FuzzyScore>;
private treeLabels: ResourceLabels;
private changeScheduler: RunOnceScheduler;
private treeNeedsRefreshOnVisible: boolean;
private filter: LoadedScriptsFilter;
private tree!: WorkbenchAsyncDataTree<LoadedScriptsItem, LoadedScriptsItem, FuzzyScore>;
private treeLabels!: ResourceLabels;
private changeScheduler!: RunOnceScheduler;
private treeNeedsRefreshOnVisible = false;
private filter!: LoadedScriptsFilter;
constructor(
options: IViewletViewOptions,
@@ -635,7 +635,7 @@ class LoadedSciptsAccessibilityProvider implements IAccessibilityProvider<Loaded
class LoadedScriptsFilter implements ITreeFilter<BaseTreeItem, FuzzyScore> {
private filterText: string;
private filterText: string | undefined;
setFilter(filterText: string) {
this.filterText = filterText;