From 44eb6c05c7fe98012cbdb5eace91eacec7c56cd6 Mon Sep 17 00:00:00 2001 From: Andrew Casey Date: Wed, 1 Apr 2020 12:27:57 -0400 Subject: [PATCH] Null-check call result rather than function itself MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the comment, it seems like this was supposed check for chords, rather than checking for the availability of `isChord`. Co-authored-by: Paul Maréchal Signed-off-by: Andrew Casey --- examples/api-tests/src/monaco-api.spec.js | 3 +-- packages/monaco/src/browser/monaco-resolved-keybinding.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/api-tests/src/monaco-api.spec.js b/examples/api-tests/src/monaco-api.spec.js index 6f9c71a2fc557..c2806a4d23a80 100644 --- a/examples/api-tests/src/monaco-api.spec.js +++ b/examples/api-tests/src/monaco-api.spec.js @@ -66,8 +66,7 @@ describe('Monaco API', async function () { }, { label: 'Ctrl+Shift+Alt+K', ariaLabel: 'Ctrl+Shift+Alt+K', - // eslint-disable-next-line no-null/no-null - electronAccelerator: null, + electronAccelerator: 'Ctrl+Shift+Alt+K', userSettingsLabel: 'ctrl+shift+alt+K', WYSIWYG: true, chord: false, diff --git a/packages/monaco/src/browser/monaco-resolved-keybinding.ts b/packages/monaco/src/browser/monaco-resolved-keybinding.ts index e7eb37f656816..a5124cf748cef 100644 --- a/packages/monaco/src/browser/monaco-resolved-keybinding.ts +++ b/packages/monaco/src/browser/monaco-resolved-keybinding.ts @@ -49,7 +49,7 @@ export class MonacoResolvedKeybinding extends monaco.keybindings.ResolvedKeybind } public getElectronAccelerator(): string | null { - if (this.isChord) { + if (this.isChord()) { // Electron cannot handle chords // eslint-disable-next-line no-null/no-null return null;