From fdc1de6be04dfd19624bca508f47cb4b239b8ece Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Thu, 3 Jan 2013 15:20:24 -0700
Subject: [PATCH] Ensure snippets keymaps cascade correctly by breaking into 2
 files

---
 src/packages/snippets/keymaps/snippets-1.cson | 2 ++
 src/packages/snippets/keymaps/snippets-2.cson | 6 ++++++
 src/packages/snippets/keymaps/snippets.cson   | 6 ------
 3 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 src/packages/snippets/keymaps/snippets-1.cson
 create mode 100644 src/packages/snippets/keymaps/snippets-2.cson
 delete mode 100644 src/packages/snippets/keymaps/snippets.cson

diff --git a/src/packages/snippets/keymaps/snippets-1.cson b/src/packages/snippets/keymaps/snippets-1.cson
new file mode 100644
index 000000000..c8bf63c51
--- /dev/null
+++ b/src/packages/snippets/keymaps/snippets-1.cson
@@ -0,0 +1,2 @@
+window.keymap.bindKeys '.editor'
+  'tab': 'snippets:expand'
diff --git a/src/packages/snippets/keymaps/snippets-2.cson b/src/packages/snippets/keymaps/snippets-2.cson
new file mode 100644
index 000000000..6b660c6fd
--- /dev/null
+++ b/src/packages/snippets/keymaps/snippets-2.cson
@@ -0,0 +1,6 @@
+# it's critical that these bindings be loaded after those snippets-1 so they
+# are later in the cascade, hence breaking the keymap into 2 files
+
+window.keymap.bindKeys '.editor'
+  'tab': 'snippets:next-tab-stop'
+  'shift-tab': 'snippets:previous-tab-stop'
diff --git a/src/packages/snippets/keymaps/snippets.cson b/src/packages/snippets/keymaps/snippets.cson
deleted file mode 100644
index 6227dd8c1..000000000
--- a/src/packages/snippets/keymaps/snippets.cson
+++ /dev/null
@@ -1,6 +0,0 @@
-window.keymap.bindKeys '.editor'
-  'tab': 'snippets:expand'
-
-window.keymap.bindKeys '.editor'
-  'tab': 'snippets:next-tab-stop'
-  'shift-tab': 'snippets:previous-tab-stop'