Reformat and move some mapping to global location.

Carreau · Carreau · commit 3e2655952703 · 2023-01-17T09:36:11.000+01:00
diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
@@ -165,6 +165,7 @@ def preceding_text(pattern: Union[str, Callable]):
             return _preceding_text_cache[pattern]
 
         if callable(pattern):
+
             def _preceding_text():
                 app = get_app()
                 before_cursor = app.current_buffer.document.current_line_before_cursor
@@ -215,12 +216,18 @@ def not_inside_unclosed_string():
         return not ('"' in s or "'" in s)
 
     # auto match
-    auto_match_parens = {"(": match.parenthesis, "[": match.brackets, "{": match.braces}
-    for key, cmd in auto_match_parens.items():
+    for key, cmd in match.auto_match_parens.items():
         kb.add(key, filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))(
             cmd
         )
 
+    # raw string
+    for key, cmd in match.auto_match_parens_raw_string.items():
+        kb.add(
+            key,
+            filter=focused_insert & auto_match & preceding_text(r".*(r|R)[\"'](-*)$"),
+        )(cmd)
+
     kb.add(
         '"',
         filter=focused_insert
@@ -255,18 +262,6 @@ def not_inside_unclosed_string():
         & preceding_text(r"^.*''$"),
     )(match.docstring_single_quotes)
 
-    # raw string
-    auto_match_parens_raw_string = {
-        "(": match.raw_string_parenthesis,
-        "[": match.raw_string_bracket,
-        "{": match.raw_string_braces,
-    }
-    for key, cmd in auto_match_parens_raw_string.items():
-        kb.add(
-            key,
-            filter=focused_insert & auto_match & preceding_text(r".*(r|R)[\"'](-*)$"),
-        )(cmd)
-
     # just move cursor
     kb.add(")", filter=focused_insert & auto_match & following_text(r"^\)"))(
         match.skip_over
diff --git a/IPython/terminal/shortcuts/auto_match.py b/IPython/terminal/shortcuts/auto_match.py
@@ -94,3 +94,11 @@ def delete_pair(event: KeyPressEvent):
     """Delete auto-closed parenthesis"""
     event.current_buffer.delete()
     event.current_buffer.delete_before_cursor()
+
+
+auto_match_parens = {"(": parenthesis, "[": brackets, "{": braces}
+auto_match_parens_raw_string = {
+    "(": raw_string_parenthesis,
+    "[": raw_string_bracket,
+    "{": raw_string_braces,
+}
