Skip to content

Commit c27f677

Browse files
mochi-yumochi-yu
committed
fix: モデルの名前をsuggestModelに変更
1 parent 6385fd2 commit c27f677

File tree

1 file changed

+43
-44
lines changed

1 file changed

+43
-44
lines changed

‎cmd/suggest.go

+43-44
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ import (
2020
var (
2121
textStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("252")).Render
2222
spinnerStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("69"))
23-
helpStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("241")).Render
2423
)
2524

26-
type model struct {
25+
type suggestModel struct {
2726
choices []string
2827
currentIdx int
2928
errorMsg string
@@ -33,7 +32,7 @@ type model struct {
3332
textInput textinput.Model
3433
}
3534

36-
func (m *model) Init() tea.Cmd {
35+
func (sm *suggestModel) Init() tea.Cmd {
3736
conf, err := entity.ReadConfig()
3837
if err != nil {
3938
log.Fatal("設定情報の取得に失敗: ", err)
@@ -53,79 +52,79 @@ func (m *model) Init() tea.Cmd {
5352
log.Fatal("コミットメッセージの生成に失敗: ", err)
5453
os.Exit(-1)
5554
}
56-
m.choices = messages
57-
m.isLoading = false
55+
sm.choices = messages
56+
sm.isLoading = false
5857
}()
5958

6059
return textinput.Blink
6160
}
6261

63-
func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
62+
func (sm *suggestModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
6463
var cmd tea.Cmd
65-
m.textInput, cmd = m.textInput.Update(msg)
64+
sm.textInput, cmd = sm.textInput.Update(msg)
6665
switch msg := msg.(type) {
6766
case tea.KeyMsg:
6867
switch msg.Type {
6968
case tea.KeyTab:
70-
m.isEditing = true
71-
m.textInput.Focus()
72-
m.textInput.SetValue(m.choices[m.currentIdx])
73-
m.textInput.CharLimit = 100
74-
m.textInput.Width = 100
75-
return m, cmd
69+
sm.isEditing = true
70+
sm.textInput.Focus()
71+
sm.textInput.SetValue(sm.choices[sm.currentIdx])
72+
sm.textInput.CharLimit = 100
73+
sm.textInput.Width = 100
74+
return sm, cmd
7675
case tea.KeyUp:
77-
if m.currentIdx > 0 {
78-
m.currentIdx--
76+
if sm.currentIdx > 0 {
77+
sm.currentIdx--
7978
}
8079
case tea.KeyDown:
81-
if m.currentIdx < len(m.choices)-1 {
82-
m.currentIdx++
80+
if sm.currentIdx < len(sm.choices)-1 {
81+
sm.currentIdx++
8382
}
8483
case tea.KeyEnter:
85-
if err := util.ExecCommitMessage(m.choices[m.currentIdx]); err != nil {
86-
m.errorMsg = "コミットに失敗: " + err.Error()
87-
return m, tea.Quit
84+
if err := util.ExecCommitMessage(sm.choices[sm.currentIdx]); err != nil {
85+
sm.errorMsg = "コミットに失敗: " + err.Error()
86+
return sm, tea.Quit
8887
}
89-
return m, tea.Quit
88+
return sm, tea.Quit
9089
case tea.KeyCtrlC, tea.KeyEsc:
91-
return m, tea.Quit
90+
return sm, tea.Quit
9291
}
9392
case spinner.TickMsg:
9493
var cmd tea.Cmd
95-
m.spinner, cmd = m.spinner.Update(msg)
96-
return m, cmd
94+
sm.spinner, cmd = sm.spinner.Update(msg)
95+
return sm, cmd
9796
}
98-
return m, m.spinner.Tick
97+
return sm, sm.spinner.Tick
9998
}
10099

101-
func (m *model) resetSpinner() {
102-
m.spinner = spinner.New()
103-
m.spinner.Style = spinnerStyle
104-
m.spinner.Spinner = spinner.Globe
100+
func (sm *suggestModel) resetSpinner() {
101+
sm.spinner = spinner.New()
102+
sm.spinner.Style = spinnerStyle
103+
sm.spinner.Spinner = spinner.Globe
105104
}
106105

107-
func (m *model) View() string {
108-
if m.errorMsg != "" {
109-
return color.RedString(m.errorMsg)
106+
func (sm *suggestModel) View() string {
107+
if sm.errorMsg != "" {
108+
return color.RedString(sm.errorMsg)
110109
}
111-
if m.isLoading {
112-
s := fmt.Sprintf("\n %s %s\n\n", m.spinner.View(), textStyle("コミットメッセージ生成中"))
110+
if sm.isLoading {
111+
s := fmt.Sprintf("\n %s %s\n\n", sm.spinner.View(), textStyle("コミットメッセージ生成中"))
113112
return s
114113
}
115114
var b strings.Builder
116-
if m.errorMsg != "" {
117-
b.WriteString(color.RedString(m.errorMsg) + "\n\n")
115+
if sm.errorMsg != "" {
116+
b.WriteString(color.RedString(sm.errorMsg) + "\n\n")
118117
}
119-
if m.isEditing {
120-
return m.textInput.View()
118+
if sm.isEditing {
119+
return sm.textInput.View()
121120
}
122121

123122
b.WriteString(color.WhiteString("🍕 Please select and enter to commit"))
124123
b.WriteString(color.WhiteString("\n Use arrow ↑↓ to navigate and press Enter to select."))
125124
b.WriteString(color.WhiteString("\n ( enter Tab key to edit message )\n\n"))
126125

127-
for i, choice := range m.choices {
128-
if i == m.currentIdx {
126+
for i, choice := range sm.choices {
127+
if i == sm.currentIdx {
129128
b.WriteString(fmt.Sprintf(color.HiCyanString("➡️ %s\n"), choice))
130129
} else {
131130
b.WriteString(fmt.Sprintf(color.CyanString(" %s\n"), choice))
@@ -134,7 +133,7 @@ func (m *model) View() string {
134133
return b.String()
135134
}
136135

137-
func initialModel() model {
136+
func initialModel() suggestModel {
138137
ti := textinput.New()
139138
ti.Focus()
140139

@@ -153,9 +152,9 @@ var suggestCmd = &cobra.Command{
153152
Short: "Suggestion of commit message for staging repository",
154153
Aliases: []string{"s", "suggest"},
155154
Run: func(cmd *cobra.Command, args []string) {
156-
m := initialModel()
157-
m.resetSpinner()
158-
p := tea.NewProgram(&m)
155+
sm := initialModel()
156+
sm.resetSpinner()
157+
p := tea.NewProgram(&sm)
159158
p.Run()
160159
},
161160
}

0 commit comments

Comments
 (0)