From a716a500c584b190519f52f9f3d229e6591210b0 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Tue, 4 Jul 2023 09:12:27 +0100
Subject: [PATCH] Merge pull request #13607 from overleaf/ae-formatting-keymaps

[cm6] Use toggleRanges for bold/italic shortcuts in code editor

GitOrigin-RevId: 90f7344876e84b984469ca2daccb7bbe71d89aa9
---
 .../js/features/source-editor/commands/ranges.ts   |  4 +---
 .../extensions/visual/visual-keymap.ts             | 14 --------------
 .../source-editor/languages/latex/shortcuts.ts     |  6 +++---
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/services/web/frontend/js/features/source-editor/commands/ranges.ts b/services/web/frontend/js/features/source-editor/commands/ranges.ts
index c79207a431..04859d2a77 100644
--- a/services/web/frontend/js/features/source-editor/commands/ranges.ts
+++ b/services/web/frontend/js/features/source-editor/commands/ranges.ts
@@ -268,9 +268,7 @@ function moveRange(range: SelectionRange, newFrom: number, newTo: number) {
 
 function validateReplacement(expected: string, actual: string) {
   if (expected !== actual) {
-    throw new Error(
-      `Replacement in toggleRange failed validation. Expected ${expected} got ${actual}`
-    )
+    throw new Error('Replacement in toggleRange failed validation.')
   }
 }
 
diff --git a/services/web/frontend/js/features/source-editor/extensions/visual/visual-keymap.ts b/services/web/frontend/js/features/source-editor/extensions/visual/visual-keymap.ts
index 33c1991dc5..bb50131107 100644
--- a/services/web/frontend/js/features/source-editor/extensions/visual/visual-keymap.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/visual/visual-keymap.ts
@@ -1,7 +1,6 @@
 import { keymap } from '@codemirror/view'
 import { EditorSelection, Prec } from '@codemirror/state'
 import { ancestorNodeOfType } from '../../utils/tree-query'
-import { toggleRanges } from '../../commands/ranges'
 import {
   getIndentation,
   IndentContext,
@@ -128,18 +127,5 @@ export const visualKeymap = Prec.highest(
       preventDefault: true,
       run: indentDecrease,
     },
-    // Override bolding in RT mode
-    {
-      key: 'Ctrl-b',
-      mac: 'Mod-b',
-      preventDefault: true,
-      run: toggleRanges('\\textbf'),
-    },
-    {
-      key: 'Ctrl-i',
-      mac: 'Mod-i',
-      preventDefault: true,
-      run: toggleRanges('\\textit'),
-    },
   ])
 )
diff --git a/services/web/frontend/js/features/source-editor/languages/latex/shortcuts.ts b/services/web/frontend/js/features/source-editor/languages/latex/shortcuts.ts
index 61c5649680..00859605d5 100644
--- a/services/web/frontend/js/features/source-editor/languages/latex/shortcuts.ts
+++ b/services/web/frontend/js/features/source-editor/languages/latex/shortcuts.ts
@@ -1,6 +1,6 @@
 import { Prec } from '@codemirror/state'
 import { keymap } from '@codemirror/view'
-import { wrapRanges } from '../../commands/ranges'
+import { toggleRanges } from '../../commands/ranges'
 
 export const shortcuts = () => {
   return Prec.high(
@@ -9,13 +9,13 @@ export const shortcuts = () => {
         key: 'Ctrl-b',
         mac: 'Mod-b',
         preventDefault: true,
-        run: wrapRanges('\\textbf{', '}'),
+        run: toggleRanges('\\textbf'),
       },
       {
         key: 'Ctrl-i',
         mac: 'Mod-i',
         preventDefault: true,
-        run: wrapRanges('\\textit{', '}'),
+        run: toggleRanges('\\textit'),
       },
     ])
   )