add logging (microsoft#163882)

Author: sandy081

src/vs/workbench/browser/layout.ts

@@ -480,6 +480,9 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 		// Layout Initialization State
 		const initialEditorsState = this.getInitialEditorsState();
+		if (initialEditorsState) {
+			this.logService.info('Initial editor state', initialEditorsState);
+		}
 		const initialLayoutState: ILayoutInitializationState = {
 			layout: {
 				editors: initialEditorsState?.layout
@@ -598,7 +601,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		if (initialEditorsState) {
 
 			// Merge editor (single)
-			const filesToMerge = coalesce(await pathsToEditors(initialEditorsState.filesToMerge, fileService));
+			const filesToMerge = coalesce(await pathsToEditors(initialEditorsState.filesToMerge, fileService, this.logService));
 			if (filesToMerge.length === 4 && isResourceEditorInput(filesToMerge[0]) && isResourceEditorInput(filesToMerge[1]) && isResourceEditorInput(filesToMerge[2]) && isResourceEditorInput(filesToMerge[3])) {
 				return [{
 					editor: {
@@ -612,7 +615,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			}
 
 			// Diff editor (single)
-			const filesToDiff = coalesce(await pathsToEditors(initialEditorsState.filesToDiff, fileService));
+			const filesToDiff = coalesce(await pathsToEditors(initialEditorsState.filesToDiff, fileService, this.logService));
 			if (filesToDiff.length === 2) {
 				return [{
 					editor: {
@@ -625,7 +628,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 			// Normal editor (multiple)
 			const filesToOpenOrCreate: IEditorToOpen[] = [];
-			const resolvedFilesToOpenOrCreate = await pathsToEditors(initialEditorsState.filesToOpenOrCreate, fileService);
+			const resolvedFilesToOpenOrCreate = await pathsToEditors(initialEditorsState.filesToOpenOrCreate, fileService, this.logService);
 			for (let i = 0; i < resolvedFilesToOpenOrCreate.length; i++) {
 				const resolvedFileToOpenOrCreate = resolvedFilesToOpenOrCreate[i];
 				if (resolvedFileToOpenOrCreate) {
@@ -767,7 +770,11 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 				}
 
 				openEditorsPromise = Promise.all(Array.from(mapEditorsToGroup).map(async ([groupId, editors]) => {
-					return this.editorService.openEditors(Array.from(editors), groupId, { validateTrust: true });
+					try {
+						await this.editorService.openEditors(Array.from(editors), groupId, { validateTrust: true });
+					} catch (error) {
+						this.logService.error(error);
+					}
 				}));
 			}
 

src/vs/workbench/common/editor.ts

@@ -22,6 +22,7 @@ import { IPathData } from 'vs/platform/window/common/window';
 import { IExtUri } from 'vs/base/common/resources';
 import { Schemas } from 'vs/base/common/network';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { ILogService } from 'vs/platform/log/common/log';
 
 // Static values for editor contributions
 export const EditorExtensions = {
@@ -1381,19 +1382,21 @@ class EditorFactoryRegistry implements IEditorFactoryRegistry {
 
 Registry.add(EditorExtensions.EditorFactory, new EditorFactoryRegistry());
 
-export async function pathsToEditors(paths: IPathData[] | undefined, fileService: IFileService): Promise<ReadonlyArray<IResourceEditorInput | IUntitledTextResourceEditorInput | undefined>> {
+export async function pathsToEditors(paths: IPathData[] | undefined, fileService: IFileService, logService: ILogService): Promise<ReadonlyArray<IResourceEditorInput | IUntitledTextResourceEditorInput | undefined>> {
 	if (!paths || !paths.length) {
 		return [];
 	}
 
 	return await Promise.all(paths.map(async path => {
 		const resource = URI.revive(path.fileUri);
 		if (!resource) {
+			logService.info('Cannot resolve the path because it is not valid.', path);
 			return undefined;
 		}
 
 		const canHandleResource = await fileService.canHandleResource(resource);
 		if (!canHandleResource) {
+			logService.info('Cannot resolve the path because it cannot be handled', path);
 			return undefined;
 		}
 
@@ -1403,16 +1406,19 @@ export async function pathsToEditors(paths: IPathData[] | undefined, fileService
 			try {
 				type = (await fileService.stat(resource)).isDirectory ? FileType.Directory : FileType.Unknown;
 				exists = true;
-			} catch {
+			} catch (error) {
+				logService.error(error);
 				exists = false;
 			}
 		}
 
 		if (!exists && path.openOnlyIfExists) {
+			logService.info('Cannot resolve the path because it does not exist', path);
 			return undefined;
 		}
 
 		if (type === FileType.Directory) {
+			logService.info('Cannot resolve the path because it is a directory', path);
 			return undefined;
 		}
 

src/vs/workbench/electron-sandbox/window.ts

@@ -895,7 +895,7 @@ export class NativeWindow extends Disposable {
 		const diffMode = !!(request.filesToDiff && (request.filesToDiff.length === 2));
 		const mergeMode = !!(request.filesToMerge && (request.filesToMerge.length === 4));
 
-		const inputs = coalesce(await pathsToEditors(mergeMode ? request.filesToMerge : diffMode ? request.filesToDiff : request.filesToOpenOrCreate, this.fileService));
+		const inputs = coalesce(await pathsToEditors(mergeMode ? request.filesToMerge : diffMode ? request.filesToDiff : request.filesToOpenOrCreate, this.fileService, this.logService));
 		if (inputs.length) {
 			const openedEditorPanes = await this.openResources(inputs, diffMode, mergeMode);
 

src/vs/workbench/services/host/browser/browserHostService.ts

@@ -259,7 +259,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 
 				// Support mergeMode
 				if (options?.mergeMode && fileOpenables.length === 4) {
-					const editors = coalesce(await pathsToEditors(fileOpenables, this.fileService));
+					const editors = coalesce(await pathsToEditors(fileOpenables, this.fileService, this.logService));
 					if (editors.length !== 4 || !isResourceEditorInput(editors[0]) || !isResourceEditorInput(editors[1]) || !isResourceEditorInput(editors[2]) || !isResourceEditorInput(editors[3])) {
 						return; // invalid resources
 					}
@@ -289,7 +289,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 
 				// Support diffMode
 				if (options?.diffMode && fileOpenables.length === 2) {
-					const editors = coalesce(await pathsToEditors(fileOpenables, this.fileService));
+					const editors = coalesce(await pathsToEditors(fileOpenables, this.fileService, this.logService));
 					if (editors.length !== 2 || !isResourceEditorInput(editors[0]) || !isResourceEditorInput(editors[1])) {
 						return; // invalid resources
 					}
@@ -334,7 +334,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 								openables = [openable];
 							}
 
-							editorService.openEditors(coalesce(await pathsToEditors(openables, this.fileService)), undefined, { validateTrust: true });
+							editorService.openEditors(coalesce(await pathsToEditors(openables, this.fileService, this.logService)), undefined, { validateTrust: true });
 						}
 
 						// New Window: open into empty window