Strict null work on explorer and files

mjbvz · mjbvz · commit e97cf685aeba · 2019-03-11T17:13:56.000-07:00
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.ts b/src/vs/workbench/contrib/files/browser/fileActions.ts
@@ -513,7 +513,8 @@ class PasteFileAction extends BaseErrorReportingAction {
 					this.explorerService.setToCopy([], false);
 				}
 				if (!stat.isDirectory) {
-					return this.editorService.openEditor({ resource: stat.resource, options: { pinned: true, preserveFocus: true } });
+					return this.editorService.openEditor({ resource: stat.resource, options: { pinned: true, preserveFocus: true } })
+						.then(types.withNullAsUndefined);
 				}
 
 				return undefined;
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -49,6 +49,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
 import { isMacintosh } from 'vs/base/common/platform';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { withNullAsUndefined } from 'vs/base/common/types';
 
 export class ExplorerView extends ViewletPanel {
 	static readonly ID: string = 'workbench.explorer.fileView';
@@ -258,7 +259,7 @@ export class ExplorerView extends ViewletPanel {
 					// No action needed, active file is already focused
 					return;
 				}
-				this.explorerService.select(this.getActiveFile(), reveal);
+				this.explorerService.select(activeFile, reveal);
 			} else if (deselect) {
 				this.tree.setSelection([]);
 				this.tree.setFocus([]);
@@ -408,7 +409,7 @@ export class ExplorerView extends ViewletPanel {
 	private onFocusChanged(elements: ExplorerItem[]): void {
 		const stat = elements && elements.length ? elements[0] : undefined;
 		const isSingleFolder = this.contextService.getWorkbenchState() === WorkbenchState.FOLDER;
-		const resource = stat ? stat.resource : isSingleFolder ? this.contextService.getWorkspace().folders[0].uri : undefined;
+		const resource = stat ? stat.resource : isSingleFolder ? this.contextService.getWorkspace().folders[0].uri : null;
 		this.resourceContext.set(resource);
 		this.folderContext.set((isSingleFolder && !stat) || !!stat && stat.isDirectory);
 		this.readonlyContext.set(!!stat && stat.isReadonly);
@@ -504,7 +505,7 @@ export class ExplorerView extends ViewletPanel {
 		}
 
 		// check for files
-		return toResource(input, { supportSideBySide: true });
+		return withNullAsUndefined(toResource(input, { supportSideBySide: true }));
 	}
 
 	private onSelectItem(fileStat: ExplorerItem, reveal = this.autoReveal): Promise<void> {
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
@@ -638,9 +638,11 @@ export class FileDragAndDrop implements ITreeDragAndDrop<ExplorerItem> {
 
 				// Check for name collisions
 				const targetNames = new Set<string>();
-				targetStat.children.forEach((child) => {
-					targetNames.add(isLinux ? child.name : child.name.toLowerCase());
-				});
+				if (targetStat.children) {
+					targetStat.children.forEach((child) => {
+						targetNames.add(isLinux ? child.name : child.name.toLowerCase());
+					});
+				}
 
 				let overwritePromise: Promise<IConfirmationResult> = Promise.resolve({ confirmed: true });
 				if (resources.some(resource => {

Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,8 @@ class PasteFileAction extends BaseErrorReportingAction {`
`513`	`513`	`this.explorerService.setToCopy([], false);`
`514`	`514`	`}`
`515`	`515`	`if (!stat.isDirectory) {`
`516`		`- return this.editorService.openEditor({ resource: stat.resource, options: { pinned: true, preserveFocus: true } });`
	`516`	`+ return this.editorService.openEditor({ resource: stat.resource, options: { pinned: true, preserveFocus: true } })`
	`517`	`+ .then(types.withNullAsUndefined);`
`517`	`518`	`}`
`518`	`519`
`519`	`520`	`return undefined;`