github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-09 14:20:16 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add visual indicator for autocomplete suggestions

Browse Source
This commit is contained in:
Zachary Yedidia
2016-08-17 14:37:30 -04:00
parent ddeed5e558
commit fd68dbd852
1 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
cmd/micro/messenger.go
View File

@@ -147,9 +147,10 @@ func (m *Messenger) Prompt(prompt, historyType string, completionTypes ...Comple
response, canceled := "", true
RedrawAll()
for m.hasPrompt {
var suggestions []string
m.Clear()
m.Display()
event := <-events
@@ -170,9 +171,9 @@ func (m *Messenger) Prompt(prompt, historyType string, completionTypes ...Comple
currentArg := args[currentArgNum]
var completionType Completion
if completionTypes[0] == CommandCompletion && len(completionTypes) == 1 && currentArgNum > 0 {
if completionTypes[0] == CommandCompletion && currentArgNum > 0 {
if command, ok := commands[args[0]]; ok {
completionTypes = append(completionTypes, command.completions...)
completionTypes = append([]Completion{CommandCompletion}, command.completions...)
}
}
@@ -184,13 +185,13 @@ func (m *Messenger) Prompt(prompt, historyType string, completionTypes ...Comple
var chosen string
if completionType == FileCompletion {
chosen, _ = FileComplete(currentArg)
chosen, suggestions = FileComplete(currentArg)
} else if completionType == CommandCompletion {
chosen, _ = CommandComplete(currentArg)
chosen, suggestions = CommandComplete(currentArg)
} else if completionType == HelpCompletion {
chosen, _ = HelpComplete(currentArg)
chosen, suggestions = HelpComplete(currentArg)
} else if completionType == OptionCompletion {
chosen, _ = OptionComplete(currentArg)
chosen, suggestions = OptionComplete(currentArg)
}
if chosen != "" {
@@ -204,6 +205,17 @@ func (m *Messenger) Prompt(prompt, historyType string, completionTypes ...Comple
}
m.HandleEvent(event, m.history[historyType])
messenger.Clear()
for _, v := range tabs[curTab].views {
v.Display()
}
DisplayTabs()
messenger.Display()
if len(suggestions) > 1 {
m.DisplaySuggestions(suggestions)
}
screen.Show()
}
m.Reset()
@@ -263,6 +275,25 @@ func (m *Messenger) Clear() {
}
}
func (m *Messenger) DisplaySuggestions(suggestions []string) {
w, screenH := screen.Size()
y := screenH - 2
for x := 0; x < w; x++ {
screen.SetContent(x, y, ' ', nil, defStyle.Reverse(true))
}
x := 1
for _, suggestion := range suggestions {
for _, c := range suggestion {
screen.SetContent(x, y, c, nil, defStyle.Reverse(true))
x++
}
screen.SetContent(x, y, ' ', nil, defStyle.Reverse(true))
x++
}
}
// Display displays messages or prompts
func (m *Messenger) Display() {
_, h := screen.Size()