npe in scm world

fixes #37221
microsoft · Nov 1, 2017 · cadcedc · cadcedc
1 parent 93338c6
commit cadcedc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSCM.ts b/src/vs/workbench/api/electron-browser/mainThreadSCM.ts
@@ -191,10 +191,9 @@ class MainThreadSCMProvider implements ISCMProvider {
 						tooltip,
 						strikeThrough,
 						faded,
-
 						source,
 						letter,
-						color: color.id
+						color: color && color.id
 					};
 
 					return new MainThreadSCMResource(

diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -377,9 +377,9 @@ export type SCMRawResource = [
 	boolean /*strike through*/,
 	boolean /*faded*/,
 
-	string /*source*/,
-	string /*letter*/,
-	ThemeColor /*color*/
+	string | undefined /*source*/,
+	string | undefined /*letter*/,
+	ThemeColor | null /*color*/
 ];
 
 export type SCMRawResourceSplice = [

diff --git a/src/vs/workbench/api/node/extHostSCM.ts b/src/vs/workbench/api/node/extHostSCM.ts
@@ -244,9 +244,9 @@ class ExtHostSourceControlResourceGroup implements vscode.SourceControlResourceG
 					const strikeThrough = r.decorations && !!r.decorations.strikeThrough;
 					const faded = r.decorations && !!r.decorations.faded;
 
-					const source = r.decorations && r.decorations.source;
-					const letter = r.decorations && r.decorations.letter;
-					const color = r.decorations && r.decorations.color;
+					const source = r.decorations && r.decorations.source || undefined;
+					const letter = r.decorations && r.decorations.letter || undefined;
+					const color = r.decorations && r.decorations.color || undefined;
 
 					return [handle, sourceUri, icons, tooltip, strikeThrough, faded, source, letter, color] as SCMRawResource;
 				});