add commit message and flags input

Author: mrados7

go.mod

@@ -1,4 +1,4 @@
-module github.com/mrados7/go-git-commands
+module github.com/mrados7/go-git-commands/g_c
 
 go 1.21.5
 

main.go

@@ -12,18 +12,29 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 )
 
+var (
+	focusedStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#6FD0FB")).Bold(true)
+	blurredStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("240"))
+	cursorStyle  = focusedStyle.Copy()
+	noStyle      = lipgloss.NewStyle()
+
+	stagedFilesStyle    = lipgloss.NewStyle().Foreground(lipgloss.Color("#10ffcb"))
+	cursorModeHelpStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("244"))
+
+	focusedButton = focusedStyle.Copy().Render("[ Commit ]")
+	blurredButton = fmt.Sprintf("[ %s ]", blurredStyle.Render("Commit"))
+)
+
 type (
 	errMsg error
 )
 
 type model struct {
-	inputLabel         string
-	commitMessageInput textinput.Model
-	flagsInput         textinput.Model
-	branch             string
-	err                error
-	askingForFlags     bool
-	stagedFiles        []string
+	focusInputIndex int
+	inputs          []textinput.Model
+	branch          string
+	err             error
+	stagedFiles     []string
 }
 
 func main() {
@@ -38,11 +49,8 @@ func initialModel() model {
 	if err != nil {
 		log.Fatal(err)
 	}
-	stagedFiles, errStaged := getStagedFiles()
 
-	if errStaged != nil {
-		log.Fatal(errStaged)
-	}
+	stagedFiles := getStagedFiles()
 
 	result := strings.Split(branch, "/")
 
@@ -55,34 +63,77 @@ func initialModel() model {
 	branchType := strings.ToUpper(result[0])
 	ticketId := strings.ToUpper(result[1])
 
-	ti := textinput.New()
-	ti.SetValue(fmt.Sprintf("[%s] [%s] ", branchType, ticketId))
-	ti.Focus()
-	ti.CharLimit = 156
-
-	return model{
-		inputLabel:         "Enter commit message:",
-		commitMessageInput: ti,
-		branch:             branch,
-		err:                nil,
-		stagedFiles:        stagedFiles,
+	m := model{
+		inputs:          make([]textinput.Model, 2),
+		branch:          branch,
+		err:             nil,
+		focusInputIndex: 0,
+		stagedFiles:     stagedFiles,
+	}
+
+	var t textinput.Model
+	for i := range m.inputs {
+		t = textinput.New()
+		t.Cursor.Style = cursorStyle
+		t.CharLimit = 72
+
+		switch i {
+		case 0:
+			t.SetValue(fmt.Sprintf("[%s] [%s] ", branchType, ticketId))
+			t.Focus()
+			t.PromptStyle = focusedStyle
+			t.TextStyle = focusedStyle
+		case 1:
+			t.ShowSuggestions = true
+			commitFlags := []string{
+				"--message",
+				"--all",
+				"--patch",
+				"--reuse-message",
+				"--amend",
+				"--signoff",
+				"--no-verify",
+				"--allow-empty",
+				"--no-edit",
+			}
+			t.SetSuggestions(commitFlags)
+			t.Placeholder = "Commit flags"
+		}
+
+		m.inputs[i] = t
 	}
+
+	return m
+}
+
+func getCurrentGitBranch() (string, error) {
+	cmd := exec.Command("git", "branch", "--show-current")
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return "", fmt.Errorf("error getting branch name: %v", err)
+	}
+
+	return strings.TrimSpace(string(output)), nil
 }
 
 func (m model) Init() tea.Cmd {
 	return textinput.Blink
 }
 
 func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	var cmd tea.Cmd
-
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
 		switch msg.Type {
-		case tea.KeyEnter:
-			if m.askingForFlags {
+
+		// Set focus to next input
+		case tea.KeyShiftTab, tea.KeyEnter, tea.KeyUp, tea.KeyDown:
+			s := msg.String()
+
+			// Did the user press enter while the submit button was focused?
+			// If so, exit.
+			if s == "enter" && m.focusInputIndex == len(m.inputs) {
 				// Execute git commit command with flags
-				commitCmd := exec.Command("git", "commit", m.flagsInput.Value(), "-m", m.commitMessageInput.Value())
+				commitCmd := exec.Command("git", "commit", m.inputs[0].Value(), "-m", m.inputs[1].Value())
 				commitCmd.Stdout = os.Stdout
 				commitCmd.Stderr = os.Stderr
 
@@ -92,85 +143,108 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				}
 
 				return m, tea.Quit
+			}
+
+			// Cycle indexes
+			if s == "up" || s == "shift+tab" {
+				m.focusInputIndex--
 			} else {
-				m.inputLabel = "Commit flags"
-				// Ask for commit flags
-				flagsInput := textinput.New()
-				commitFlags := []string{
-					"--message",
-					"--all",
-					"--patch",
-					"--reuse-message",
-					"--amend",
-					"--signoff",
-					"--no-verify",
-					"--allow-empty",
-					"--no-edit",
+				m.focusInputIndex++
+			}
+
+			if m.focusInputIndex > len(m.inputs) {
+				m.focusInputIndex = 0
+			} else if m.focusInputIndex < 0 {
+				m.focusInputIndex = len(m.inputs)
+			}
+
+			cmds := make([]tea.Cmd, len(m.inputs))
+			for i := 0; i <= len(m.inputs)-1; i++ {
+				if i == m.focusInputIndex {
+					// Set focused state
+					cmds[i] = m.inputs[i].Focus()
+					m.inputs[i].PromptStyle = focusedStyle
+					m.inputs[i].TextStyle = focusedStyle
+					continue
 				}
-				flagsInput.SetSuggestions(commitFlags)
-				flagsInput.ShowSuggestions = true
-				flagsInput.Focus()
-				m.flagsInput = flagsInput
-				m.askingForFlags = true
-				return m, nil
+				// Remove focused state
+				m.inputs[i].Blur()
+				m.inputs[i].PromptStyle = noStyle
+				m.inputs[i].TextStyle = noStyle
 			}
+
+			return m, tea.Batch(cmds...)
 		case tea.KeyCtrlC, tea.KeyEsc:
 			return m, tea.Quit
 		}
 	}
 
-	if m.askingForFlags {
-		m.flagsInput, cmd = m.flagsInput.Update(msg)
-	} else {
-		m.commitMessageInput, cmd = m.commitMessageInput.Update(msg)
-	}
+	cmd := m.updateInputs(msg)
 
 	return m, cmd
 }
 
-func (m model) View() string {
-	var inputView string
-	if m.askingForFlags {
-		inputView = m.flagsInput.View()
-	} else {
-		inputView = m.commitMessageInput.View()
+func (m *model) updateInputs(msg tea.Msg) tea.Cmd {
+	cmds := make([]tea.Cmd, len(m.inputs))
+
+	for i := range m.inputs {
+		m.inputs[i], cmds[i] = m.inputs[i].Update(msg)
 	}
 
-	currentCommitMessage := "Current commit message: " + m.commitMessageInput.Value() + " " + m.flagsInput.Value()
+	return tea.Batch(cmds...)
+}
 
-	stagedFiles := strings.Join(m.stagedFiles, "\n")
+func (m model) View() string {
+	var b strings.Builder
 
-	currentBranch := lipgloss.NewStyle().Foreground(lipgloss.Color("#fbd87f")).SetString(fmt.Sprintf("Current branch: %s", m.branch))
-	inputLabel := lipgloss.NewStyle().Foreground(lipgloss.Color("#b5f8fe")).SetString(m.inputLabel).Bold(true)
-	inputStyle := lipgloss.NewStyle().SetString(inputView)
+	currentBranch := lipgloss.NewStyle().Foreground(lipgloss.Color("#fcbda1")).SetString(fmt.Sprintf("Branch: %s", m.branch))
 
-	return fmt.Sprintf(
-		"%s\n\n%s\n\n%s\n%s\n\n%s",
-		currentBranch.Render(),
-		currentCommitMessage,
-		inputLabel.Render(),
-		inputStyle.Render(),
-		stagedFiles,
-	) + "\n"
-}
+	b.WriteString(currentBranch.Render())
+	b.WriteRune('\n')
+	b.WriteRune('\n')
 
-// cmds
-func getCurrentGitBranch() (string, error) {
-	cmd := exec.Command("git", "branch", "--show-current")
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		return "", fmt.Errorf("error getting branch name: %v", err)
+	currentCommitCommand := lipgloss.NewStyle().Foreground(lipgloss.Color("#a1e0fc")).SetString(fmt.Sprintf("git commit -m \"%s\" %s", m.inputs[0].Value(), m.inputs[1].Value()))
+
+	b.WriteString(currentCommitCommand.Render())
+	b.WriteRune('\n')
+	b.WriteRune('\n')
+
+	inputLabels := []string{"Commit message ", "Commit flags "}
+
+	for i := range m.inputs {
+		if i == m.focusInputIndex {
+			b.WriteString(lipgloss.NewStyle().Foreground(lipgloss.Color("#6FD0FB")).Bold(true).SetString(inputLabels[i]).Render())
+		} else {
+			b.WriteString(inputLabels[i])
+		}
+		b.WriteString(m.inputs[i].View())
+		b.WriteRune('\n')
+		if i < len(m.inputs)-1 {
+			b.WriteRune('\n')
+		}
 	}
 
-	return strings.TrimSpace(string(output)), nil
+	button := &blurredButton
+	if m.focusInputIndex == len(m.inputs) {
+		button = &focusedButton
+	}
+	fmt.Fprintf(&b, "\n\n%s\n\n", *button)
+
+	b.WriteString("Staged changes: ")
+	b.WriteRune('\n')
+	b.WriteString(stagedFilesStyle.Render(strings.Join(m.stagedFiles, "\n")))
+
+	b.WriteRune('\n')
+
+	return b.String()
 }
 
-func getStagedFiles() ([]string, error) {
-	cmd := exec.Command("git", "diff", "--cached", "--name-only")
-	output, err := cmd.CombinedOutput()
+func getStagedFiles() []string {
+	cmd := exec.Command("git", "diff", "--name-only", "--cached")
+	out, err := cmd.Output()
 	if err != nil {
-		return nil, fmt.Errorf("error getting staged files: %v", err)
+		return []string{}
 	}
 
-	return strings.Split(strings.TrimSpace(string(output)), "\n"), nil
+	return strings.Split(string(out), "\n")
 }