strictNullCheck merge conflicts

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

@@ -23,7 +23,7 @@ export interface IBreadcrumbsService {
 
 	register(group: GroupIdentifier, widget: BreadcrumbsWidget): IDisposable;
 
-	getWidget(group: GroupIdentifier): BreadcrumbsWidget;
+	getWidget(group: GroupIdentifier): BreadcrumbsWidget | undefined;
 }
 
 
@@ -43,7 +43,7 @@ export class BreadcrumbsService implements IBreadcrumbsService {
 		};
 	}
 
-	getWidget(group: number): BreadcrumbsWidget {
+	getWidget(group: number): BreadcrumbsWidget | undefined {
 		return this._map.get(group);
 	}
 }

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

@@ -117,7 +117,7 @@ export class EditorBreadcrumbsModel {
 			info.path.unshift(new FileElement(uriPrefix, info.path.length === 0 ? FileKind.FILE : FileKind.FOLDER));
 			let prevPathLength = uriPrefix.path.length;
 			uriPrefix = dirname(uriPrefix);
-			if (uriPrefix.path.length === prevPathLength) {
+			if (!uriPrefix || uriPrefix.path.length === prevPathLength) {
 				break;
 			}
 		}