fix: merge conflict

maaslalani · Mar 26, 2023 · 44daf01 · 44daf01
1 parent e0ce043
commit 44daf01
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 34 deletions.
diff --git a/keys.go b/keys.go
@@ -4,44 +4,48 @@ import "github.com/charmbracelet/bubbles/key"
 
 // KeyMap is the mappings of actions to key bindings.
 type KeyMap struct {
-	Quit          key.Binding
-	Search        key.Binding
-	ToggleHelp    key.Binding
-	NewSnippet    key.Binding
-	DeleteSnippet key.Binding
-	EditSnippet   key.Binding
-	CopySnippet   key.Binding
-	PasteSnippet  key.Binding
-	SetFolder     key.Binding
-	RenameSnippet key.Binding
-	TagSnippet    key.Binding
-	SetLanguage   key.Binding
-	Confirm       key.Binding
-	Cancel        key.Binding
-	NextPane      key.Binding
-	PreviousPane  key.Binding
-	ChangeFolder  key.Binding
+	Quit            key.Binding
+	Search          key.Binding
+	ToggleHelp      key.Binding
+	NewSnippet      key.Binding
+	MoveSnippetUp   key.Binding
+	MoveSnippetDown key.Binding
+	DeleteSnippet   key.Binding
+	EditSnippet     key.Binding
+	CopySnippet     key.Binding
+	PasteSnippet    key.Binding
+	SetFolder       key.Binding
+	RenameSnippet   key.Binding
+	TagSnippet      key.Binding
+	SetLanguage     key.Binding
+	Confirm         key.Binding
+	Cancel          key.Binding
+	NextPane        key.Binding
+	PreviousPane    key.Binding
+	ChangeFolder    key.Binding
 }
 
 // DefaultKeyMap is the default key map for the application.
 var DefaultKeyMap = KeyMap{
-	Quit:          key.NewBinding(key.WithKeys("q", "ctrl+c"), key.WithHelp("q", "exit")),
-	Search:        key.NewBinding(key.WithKeys("/"), key.WithHelp("/", "search")),
-	ToggleHelp:    key.NewBinding(key.WithKeys("?"), key.WithHelp("?", "help")),
-	NewSnippet:    key.NewBinding(key.WithKeys("n"), key.WithHelp("n", "new")),
-	DeleteSnippet: key.NewBinding(key.WithKeys("x"), key.WithHelp("x", "delete")),
-	EditSnippet:   key.NewBinding(key.WithKeys("e"), key.WithHelp("e", "edit")),
-	CopySnippet:   key.NewBinding(key.WithKeys("c"), key.WithHelp("c", "copy")),
-	PasteSnippet:  key.NewBinding(key.WithKeys("p"), key.WithHelp("p", "paste")),
-	RenameSnippet: key.NewBinding(key.WithKeys("r"), key.WithHelp("r", "rename snippet")),
-	SetFolder:     key.NewBinding(key.WithKeys("R"), key.WithHelp("R", "rename folder")),
-	SetLanguage:   key.NewBinding(key.WithKeys("L"), key.WithHelp("L", "set file type")),
-	TagSnippet:    key.NewBinding(key.WithKeys("t"), key.WithHelp("t", "tag"), key.WithDisabled()),
-	Confirm:       key.NewBinding(key.WithKeys("y"), key.WithHelp("y", "confirm")),
-	Cancel:        key.NewBinding(key.WithKeys("N", "esc"), key.WithHelp("N", "cancel")),
-	NextPane:      key.NewBinding(key.WithKeys("tab", "right"), key.WithHelp("tab", "navigate")),
-	PreviousPane:  key.NewBinding(key.WithKeys("shift+tab", "left"), key.WithHelp("shift+tab", "navigate")),
-	ChangeFolder:  key.NewBinding(key.WithKeys("enter"), key.WithHelp("enter", "change folder"), key.WithDisabled()),
+	Quit:            key.NewBinding(key.WithKeys("q", "ctrl+c"), key.WithHelp("q", "exit")),
+	Search:          key.NewBinding(key.WithKeys("/"), key.WithHelp("/", "search")),
+	ToggleHelp:      key.NewBinding(key.WithKeys("?"), key.WithHelp("?", "help")),
+	NewSnippet:      key.NewBinding(key.WithKeys("n"), key.WithHelp("n", "new")),
+	MoveSnippetDown: key.NewBinding(key.WithKeys("J"), key.WithHelp("J", "move snippet down")),
+	MoveSnippetUp:   key.NewBinding(key.WithKeys("K"), key.WithHelp("K", "move snippet up")),
+	DeleteSnippet:   key.NewBinding(key.WithKeys("x"), key.WithHelp("x", "delete")),
+	EditSnippet:     key.NewBinding(key.WithKeys("e"), key.WithHelp("e", "edit")),
+	CopySnippet:     key.NewBinding(key.WithKeys("c"), key.WithHelp("c", "copy")),
+	PasteSnippet:    key.NewBinding(key.WithKeys("p"), key.WithHelp("p", "paste")),
+	RenameSnippet:   key.NewBinding(key.WithKeys("r"), key.WithHelp("r", "rename snippet")),
+	SetFolder:       key.NewBinding(key.WithKeys("R"), key.WithHelp("R", "rename folder")),
+	SetLanguage:     key.NewBinding(key.WithKeys("L"), key.WithHelp("L", "set file type")),
+	TagSnippet:      key.NewBinding(key.WithKeys("t"), key.WithHelp("t", "tag"), key.WithDisabled()),
+	Confirm:         key.NewBinding(key.WithKeys("y"), key.WithHelp("y", "confirm")),
+	Cancel:          key.NewBinding(key.WithKeys("N", "esc"), key.WithHelp("N", "cancel")),
+	NextPane:        key.NewBinding(key.WithKeys("tab", "right"), key.WithHelp("tab", "navigate")),
+	PreviousPane:    key.NewBinding(key.WithKeys("shift+tab", "left"), key.WithHelp("shift+tab", "navigate")),
+	ChangeFolder:    key.NewBinding(key.WithKeys("enter"), key.WithHelp("enter", "change folder"), key.WithDisabled()),
 }
 
 // ShortHelp returns a quick help menu.
