From 14cf51638c904501513778d53440417ce5d16332 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 21 Apr 2022 15:28:15 -0700
Subject: [PATCH] :art: Tweak order of default key bindings

---
 assets/keymaps/default.json | 43 ++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json
index 6eaff19f89..43c1f84e2a 100644
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@@ -174,7 +174,6 @@
             "cmd-/": "editor::ToggleComments",
             "alt-up": "editor::SelectLargerSyntaxNode",
             "alt-down": "editor::SelectSmallerSyntaxNode",
-            "ctrl-shift-W": "editor::SelectSmallerSyntaxNode",
             "cmd-u": "editor::UndoSelection",
             "cmd-shift-U": "editor::RedoSelection",
             "f8": "editor::GoToNextDiagnostic",
@@ -265,6 +264,26 @@
             ]
         }
     },
+    // Bindings that should be unified with bindings for more general actions
+    {
+        "context": "Editor && renaming",
+        "bindings": {
+            "enter": "editor::ConfirmRename"
+        }
+    },
+    {
+        "context": "Editor && showing_completions",
+        "bindings": {
+            "enter": "editor::ConfirmCompletion",
+            "tab": "editor::ConfirmCompletion"
+        }
+    },
+    {
+        "context": "Editor && showing_code_actions",
+        "bindings": {
+            "enter": "editor::ConfirmCodeAction"
+        }
+    },
     // Custom bindings
     {
         "bindings": {
@@ -277,6 +296,7 @@
         "context": "Editor",
         "bindings": {
             "ctrl-w": "editor::SelectLargerSyntaxNode",
+            "ctrl-shift-W": "editor::SelectSmallerSyntaxNode",
             "alt-cmd-f": "editor::FoldSelectedRanges",
             "alt-enter": "editor::OpenExcerpts",
             "cmd-f10": "editor::RestartLanguageServer"
@@ -315,26 +335,5 @@
             "left": "project_panel::CollapseSelectedEntry",
             "right": "project_panel::ExpandSelectedEntry"
         }
-    },
-    // Bindings that should be unified with other bindings
-    // for more general actions
-    {
-        "context": "Editor && renaming",
-        "bindings": {
-            "enter": "editor::ConfirmRename"
-        }
-    },
-    {
-        "context": "Editor && showing_completions",
-        "bindings": {
-            "enter": "editor::ConfirmCompletion",
-            "tab": "editor::ConfirmCompletion"
-        }
-    },
-    {
-        "context": "Editor && showing_code_actions",
-        "bindings": {
-            "enter": "editor::ConfirmCodeAction"
-        }
     }
 ]
\ No newline at end of file