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

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

diff --git a/internal/display/window.go b/internal/display/window.go
index bed538c5f8b4b4deb03d4e5ffc64211470b06f68..a321cf4f01ae85ba46c62733f6122edc2528dbbb 100644 (file)
--- a/internal/display/window.go
+++ b/internal/display/window.go
@@ -1,17 +1,20 @@
 package display
 
 import (
-       "github.com/zyedidia/micro/internal/buffer"
+       "github.com/zyedidia/micro/v2/internal/buffer"
 )
 
 type View struct {
        X, Y          int // X,Y location of the view
        Width, Height int // Width and height of the view
 
-       // Start line and start column of the view (vertical/horizontal scroll)
+       // Start line of the view (for vertical scroll)
+       StartLine SLoc
+
+       // Start column of the view (for horizontal scroll)
        // note that since the starting column of every line is different if the view
        // is scrolled, StartCol is a visual index (will be the same for every line)
-       StartLine, StartCol int
+       StartCol int
 }
 
 type Window interface {
@@ -28,5 +31,7 @@ type Window interface {
 
 type BWindow interface {
        Window
+       SoftWrap
        SetBuffer(b *buffer.Buffer)
+       BufView() View
 }