From edaa1a848c0bd4e033235203dba24a53c1bd0a99 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Fri, 19 May 2017 17:07:28 +0200
Subject: [PATCH] Fixes #26517

---
 src/vs/workbench/parts/extensions/browser/extensionEditor.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
index f6ff2ad5dd9..11915ba81c4 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
@@ -688,6 +688,10 @@ export class ExtensionEditor extends BaseEditor {
 		}
 
 		const keyBinding = KeybindingIO.readKeybinding(key || rawKeyBinding.key, OS);
+		if (!keyBinding) {
+			return null;
+		}
+
 		return this.keybindingService.resolveKeybinding(keyBinding)[0];
 	}
 
-- 
GitLab