Avoid NPE

alexdima · alexdima · commit 34005e2a482e · 2020-08-03T20:24:40.000+02:00
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
@@ -208,8 +208,8 @@ const marketplaceWebExtensions = [
     'ms-vscode.references-view'
 ];
 const productJson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
-const builtInExtensions = productJson.builtInExtensions;
-const webBuiltInExtensions = productJson.webBuiltInExtensions;
+const builtInExtensions = productJson.builtInExtensions || [];
+const webBuiltInExtensions = productJson.webBuiltInExtensions || [];
 /**
  * Loosely based on `getExtensionKind` from `src/vs/workbench/services/extensions/common/extensionsUtil.ts`
  */
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
@@ -251,8 +251,8 @@ interface IBuiltInExtension {
 }
 
 const productJson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
-const builtInExtensions: IBuiltInExtension[] = productJson.builtInExtensions;
-const webBuiltInExtensions: IBuiltInExtension[] = productJson.webBuiltInExtensions;
+const builtInExtensions: IBuiltInExtension[] = productJson.builtInExtensions || [];
+const webBuiltInExtensions: IBuiltInExtension[] = productJson.webBuiltInExtensions || [];
 
 type ExtensionKind = 'ui' | 'workspace' | 'web';
 interface IExtensionManifest {

Original file line number	Diff line number	Diff line change
`@@ -251,8 +251,8 @@ interface IBuiltInExtension {`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`const productJson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));`
`254`		`-const builtInExtensions: IBuiltInExtension[] = productJson.builtInExtensions;`
`255`		`-const webBuiltInExtensions: IBuiltInExtension[] = productJson.webBuiltInExtensions;`
	`254`	`+const builtInExtensions: IBuiltInExtension[] = productJson.builtInExtensions \|\| [];`
	`255`	`+const webBuiltInExtensions: IBuiltInExtension[] = productJson.webBuiltInExtensions \|\| [];`
`256`	`256`
`257`	`257`	`type ExtensionKind = 'ui' \| 'workspace' \| 'web';`
`258`	`258`	`interface IExtensionManifest {`