@@ -61,6 +65,7 @@ func (k KeyMap) ShortHelp() []key.Binding {
 func (k KeyMap) FullHelp() [][]key.Binding {
 	return [][]key.Binding{
 		{k.NewSnippet, k.EditSnippet, k.PasteSnippet, k.CopySnippet, k.DeleteSnippet},
+		{k.MoveSnippetDown, k.MoveSnippetUp},
 		{k.RenameSnippet, k.SetFolder, k.TagSnippet, k.SetLanguage},
 		{k.NextPane, k.PreviousPane},
 		{k.Search, k.ToggleHelp, k.Quit},

diff --git a/model.go b/model.go
@@ -293,6 +293,10 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case key.Matches(msg, m.keys.NewSnippet):
 			m.state = creatingState
 			return m, m.createNewSnippetFile()
+		case key.Matches(msg, m.keys.MoveSnippetDown):
+			m.moveSnippetDown()
+		case key.Matches(msg, m.keys.MoveSnippetUp):
+			m.moveSnippetUp()
 		case key.Matches(msg, m.keys.PasteSnippet):
 			return m, changeState(pastingState)
 		case key.Matches(msg, m.keys.RenameSnippet):
@@ -584,6 +588,22 @@ func (m *Model) List() *list.Model {
 	return m.Lists[m.selectedFolder()]
 }
 
+func (m *Model) moveSnippetDown() {
+	currentPosition := m.List().Index()
+	currentItem := m.List().SelectedItem()
+	m.List().InsertItem(currentPosition+2, currentItem)
+	m.List().RemoveItem(currentPosition)
+	m.List().CursorDown()
+}
+
+func (m *Model) moveSnippetUp() {
+	currentPosition := m.List().Index()
+	currentItem := m.List().SelectedItem()
+	m.List().RemoveItem(currentPosition)
+	m.List().InsertItem(currentPosition-1, currentItem)
+	m.List().CursorUp()
+}
+
 // createNewSnippet creates a new snippet file and adds it to the the list.
 func (m *Model) createNewSnippetFile() tea.Cmd {
 	return func() tea.Msg {