]> git.lizzy.rs Git - micro.git/blobdiff - cmd/micro/messenger.go
Fix some issues with unicode handling
[micro.git] / cmd / micro / messenger.go
index b66d4747abe841bdd44b1b9234fd9f329a499ec2..2391bca86dad92ac58ab54d2a1a2724562f18f39 100644 (file)
@@ -6,8 +6,9 @@ import (
        "fmt"
        "os"
        "strconv"
+       "strings"
 
-       "github.com/gdamore/tcell"
+       "github.com/zyedidia/tcell"
 )
 
 // TermMessage sends a message to the user in the terminal. This usually occurs before
@@ -56,6 +57,14 @@ type Messenger struct {
 
        // We have to keep track of the cursor for prompting
        cursorx int
+
+       // This map stores the history for all the different kinds of uses Prompt has
+       // It's a map of history type -> history array
+       history    map[string][]string
+       historyNum int
+
+       // Is the current message a message from the gutter
+       gutterMessage bool
 }
 
 // Message sends a message to the user
@@ -87,41 +96,63 @@ func (m *Messenger) Error(msg ...interface{}) {
 }
 
 // YesNoPrompt asks the user a yes or no question (waits for y or n) and returns the result
-func (m *Messenger) YesNoPrompt(prompt string) bool {
+func (m *Messenger) YesNoPrompt(prompt string) (bool, bool) {
        m.Message(prompt)
 
+       _, h := screen.Size()
        for {
                m.Clear()
                m.Display()
+               screen.ShowCursor(Count(m.message), h-1)
                screen.Show()
-               event := screen.PollEvent()
+               event := <-events
 
                switch e := event.(type) {
                case *tcell.EventKey:
-                       if e.Key() == tcell.KeyRune {
+                       switch e.Key() {
+                       case tcell.KeyRune:
                                if e.Rune() == 'y' {
-                                       return true
+                                       return true, false
                                } else if e.Rune() == 'n' {
-                                       return false
+                                       return false, false
                                }
+                       case tcell.KeyCtrlC, tcell.KeyCtrlQ, tcell.KeyEscape:
+                               return false, true
                        }
                }
        }
 }
 
+type Completion int
+
+const (
+       NoCompletion Completion = iota
+       FileCompletion
+       CommandCompletion
+       HelpCompletion
+       OptionCompletion
+)
+
 // Prompt sends the user a message and waits for a response to be typed in
 // This function blocks the main loop while waiting for input
-func (m *Messenger) Prompt(prompt string) (string, bool) {
+func (m *Messenger) Prompt(prompt, historyType string, completionTypes ...Completion) (string, bool) {
        m.hasPrompt = true
        m.Message(prompt)
+       if _, ok := m.history[historyType]; !ok {
+               m.history[historyType] = []string{""}
+       } else {
+               m.history[historyType] = append(m.history[historyType], "")
+       }
+       m.historyNum = len(m.history[historyType]) - 1
 
        response, canceled := "", true
 
+       RedrawAll()
        for m.hasPrompt {
+               var suggestions []string
                m.Clear()
-               m.Display()
 
-               event := screen.PollEvent()
+               event := <-events
 
                switch e := event.(type) {
                case *tcell.EventKey:
@@ -133,15 +164,58 @@ func (m *Messenger) Prompt(prompt string) (string, bool) {
                                // User is done entering their response
                                m.hasPrompt = false
                                response, canceled = m.response, false
+                               m.history[historyType][len(m.history[historyType])-1] = response
+                       case tcell.KeyTab:
+                               args := strings.Split(m.response, " ")
+                               currentArgNum := len(args) - 1
+                               currentArg := args[currentArgNum]
+                               var completionType Completion
+
+                               if completionTypes[0] == CommandCompletion && currentArgNum > 0 {
+                                       if command, ok := commands[args[0]]; ok {
+                                               completionTypes = append([]Completion{CommandCompletion}, command.completions...)
+                                       }
+                               }
+
+                               if currentArgNum >= len(completionTypes) {
+                                       completionType = completionTypes[len(completionTypes)-1]
+                               } else {
+                                       completionType = completionTypes[currentArgNum]
+                               }
+
+                               var chosen string
+                               if completionType == FileCompletion {
+                                       chosen, suggestions = FileComplete(currentArg)
+                               } else if completionType == CommandCompletion {
+                                       chosen, suggestions = CommandComplete(currentArg)
+                               } else if completionType == HelpCompletion {
+                                       chosen, suggestions = HelpComplete(currentArg)
+                               } else if completionType == OptionCompletion {
+                                       chosen, suggestions = OptionComplete(currentArg)
+                               }
+
+                               if chosen != "" {
+                                       if len(args) > 1 {
+                                               chosen = " " + chosen
+                                       }
+                                       m.response = strings.Join(args[:len(args)-1], " ") + chosen
+                                       m.cursorx = Count(m.response)
+                               }
                        }
                }
 
-               m.HandleEvent(event)
+               m.HandleEvent(event, m.history[historyType])
 
-               if m.cursorx < 0 {
-                       // Cancel
-                       m.hasPrompt = false
+               messenger.Clear()
+               for _, v := range tabs[curTab].views {
+                       v.Display()
                }
+               DisplayTabs()
+               messenger.Display()
+               if len(suggestions) > 1 {
+                       m.DisplaySuggestions(suggestions)
+               }
+               screen.Show()
        }
 
        m.Reset()
@@ -149,10 +223,22 @@ func (m *Messenger) Prompt(prompt string) (string, bool) {
 }
 
 // HandleEvent handles an event for the prompter
-func (m *Messenger) HandleEvent(event tcell.Event) {
+func (m *Messenger) HandleEvent(event tcell.Event, history []string) {
        switch e := event.(type) {
        case *tcell.EventKey:
                switch e.Key() {
+               case tcell.KeyUp:
+                       if m.historyNum > 0 {
+                               m.historyNum--
+                               m.response = history[m.historyNum]
+                               m.cursorx = Count(m.response)
+                       }
+               case tcell.KeyDown:
+                       if m.historyNum < len(history)-1 {
+                               m.historyNum++
+                               m.response = history[m.historyNum]
+                               m.cursorx = Count(m.response)
+                       }
                case tcell.KeyLeft:
                        if m.cursorx > 0 {
                                m.cursorx--
@@ -161,18 +247,16 @@ func (m *Messenger) HandleEvent(event tcell.Event) {
                        if m.cursorx < Count(m.response) {
                                m.cursorx++
                        }
-               case tcell.KeyBackspace2:
+               case tcell.KeyBackspace2, tcell.KeyBackspace:
                        if m.cursorx > 0 {
-                               m.response = string([]rune(m.response)[:m.cursorx-1]) + string(m.response[m.cursorx:])
+                               m.response = string([]rune(m.response)[:m.cursorx-1]) + string([]rune(m.response)[m.cursorx:])
+                               m.cursorx--
                        }
-                       m.cursorx--
-               case tcell.KeySpace:
-                       m.response += " "
-                       m.cursorx++
                case tcell.KeyRune:
                        m.response = Insert(m.response, m.cursorx, string(e.Rune()))
                        m.cursorx++
                }
+               history[m.historyNum] = m.response
        }
 }
 
@@ -191,6 +275,31 @@ func (m *Messenger) Clear() {
        }
 }
 
+func (m *Messenger) DisplaySuggestions(suggestions []string) {
+       w, screenH := screen.Size()
+
+       y := screenH - 2
+
+       statusLineStyle := defStyle.Reverse(true)
+       if style, ok := colorscheme["statusline"]; ok {
+               statusLineStyle = style
+       }
+
+       for x := 0; x < w; x++ {
+               screen.SetContent(x, y, ' ', nil, statusLineStyle)
+       }
+
+       x := 1
+       for _, suggestion := range suggestions {
+               for _, c := range suggestion {
+                       screen.SetContent(x, y, c, nil, statusLineStyle)
+                       x++
+               }
+               screen.SetContent(x, y, ' ', nil, statusLineStyle)
+               x++
+       }
+}
+
 // Display displays messages or prompts
 func (m *Messenger) Display() {
        _, h := screen.Size()
@@ -205,3 +314,20 @@ func (m *Messenger) Display() {
                screen.Show()
        }
 }
+
+// A GutterMessage is a message displayed on the side of the editor
+type GutterMessage struct {
+       lineNum int
+       msg     string
+       kind    int
+}
+
+// These are the different types of messages
+const (
+       // GutterInfo represents a simple info message
+       GutterInfo = iota
+       // GutterWarning represents a compiler warning
+       GutterWarning
+       // GutterError represents a compiler error
+       GutterError
+)