From d6e7cd3a8ece160aded73fa1993a94a5102fa3e0 Mon Sep 17 00:00:00 2001
From: Nick Hogle <info@nickhogle.com>
Date: Wed, 11 Oct 2023 16:19:45 -0700
Subject: [PATCH] Fix issue 546: Tab key not working in JS editor when using
CodeMirror
- The check for the Emmet option was short-circuiting the logic for
inserting a Tab. Note that the emmet option is only enabled on HTML and
CSS editors, (and not the JS editor), which is why the `Tab` key works in
those editors, but not the JS editor.
---
src/components/CodeEditor.jsx | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/components/CodeEditor.jsx b/src/components/CodeEditor.jsx
index 1e74c67..d496246 100644
--- a/src/components/CodeEditor.jsx
+++ b/src/components/CodeEditor.jsx
@@ -344,18 +344,18 @@ export default class CodeEditor extends Component {
if (didEmmetWork === true) {
return;
}
- const input = $('[data-setting=indentWith]:checked');
- if (
- !editor.somethingSelected() &&
- (!prefs.indentWith || prefs.indentWith === 'spaces')
- ) {
- // softtabs adds spaces. This is required because by default tab key will put tab, but we want
- // to indent with spaces if `spaces` is preferred mode of indentation.
- // `somethingSelected` needs to be checked otherwise, all selected code is replaced with softtab.
- CodeMirror.commands.insertSoftTab(editor);
- } else {
- CodeMirror.commands.defaultTab(editor);
- }
+ }
+ const input = $('[data-setting=indentWith]:checked');
+ if (
+ !editor.somethingSelected() &&
+ (!prefs.indentWith || prefs.indentWith === 'spaces')
+ ) {
+ // softtabs adds spaces. This is required because by default tab key will put tab, but we want
+ // to indent with spaces if `spaces` is preferred mode of indentation.
+ // `somethingSelected` needs to be checked otherwise, all selected code is replaced with softtab.
+ CodeMirror.commands.insertSoftTab(editor);
+ } else {
+ CodeMirror.commands.defaultTab(editor);
}
},
Enter: 'emmetInsertLineBreak'