]> git.lizzy.rs Git - micro.git/blobdiff - cmd/micro/messenger.go
Code optimisation (#1117)
[micro.git] / cmd / micro / messenger.go
index ce48b41fac95e44e691845fb4913c6c026344209..b55557af290832cbea0a799e47f2d8fd8ada3ce2 100644 (file)
@@ -3,12 +3,14 @@ package main
 import (
        "bufio"
        "bytes"
+       "encoding/gob"
        "fmt"
        "os"
        "strconv"
-       "strings"
 
+       "github.com/mattn/go-runewidth"
        "github.com/zyedidia/clipboard"
+       "github.com/zyedidia/micro/cmd/micro/shellwords"
        "github.com/zyedidia/tcell"
 )
 
@@ -70,16 +72,18 @@ type Messenger struct {
        gutterMessage bool
 }
 
-func (m *Messenger) AddLog(msg string) {
+// AddLog sends a message to the log view
+func (m *Messenger) AddLog(msg ...interface{}) {
+       logMessage := fmt.Sprint(msg...)
        buffer := m.getBuffer()
-       buffer.insert(buffer.End(), []byte(msg+"\n"))
+       buffer.insert(buffer.End(), []byte(logMessage+"\n"))
        buffer.Cursor.Loc = buffer.End()
        buffer.Cursor.Relocate()
 }
 
 func (m *Messenger) getBuffer() *Buffer {
        if m.log == nil {
-               m.log = NewBuffer(strings.NewReader(""), "")
+               m.log = NewBufferFromString("", "")
                m.log.name = "Log"
        }
        return m.log
@@ -119,7 +123,7 @@ func (m *Messenger) Error(msg ...interface{}) {
                m.style = defStyle.
                        Foreground(tcell.ColorBlack).
                        Background(tcell.ColorMaroon)
-               
+
                if _, ok := colorscheme["error-message"]; ok {
                        m.style = colorscheme["error-message"]
                }
@@ -129,10 +133,26 @@ func (m *Messenger) Error(msg ...interface{}) {
        m.AddLog(buf.String())
 }
 
+func (m *Messenger) PromptText(msg ...interface{}) {
+       displayMessage := fmt.Sprint(msg...)
+       // if there is no active prompt then style and display the message as normal
+       m.message = displayMessage
+
+       m.style = defStyle
+
+       if _, ok := colorscheme["message"]; ok {
+               m.style = colorscheme["message"]
+       }
+
+       m.hasMessage = true
+       // add the message to the log regardless of active prompts
+       m.AddLog(displayMessage)
+}
+
 // 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, bool) {
        m.hasPrompt = true
-       m.Message(prompt)
+       m.PromptText(prompt)
 
        _, h := screen.Size()
        for {
@@ -146,17 +166,19 @@ func (m *Messenger) YesNoPrompt(prompt string) (bool, bool) {
                case *tcell.EventKey:
                        switch e.Key() {
                        case tcell.KeyRune:
-                               if e.Rune() == 'y' {
+                               if e.Rune() == 'y' || e.Rune() == 'Y' {
                                        m.AddLog("\t--> y")
                                        m.hasPrompt = false
                                        return true, false
-                               } else if e.Rune() == 'n' {
+                               } else if e.Rune() == 'n' || e.Rune() == 'N' {
                                        m.AddLog("\t--> n")
                                        m.hasPrompt = false
                                        return false, false
                                }
                        case tcell.KeyCtrlC, tcell.KeyCtrlQ, tcell.KeyEscape:
                                m.AddLog("\t--> (cancel)")
+                               m.Clear()
+                               m.Reset()
                                m.hasPrompt = false
                                return false, true
                        }
@@ -167,7 +189,7 @@ func (m *Messenger) YesNoPrompt(prompt string) (bool, bool) {
 // LetterPrompt gives the user a prompt and waits for a one letter response
 func (m *Messenger) LetterPrompt(prompt string, responses ...rune) (rune, bool) {
        m.hasPrompt = true
-       m.Message(prompt)
+       m.PromptText(prompt)
 
        _, h := screen.Size()
        for {
@@ -201,6 +223,7 @@ func (m *Messenger) LetterPrompt(prompt string, responses ...rune) (rune, bool)
        }
 }
 
+// Completion represents a type of completion
 type Completion int
 
 const (
@@ -211,13 +234,14 @@ const (
        OptionCompletion
        PluginCmdCompletion
        PluginNameCompletion
+       OptionValueCompletion
 )
 
 // 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, placeholder, historyType string, completionTypes ...Completion) (string, bool) {
        m.hasPrompt = true
-       m.Message(prompt)
+       m.PromptText(prompt)
        if _, ok := m.history[historyType]; !ok {
                m.history[historyType] = []string{""}
        } else {
@@ -237,6 +261,11 @@ func (m *Messenger) Prompt(prompt, placeholder, historyType string, completionTy
                event := <-events
 
                switch e := event.(type) {
+               case *tcell.EventResize:
+                       for _, t := range tabs {
+                               t.Resize()
+                       }
+                       RedrawAll()
                case *tcell.EventKey:
                        switch e.Key() {
                        case tcell.KeyCtrlQ, tcell.KeyCtrlC, tcell.KeyEscape:
@@ -250,9 +279,16 @@ func (m *Messenger) Prompt(prompt, placeholder, historyType string, completionTy
                                response, canceled = m.response, false
                                m.history[historyType][len(m.history[historyType])-1] = response
                        case tcell.KeyTab:
-                               args := SplitCommandArgs(m.response)
-                               currentArgNum := len(args) - 1
-                               currentArg := args[currentArgNum]
+                               args, err := shellwords.Split(m.response)
+                               if err != nil {
+                                       break
+                               }
+                               currentArg := ""
+                               currentArgNum := 0
+                               if len(args) > 0 {
+                                       currentArgNum = len(args) - 1
+                                       currentArg = args[currentArgNum]
+                               }
                                var completionType Completion
 
                                if completionTypes[0] == CommandCompletion && currentArgNum > 0 {
@@ -276,6 +312,10 @@ func (m *Messenger) Prompt(prompt, placeholder, historyType string, completionTy
                                        chosen, suggestions = HelpComplete(currentArg)
                                } else if completionType == OptionCompletion {
                                        chosen, suggestions = OptionComplete(currentArg)
+                               } else if completionType == OptionValueCompletion {
+                                       if currentArgNum-1 > 0 {
+                                               chosen, suggestions = OptionValueComplete(args[currentArgNum-1], currentArg)
+                                       }
                                } else if completionType == PluginCmdCompletion {
                                        chosen, suggestions = PluginCmdComplete(currentArg)
                                } else if completionType == PluginNameCompletion {
@@ -288,8 +328,8 @@ func (m *Messenger) Prompt(prompt, placeholder, historyType string, completionTy
                                        chosen = chosen + CommonSubstring(suggestions...)
                                }
 
-                               if chosen != "" {
-                                       m.response = JoinCommandArgs(append(args[:len(args)-1], chosen)...)
+                               if len(suggestions) != 0 && chosen != "" {
+                                       m.response = shellwords.Join(append(args[:len(args)-1], chosen)...)
                                        m.cursorx = Count(m.response)
                                }
                        }
@@ -298,7 +338,7 @@ func (m *Messenger) Prompt(prompt, placeholder, historyType string, completionTy
                m.HandleEvent(event, m.history[historyType])
 
                m.Clear()
-               for _, v := range tabs[curTab].views {
+               for _, v := range tabs[curTab].Views {
                        v.Display()
                }
                DisplayTabs()
@@ -314,62 +354,160 @@ func (m *Messenger) Prompt(prompt, placeholder, historyType string, completionTy
        return response, canceled
 }
 
+// UpHistory fetches the previous item in the history
+func (m *Messenger) UpHistory(history []string) {
+       if m.historyNum > 0 {
+               m.historyNum--
+               m.response = history[m.historyNum]
+               m.cursorx = Count(m.response)
+       }
+}
+
+// DownHistory fetches the next item in the history
+func (m *Messenger) DownHistory(history []string) {
+       if m.historyNum < len(history)-1 {
+               m.historyNum++
+               m.response = history[m.historyNum]
+               m.cursorx = Count(m.response)
+       }
+}
+
+// CursorLeft moves the cursor one character left
+func (m *Messenger) CursorLeft() {
+       if m.cursorx > 0 {
+               m.cursorx--
+       }
+}
+
+// CursorRight moves the cursor one character right
+func (m *Messenger) CursorRight() {
+       if m.cursorx < Count(m.response) {
+               m.cursorx++
+       }
+}
+
+// Start moves the cursor to the start of the line
+func (m *Messenger) Start() {
+       m.cursorx = 0
+}
+
+// End moves the cursor to the end of the line
+func (m *Messenger) End() {
+       m.cursorx = Count(m.response)
+}
+
+// Backspace deletes one character
+func (m *Messenger) Backspace() {
+       if m.cursorx > 0 {
+               m.response = string([]rune(m.response)[:m.cursorx-1]) + string([]rune(m.response)[m.cursorx:])
+               m.cursorx--
+       }
+}
+
+// Paste pastes the clipboard
+func (m *Messenger) Paste() {
+       clip, _ := clipboard.ReadAll("clipboard")
+       m.response = Insert(m.response, m.cursorx, clip)
+       m.cursorx += Count(clip)
+}
+
+// WordLeft moves the cursor one word to the left
+func (m *Messenger) WordLeft() {
+       response := []rune(m.response)
+       m.CursorLeft()
+       if m.cursorx <= 0 {
+               return
+       }
+       for IsWhitespace(response[m.cursorx]) {
+               if m.cursorx <= 0 {
+                       return
+               }
+               m.CursorLeft()
+       }
+       m.CursorLeft()
+       for IsWordChar(string(response[m.cursorx])) {
+               if m.cursorx <= 0 {
+                       return
+               }
+               m.CursorLeft()
+       }
+       m.CursorRight()
+}
+
+// WordRight moves the cursor one word to the right
+func (m *Messenger) WordRight() {
+       response := []rune(m.response)
+       if m.cursorx >= len(response) {
+               return
+       }
+       for IsWhitespace(response[m.cursorx]) {
+               m.CursorRight()
+               if m.cursorx >= len(response) {
+                       m.CursorRight()
+                       return
+               }
+       }
+       m.CursorRight()
+       if m.cursorx >= len(response) {
+               return
+       }
+       for IsWordChar(string(response[m.cursorx])) {
+               m.CursorRight()
+               if m.cursorx >= len(response) {
+                       return
+               }
+       }
+}
+
+// DeleteWordLeft deletes one word to the left
+func (m *Messenger) DeleteWordLeft() {
+       m.WordLeft()
+       m.response = string([]rune(m.response)[:m.cursorx])
+}
+
 // HandleEvent handles an event for the prompter
 func (m *Messenger) HandleEvent(event tcell.Event, history []string) {
        switch e := event.(type) {
        case *tcell.EventKey:
-               if e.Key() != tcell.KeyRune || e.Modifiers() != 0 {
-                       for key, actions := range bindings {
-                               if e.Key() == key.keyCode {
-                                       if e.Key() == tcell.KeyRune {
-                                               if e.Rune() != key.r {
-                                                       continue
-                                               }
-                                       }
-                                       if e.Modifiers() == key.modifiers {
-                                               for _, action := range actions {
-                                                       funcName := FuncName(action)
-                                                       switch funcName {
-                                                       case "main.(*View).CursorUp":
-                                                               if m.historyNum > 0 {
-                                                                       m.historyNum--
-                                                                       m.response = history[m.historyNum]
-                                                                       m.cursorx = Count(m.response)
-                                                               }
-                                                       case "main.(*View).CursorDown":
-                                                               if m.historyNum < len(history)-1 {
-                                                                       m.historyNum++
-                                                                       m.response = history[m.historyNum]
-                                                                       m.cursorx = Count(m.response)
-                                                               }
-                                                       case "main.(*View).CursorLeft":
-                                                               if m.cursorx > 0 {
-                                                                       m.cursorx--
-                                                               }
-                                                       case "main.(*View).CursorRight":
-                                                               if m.cursorx < Count(m.response) {
-                                                                       m.cursorx++
-                                                               }
-                                                       case "main.(*View).CursorStart", "main.(*View).StartOfLine":
-                                                               m.cursorx = 0
-                                                       case "main.(*View).CursorEnd", "main.(*View).EndOfLine":
-                                                               m.cursorx = Count(m.response)
-                                                       case "main.(*View).Backspace":
-                                                               if m.cursorx > 0 {
-                                                                       m.response = string([]rune(m.response)[:m.cursorx-1]) + string([]rune(m.response)[m.cursorx:])
-                                                                       m.cursorx--
-                                                               }
-                                                       case "main.(*View).Paste":
-                                                               clip, _ := clipboard.ReadAll("clipboard")
-                                                               m.response = Insert(m.response, m.cursorx, clip)
-                                                               m.cursorx += Count(clip)
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
                switch e.Key() {
+               case tcell.KeyCtrlA:
+                       m.Start()
+               case tcell.KeyCtrlE:
+                       m.End()
+               case tcell.KeyUp:
+                       m.UpHistory(history)
+               case tcell.KeyDown:
+                       m.DownHistory(history)
+               case tcell.KeyLeft:
+                       if e.Modifiers() == tcell.ModCtrl {
+                               m.Start()
+                       } else if e.Modifiers() == tcell.ModAlt || e.Modifiers() == tcell.ModMeta {
+                               m.WordLeft()
+                       } else {
+                               m.CursorLeft()
+                       }
+               case tcell.KeyRight:
+                       if e.Modifiers() == tcell.ModCtrl {
+                               m.End()
+                       } else if e.Modifiers() == tcell.ModAlt || e.Modifiers() == tcell.ModMeta {
+                               m.WordRight()
+                       } else {
+                               m.CursorRight()
+                       }
+               case tcell.KeyBackspace2, tcell.KeyBackspace:
+                       if e.Modifiers() == tcell.ModCtrl || e.Modifiers() == tcell.ModAlt || e.Modifiers() == tcell.ModMeta {
+                               m.DeleteWordLeft()
+                       } else {
+                               m.Backspace()
+                       }
+               case tcell.KeyCtrlW:
+                       m.DeleteWordLeft()
+               case tcell.KeyCtrlV:
+                       m.Paste()
+               case tcell.KeyCtrlF:
+                       m.WordRight()
+               case tcell.KeyCtrlB:
+                       m.WordLeft()
                case tcell.KeyRune:
                        m.response = Insert(m.response, m.cursorx, string(e.Rune()))
                        m.cursorx++
@@ -446,8 +584,10 @@ func (m *Messenger) Display() {
        if m.hasMessage {
                if m.hasPrompt || globalSettings["infobar"].(bool) {
                        runes := []rune(m.message + m.response)
+                       posx := 0
                        for x := 0; x < len(runes); x++ {
-                               screen.SetContent(x, h-1, runes[x], nil, m.style)
+                               screen.SetContent(posx, h-1, runes[x], nil, m.style)
+                               posx += runewidth.RuneWidth(runes[x])
                        }
                }
        }
@@ -458,6 +598,59 @@ func (m *Messenger) Display() {
        }
 }
 
+// LoadHistory attempts to load user history from configDir/buffers/history
+// into the history map
+// The savehistory option must be on
+func (m *Messenger) LoadHistory() {
+       if GetGlobalOption("savehistory").(bool) {
+               file, err := os.Open(configDir + "/buffers/history")
+               defer file.Close()
+               var decodedMap map[string][]string
+               if err == nil {
+                       decoder := gob.NewDecoder(file)
+                       err = decoder.Decode(&decodedMap)
+
+                       if err != nil {
+                               m.Error("Error loading history:", err)
+                               return
+                       }
+               }
+
+               if decodedMap != nil {
+                       m.history = decodedMap
+               } else {
+                       m.history = make(map[string][]string)
+               }
+       } else {
+               m.history = make(map[string][]string)
+       }
+}
+
+// SaveHistory saves the user's command history to configDir/buffers/history
+// only if the savehistory option is on
+func (m *Messenger) SaveHistory() {
+       if GetGlobalOption("savehistory").(bool) {
+               // Don't save history past 100
+               for k, v := range m.history {
+                       if len(v) > 100 {
+                               m.history[k] = v[len(m.history[k])-100:]
+                       }
+               }
+
+               file, err := os.Create(configDir + "/buffers/history")
+               defer file.Close()
+               if err == nil {
+                       encoder := gob.NewEncoder(file)
+
+                       err = encoder.Encode(m.history)
+                       if err != nil {
+                               m.Error("Error saving history:", err)
+                               return
+                       }
+               }
+       }
+}
+
 // A GutterMessage is a message displayed on the side of the editor
 type GutterMessage struct {
        lineNum int