Skip to content

Commit dd2f731

Browse files
authored
Merge pull request #2284 from lindapaiste/fix/tidy-code
Fix #2278 keyboard shortcut for tidy code shows replace
2 parents 231c01c + 848d1a7 commit dd2f731

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

client/modules/IDE/components/Editor.jsx

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ class Editor extends React.Component {
159159
[`${metaKey}-Enter`]: () => null,
160160
[`Shift-${metaKey}-Enter`]: () => null,
161161
[`${metaKey}-F`]: 'findPersistent',
162+
[`Shift-${metaKey}-F`]: this.tidyCode,
162163
[`${metaKey}-G`]: 'findPersistentNext',
163164
[`Shift-${metaKey}-G`]: 'findPersistentPrev',
164165
[replaceCommand]: 'replace',
@@ -194,16 +195,6 @@ class Editor extends React.Component {
194195
});
195196

196197
this._cm.on('keydown', (_cm, e) => {
197-
if (
198-
((metaKey === 'Cmd' && e.metaKey) ||
199-
(metaKey === 'Ctrl' && e.ctrlKey)) &&
200-
e.shiftKey &&
201-
e.key === 'f'
202-
) {
203-
e.preventDefault();
204-
this.tidyCode();
205-
}
206-
207198
// Show hint
208199
const mode = this._cm.getOption('mode');
209200
if (/^[a-z]$/i.test(e.key) && (mode === 'css' || mode === 'javascript')) {

0 commit comments

Comments
 (0)