Fix weird behavior of JumpToMatchingBrace in some ill cases (#1966)

[micro.git] / internal / display / termwindow.go

diff --git a/internal/display/termwindow.go b/internal/display/termwindow.go
index 95a9003764064f5aade804ebbcc2e202b0bb40e1..6c30fa7f36bff26eae5bb5f816b4a638cc597214 100644 (file)
--- a/internal/display/termwindow.go
+++ b/internal/display/termwindow.go
@@ -1,13 +1,12 @@
 package display
 
 import (
-       "unicode/utf8"
-
-       "github.com/zyedidia/micro/internal/buffer"
-       "github.com/zyedidia/micro/internal/config"
-       "github.com/zyedidia/micro/internal/screen"
-       "github.com/zyedidia/micro/internal/shell"
-       "github.com/zyedidia/tcell"
+       "github.com/zyedidia/micro/v2/internal/buffer"
+       "github.com/zyedidia/micro/v2/internal/config"
+       "github.com/zyedidia/micro/v2/internal/screen"
+       "github.com/zyedidia/micro/v2/internal/shell"
+       "github.com/zyedidia/micro/v2/internal/util"
+       "github.com/zyedidia/tcell/v2"
        "github.com/zyedidia/terminal"
 )
 
@@ -51,7 +50,7 @@ func (w *TermWindow) LocFromVisual(vloc buffer.Loc) buffer.Loc {
 func (w *TermWindow) Clear() {
        for y := 0; y < w.Height; y++ {
                for x := 0; x < w.Width; x++ {
-                       screen.Screen.SetContent(w.X+x, w.Y+y, ' ', nil, config.DefStyle)
+                       screen.SetContent(w.X+x, w.Y+y, ' ', nil, config.DefStyle)
                }
        }
 }
@@ -82,13 +81,13 @@ func (w *TermWindow) Display() {
                        if b == terminal.DefaultBG {
                                bg = int(tcell.ColorDefault)
                        }
-                       st := tcell.StyleDefault.Foreground(config.GetColor256(int(fg))).Background(config.GetColor256(int(bg)))
+                       st := tcell.StyleDefault.Foreground(config.GetColor256(fg)).Background(config.GetColor256(bg))
 
                        if l.LessThan(w.Selection[1]) && l.GreaterEqual(w.Selection[0]) || l.LessThan(w.Selection[0]) && l.GreaterEqual(w.Selection[1]) {
                                st = st.Reverse(true)
                        }
 
-                       screen.Screen.SetContent(w.X+x, w.Y+y, c, nil, st)
+                       screen.SetContent(w.X+x, w.Y+y, c, nil, st)
                }
        }
        if config.GetGlobalOption("statusline").(bool) {
@@ -98,19 +97,19 @@ func (w *TermWindow) Display() {
                }
 
                text := []byte(w.Name())
-               textLen := utf8.RuneCount(text)
+               textLen := util.CharacterCount(text)
                for x := 0; x < w.Width; x++ {
                        if x < textLen {
-                               r, size := utf8.DecodeRune(text)
+                               r, combc, size := util.DecodeCharacter(text)
                                text = text[size:]
-                               screen.Screen.SetContent(w.X+x, w.Y+w.Height, r, nil, statusLineStyle)
+                               screen.SetContent(w.X+x, w.Y+w.Height, r, combc, statusLineStyle)
                        } else {
-                               screen.Screen.SetContent(w.X+x, w.Y+w.Height, ' ', nil, statusLineStyle)
+                               screen.SetContent(w.X+x, w.Y+w.Height, ' ', nil, statusLineStyle)
                        }
                }
        }
        if w.State.CursorVisible() && w.active {
                curx, cury := w.State.Cursor()
-               screen.Screen.ShowCursor(curx+w.X, cury+w.Y)
+               screen.ShowCursor(curx+w.X, cury+w.Y)
        }
 }