Skip to content

Commit 291d438

Browse files
committed
fix errors from merge conflict resolution
1 parent fd27d23 commit 291d438

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

client/modules/IDE/components/Editor/stateUtils.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,9 @@ function openColorPickerWithKeyboard(view) {
265265
} else {
266266
picker.click();
267267
}
268+
return true;
269+
}
270+
268271
function focusOnReferenceArrow(view) {
269272
if (completionStatus(view.state) !== 'active') return false;
270273

@@ -424,13 +427,14 @@ export function createNewFileState(filename, document, settings) {
424427
// Keep this binding local to each file state so modes don't accumulate
425428
// across files via a shared module-level array.
426429
const mode = getFileMode(filename);
427-
428-
let colorPickerKeymap = [];
430+
431+
const colorPickerKeymap = [];
429432
if (mode === 'css' || mode === 'javascript') {
430433
colorPickerKeymap.push({
431-
key: 'Mod-k',
432-
run: (view) => openColorPickerWithKeyboard(view)
433-
});
434+
key: 'Mod-k',
435+
run: (view) => openColorPickerWithKeyboard(view)
436+
});
437+
}
434438

435439
// Make a keymap for both uppercase and lowercase F, since
436440
// since browsers can differ in which one they send for the Shift-Mod-F shortcut.

0 commit comments

Comments
 (0)