Resolved test failiure occured after ce04fc8

Because we are initializing setting and keybinding hierarchy on
GetEditor() we should remove the checking in loadSettings() and
loadKeyBindings()

lib/editor.go

@@ -188,10 +188,6 @@ func (e *Editor) SetClipboardFuncs(setter func(string) error, getter func() (str
 }
 
 func (e *Editor) loadKeyBindings() {
-	// Prevent running loadKeyBindings func more than once
-	if e.KeyBindings().Parent() != nil {
-		return
-	}
 	log.Fine("Loading editor keybindings")
 
 	p := path.Join(e.PackagesPath("default"), "Default.sublime-keymap")
@@ -208,10 +204,6 @@ func (e *Editor) loadKeyBindings() {
 }
 
 func (e *Editor) loadSettings() {
-	// Prevent running loadSettings func more than once
-	if e.Settings().Parent() != nil {
-		return
-	}
 	log.Fine("Loading editor settings")
 
 	p := path.Join(e.PackagesPath("default"), "Preferences.sublime-settings")

lib/editor_test.go

@@ -20,20 +20,20 @@ func TestGetEditor(t *testing.T) {
 }
 
 func TestLoadKeyBinding(t *testing.T) {
-	editor := GetEditor()
-	packages.NewJSONL("testdata/Default.sublime-keymap", editor.KeyBindings())
+	ed := GetEditor()
+	packages.NewJSONL("testdata/Default.sublime-keymap", ed.KeyBindings())
 
-	kb := editor.KeyBindings().Filter(keys.KeyPress{Key: 'i'})
+	kb := ed.KeyBindings().Filter(keys.KeyPress{Key: 'i'})
 	if expectedLen := 3; kb.Len() != expectedLen {
 		t.Errorf("Expected to have %d keys in the filter, but it had %d", expectedLen, kb.Len())
 	}
 }
 
 func TestLoadKeyBindings(t *testing.T) {
-	editor := GetEditor()
-	editor.loadKeyBindings()
+	ed := GetEditor()
+	ed.loadKeyBindings()
 
-	if editor.defaultKB.KeyBindings().Len() <= 0 {
+	if ed.defaultKB.KeyBindings().Len() <= 0 {
 		t.Errorf("Expected editor to have some keys bound, but it didn't")
 	}
 }