fix #44636

src/vs/workbench/browser/actions/workspaceCommands.ts

@@ -150,7 +150,9 @@ CommandsRegistry.registerCommand({
 				}
 
 				// Add and show Files Explorer viewlet
-				return workspaceEditingService.addFolders(folders.map(folder => ({ uri: URI.file(folder) }))).then(() => viewletService.openViewlet(viewletService.getDefaultViewletId(), true));
+				return workspaceEditingService.addFolders(folders.map(folder => ({ uri: URI.file(folder) })))
+					.then(() => viewletService.openViewlet(viewletService.getDefaultViewletId(), true))
+					.then(() => void 0);
 			});
 	}
 });

src/vs/workbench/browser/parts/editor/editorCommands.ts

@@ -235,7 +235,7 @@ function registerOpenEditorAtIndexCommands(): void {
 					const editor = group.getEditor(editorIndex);
 
 					if (editor) {
-						return editorService.openEditor(editor);
+						return editorService.openEditor(editor).then(() => void 0);
 					}
 				}
 

src/vs/workbench/parts/files/electron-browser/fileCommands.ts

@@ -323,7 +323,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 			const name = paths.basename(resource.fsPath);
 			const editorLabel = nls.localize('modifiedLabel', "{0} (on disk) ↔ {1}", name, name);
 
-			return editorService.openEditor({ leftResource: URI.from({ scheme: COMPARE_WITH_SAVED_SCHEMA, path: resource.fsPath }), rightResource: resource, label: editorLabel });
+			return editorService.openEditor({ leftResource: URI.from({ scheme: COMPARE_WITH_SAVED_SCHEMA, path: resource.fsPath }), rightResource: resource, label: editorLabel }).then(() => void 0);
 		}
 
 		return TPromise.as(true);
@@ -374,6 +374,7 @@ CommandsRegistry.registerCommand({
 		const editorService = accessor.get(IWorkbenchEditorService);
 		const listService = accessor.get(IListService);
 		const tree = listService.lastFocusedList;
+
 		// Remove highlight
 		if (tree instanceof Tree) {
 			tree.clearHighlight();
@@ -382,7 +383,7 @@ CommandsRegistry.registerCommand({
 		return editorService.openEditor({
 			leftResource: globalResourceToCompare,
 			rightResource: getResourceForCommand(resource, listService, editorService)
-		});
+		}).then(() => void 0);
 	}
 });