explorer: raw file events should refersh the whole tree

fixes #68627
microsoft · Feb 27, 2019 · 3ab8447 · 3ab8447
1 parent 5360e03
commit 3ab8447
Showing 1 changed file with 53 additions and 52 deletions.
diff --git a/src/vs/workbench/contrib/files/common/explorerService.ts b/src/vs/workbench/contrib/files/common/explorerService.ts
@@ -266,72 +266,73 @@ export class ExplorerService implements IExplorerService {
 		// be fired first over the other or not at all.
 		setTimeout(() => {
 			// Filter to the ones we care
-			e = this.filterToViewRelevantEvents(e);
-			const changedItems: ExplorerItem[] = [];
-
-			// Handle added files/folders
-			const added = e.getAdded();
-			if (added.length) {
-
-				// Check added: Refresh if added file/folder is not part of resolved root and parent is part of it
-				const ignoredPaths: { [resource: string]: boolean } = <{ [resource: string]: boolean }>{};
-				for (let i = 0; i < added.length; i++) {
-					const change = added[i];
-
-					// Find parent
-					const parent = dirname(change.resource);
-
-					// Continue if parent was already determined as to be ignored
-					if (ignoredPaths[parent.toString()]) {
-						continue;
-					}
+			const shouldRefresh = () => {
+				e = this.filterToViewRelevantEvents(e);
+				// Handle added files/folders
+				const added = e.getAdded();
+				if (added.length) {
+
+					// Check added: Refresh if added file/folder is not part of resolved root and parent is part of it
+					const ignoredPaths: { [resource: string]: boolean } = <{ [resource: string]: boolean }>{};
+					for (let i = 0; i < added.length; i++) {
+						const change = added[i];
+
+						// Find parent
+						const parent = dirname(change.resource);
+
+						// Continue if parent was already determined as to be ignored
+						if (ignoredPaths[parent.toString()]) {
+							continue;
+						}
 
-					// Compute if parent is visible and added file not yet part of it
-					const parentStat = this.model.findClosest(parent);
-					if (parentStat && parentStat.isDirectoryResolved && !this.model.findClosest(change.resource)) {
-						changedItems.push(parentStat);
-					}
+						// Compute if parent is visible and added file not yet part of it
+						const parentStat = this.model.findClosest(parent);
+						if (parentStat && parentStat.isDirectoryResolved && !this.model.findClosest(change.resource)) {
+							return true;
+						}
 
-					// Keep track of path that can be ignored for faster lookup
-					if (!parentStat || !parentStat.isDirectoryResolved) {
-						ignoredPaths[parent.toString()] = true;
+						// Keep track of path that can be ignored for faster lookup
+						if (!parentStat || !parentStat.isDirectoryResolved) {
+							ignoredPaths[parent.toString()] = true;
+						}
 					}
 				}
-			}
 
-			// Handle deleted files/folders
-			const deleted = e.getDeleted();
-			if (deleted.length) {
+				// Handle deleted files/folders
+				const deleted = e.getDeleted();
+				if (deleted.length) {
 
-				// Check deleted: Refresh if deleted file/folder part of resolved root
-				for (let j = 0; j < deleted.length; j++) {
-					const del = deleted[j];
-					const item = this.model.findClosest(del.resource);
-					if (item && item.parent) {
-						changedItems.push(item.parent);
+					// Check deleted: Refresh if deleted file/folder part of resolved root
+					for (let j = 0; j < deleted.length; j++) {
+						const del = deleted[j];
+						const item = this.model.findClosest(del.resource);
+						if (item && item.parent) {
+							return true;
+						}
 					}
 				}
-			}
 
-			// Handle updated files/folders if we sort by modified
-			if (this._sortOrder === SortOrderConfiguration.MODIFIED) {
-				const updated = e.getUpdated();
+				// Handle updated files/folders if we sort by modified
+				if (this._sortOrder === SortOrderConfiguration.MODIFIED) {
+					const updated = e.getUpdated();
 
-				// Check updated: Refresh if updated file/folder part of resolved root
-				for (let j = 0; j < updated.length; j++) {
-					const upd = updated[j];
-					const item = this.model.findClosest(upd.resource);
+					// Check updated: Refresh if updated file/folder part of resolved root
+					for (let j = 0; j < updated.length; j++) {
+						const upd = updated[j];
+						const item = this.model.findClosest(upd.resource);
 
-					if (item && item.parent) {
-						changedItems.push(item.parent);
+						if (item && item.parent) {
+							return true;
+						}
 					}
 				}
-			}
 
-			changedItems.forEach(item => {
-				item.forgetChildren();
-				this._onDidChangeItem.fire(item);
-			});
+				return false;
+			};
+
+			if (shouldRefresh()) {
+				this._onDidChangeItem.fire(undefined);
+			}
 		}, ExplorerService.EXPLORER_FILE_CHANGES_REACT_DELAY);
 	}