Remove unused syntax highlighting code and optimize IsDirty()

cmd/micro/buffer.go

@@ -19,8 +19,9 @@ type Buffer struct {
 	name string
 
 	// This is the text stored every time the buffer is saved to check if the buffer is modified
-	savedText     string
-	netInsertions int
+	savedText           string
+	netInsertions       int
+	dirtySinceLastCheck bool
 
 	// Provide efficient and easy access to text and lines so the rope String does not
 	// need to be constantly recalculated
@@ -86,14 +87,20 @@ func (b *Buffer) SaveAs(filename string) error {
 
 // IsDirty returns whether or not the buffer has been modified compared to the one on disk
 func (b *Buffer) IsDirty() bool {
+	if !b.dirtySinceLastCheck {
+		return false
+	}
 	if b.netInsertions == 0 {
-		return b.savedText != b.text
+		isDirty := b.savedText != b.text
+		b.dirtySinceLastCheck = isDirty
+		return isDirty
 	}
 	return true
 }
 
 // Insert a string into the rope
 func (b *Buffer) Insert(idx int, value string) {
+	b.dirtySinceLastCheck = true
 	b.netInsertions += len(value)
 	b.r = b.r.Insert(idx, value)
 	b.Update()
@@ -102,6 +109,7 @@ func (b *Buffer) Insert(idx int, value string) {
 // Remove a slice of the rope from start to end (exclusive)
 // Returns the string that was removed
 func (b *Buffer) Remove(start, end int) string {
+	b.dirtySinceLastCheck = true
 	b.netInsertions -= end - start
 	if start < 0 {
 		start = 0

cmd/micro/highlighter.go

@@ -377,9 +377,8 @@ func GetRules(buf *Buffer) ([]SyntaxRule, string) {
 // so map[3] represents the style of the third character
 type SyntaxMatches [][]tcell.Style
 
-// Match takes a buffer and returns the syntax matches a map specifying how it should be syntax highlighted
-// We need to check the start-end regexes for the entire buffer every time Match is called, but for the
-// non start-end rules, we only have to update the updateLines provided by the view
+// Match takes a buffer and returns the syntax matches: a 2d array specifying how it should be syntax highlighted
+// We match the rules from up `synLinesUp` lines and down `synLinesDown` lines
 func Match(v *View) SyntaxMatches {
 	buf := v.buf
 	rules := v.buf.rules
@@ -390,17 +389,7 @@ func Match(v *View) SyntaxMatches {
 		viewEnd = len(buf.lines)
 	}
 
-	// updateStart := v.updateLines[0]
-	// updateEnd := v.updateLines[1]
-	//
-	// if updateEnd > len(buf.lines) {
-	// 	updateEnd = len(buf.lines)
-	// }
-	// if updateStart < 0 {
-	// 	updateStart = 0
-	// }
 	lines := buf.lines[viewStart:viewEnd]
-	// updateLines := buf.lines[updateStart:updateEnd]
 	matches := make(SyntaxMatches, len(lines))
 
 	for i, line := range lines {
@@ -448,7 +437,6 @@ func Match(v *View) SyntaxMatches {
 				if indicies := rule.regex.FindAllStringIndex(line, -1); indicies != nil {
 					for _, value := range indicies {
 						for i := value[0]; i < value[1]; i++ {
-							// matches[lineN+updateStart][i] = rule.style
 							matches[lineN][i] = rule.style
 						}
 					}

cmd/micro/view.go

@@ -60,9 +60,6 @@ type View struct {
 	matches SyntaxMatches
 	// The matches from the last frame
 	lastMatches SyntaxMatches
-
-	// This is the range of lines that should have their syntax highlighting updated
-	updateLines [2]int
 }
 
 // NewView returns a new fullscreen view
@@ -75,20 +72,11 @@ func NewView(buf *Buffer) *View {
 func NewViewWidthHeight(buf *Buffer, w, h int) *View {
 	v := new(View)
 
-	v.buf = buf
-
 	v.widthPercent = w
 	v.heightPercent = h
 	v.Resize(screen.Size())
 
-	v.topline = 0
-	// Put the cursor at the first spot
-	v.cursor = Cursor{
-		x: 0,
-		y: 0,
-		v: v,
-	}
-	v.cursor.ResetSelection()
+	v.OpenBuffer(buf)
 
 	v.eh = NewEventHandler(v)
 
@@ -96,24 +84,9 @@ func NewViewWidthHeight(buf *Buffer, w, h int) *View {
 		view: v,
 	}
 
-	// Update the syntax highlighting for the entire buffer at the start
-	v.UpdateLines(v.topline, v.topline+v.height)
-	v.matches = Match(v)
-
-	// Set mouseReleased to true because we assume the mouse is not being pressed when
-	// the editor is opened
-	v.mouseReleased = true
-	v.lastClickTime = time.Time{}
-
 	return v
 }
 
-// UpdateLines sets the values for v.updateLines
-func (v *View) UpdateLines(start, end int) {
-	v.updateLines[0] = start
-	v.updateLines[1] = end + 1
-}
-
 // Resize recalculates the actual width and height of the view from the width and height
 // percentages
 // This is usually called when the window is resized, or when a split has been added and
@@ -281,6 +254,7 @@ func (v *View) SelectAll() {
 func (v *View) OpenBuffer(buf *Buffer) {
 	v.buf = buf
 	v.topline = 0
+	v.leftCol = 0
 	// Put the cursor at the first spot
 	v.cursor = Cursor{
 		x: 0,
@@ -290,7 +264,6 @@ func (v *View) OpenBuffer(buf *Buffer) {
 	v.cursor.ResetSelection()
 
 	v.eh = NewEventHandler(v)
-
 	v.matches = Match(v)
 
 	// Set mouseReleased to true because we assume the mouse is not being pressed when
@@ -375,8 +348,6 @@ func (v *View) HandleEvent(event tcell.Event) {
 	// By default it's true because most events should cause a relocate
 	relocate := true
 
-	// By default we don't update and syntax highlighting
-	v.UpdateLines(-2, 0)
 	switch e := event.(type) {
 	case *tcell.EventResize:
 		// Window resized
@@ -407,10 +378,7 @@ func (v *View) HandleEvent(event tcell.Event) {
 			}
 			v.eh.Insert(v.cursor.Loc(), "\n")
 			v.cursor.Right()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
 			v.cursor.lastVisualX = v.cursor.GetVisualX()
-			// v.UpdateLines(v.cursor.y-1, v.cursor.y)
 		case tcell.KeySpace:
 			// Insert a space
 			if v.cursor.HasSelection() {
@@ -419,14 +387,11 @@ func (v *View) HandleEvent(event tcell.Event) {
 			}
 			v.eh.Insert(v.cursor.Loc(), " ")
 			v.cursor.Right()
-			v.UpdateLines(v.cursor.y, v.cursor.y)
 		case tcell.KeyBackspace2, tcell.KeyBackspace:
 			// Delete a character
 			if v.cursor.HasSelection() {
 				v.cursor.DeleteSelection()
 				v.cursor.ResetSelection()
-				// Rehighlight the entire buffer
-				v.UpdateLines(v.topline, v.topline+v.height)
 			} else if v.cursor.Loc() > 0 {
 				// We have to do something a bit hacky here because we want to
 				// delete the line by first moving left and then deleting backwards
@@ -439,9 +404,6 @@ func (v *View) HandleEvent(event tcell.Event) {
 				loc := v.cursor.Loc()
 				v.eh.Remove(loc-1, loc)
 				v.cursor.x, v.cursor.y = cx, cy
-				// Rehighlight the entire buffer
-				v.UpdateLines(v.topline, v.topline+v.height)
-				// v.UpdateLines(v.cursor.y, v.cursor.y+1)
 			}
 			v.cursor.lastVisualX = v.cursor.GetVisualX()
 		case tcell.KeyTab:
@@ -459,7 +421,6 @@ func (v *View) HandleEvent(event tcell.Event) {
 				v.eh.Insert(v.cursor.Loc(), "\t")
 				v.cursor.Right()
 			}
-			v.UpdateLines(v.cursor.y, v.cursor.y)
 		case tcell.KeyCtrlS:
 			v.Save()
 		case tcell.KeyCtrlF:
@@ -487,30 +448,18 @@ func (v *View) HandleEvent(event tcell.Event) {
 			Search(lastSearch, v, false)
 		case tcell.KeyCtrlZ:
 			v.eh.Undo()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
 		case tcell.KeyCtrlY:
 			v.eh.Redo()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
 		case tcell.KeyCtrlC:
 			v.Copy()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
 		case tcell.KeyCtrlX:
 			v.Cut()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
 		case tcell.KeyCtrlV:
 			v.Paste()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
 		case tcell.KeyCtrlA:
 			v.SelectAll()
 		case tcell.KeyCtrlO:
 			v.OpenFile()
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
 		case tcell.KeyHome:
 			v.topline = 0
 			relocate = false
@@ -538,10 +487,6 @@ func (v *View) HandleEvent(event tcell.Event) {
 			if v.cursor.HasSelection() {
 				v.cursor.DeleteSelection()
 				v.cursor.ResetSelection()
-				// Rehighlight the entire buffer
-				v.UpdateLines(v.topline, v.topline+v.height)
-			} else {
-				v.UpdateLines(v.cursor.y, v.cursor.y)
 			}
 			v.eh.Insert(v.cursor.Loc(), string(e.Rune()))
 			v.cursor.Right()
@@ -623,15 +568,11 @@ func (v *View) HandleEvent(event tcell.Event) {
 			v.ScrollUp(2)
 			// We don't want to relocate if the user is scrolling
 			relocate = false
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
 		case tcell.WheelDown:
 			// Scroll down two lines
 			v.ScrollDown(2)
 			// We don't want to relocate if the user is scrolling
 			relocate = false
-			// Rehighlight the entire buffer
-			v.UpdateLines(v.topline, v.topline+v.height)
 		}
 	}
 
@@ -645,21 +586,7 @@ func (v *View) HandleEvent(event tcell.Event) {
 
 // DisplayView renders the view to the screen
 func (v *View) DisplayView() {
-	// matches := make(SyntaxMatches, len(v.buf.lines))
-	//
-	// viewStart := v.topline
-	// viewEnd := v.topline + v.height
-	// if viewEnd > len(v.buf.lines) {
-	// 	viewEnd = len(v.buf.lines)
-	// }
-	//
-	// lines := v.buf.lines[viewStart:viewEnd]
-	// for i, line := range lines {
-	// 	matches[i] = make([]tcell.Style, len(line))
-	// }
-
 	// The character number of the character in the top left of the screen
-
 	charNum := ToCharPos(0, v.topline, v.buf)
 
 	// Convert the length of buffer to a string, and get the length of the string
@@ -708,17 +635,10 @@ func (v *View) DisplayView() {
 			}
 			ch := runes[colN]
 			var lineStyle tcell.Style
-			// Does the current character need to be syntax highlighted?
-
-			// if lineN >= v.updateLines[0] && lineN < v.updateLines[1] {
 			if settings.Syntax {
+				// Syntax highlighting is enabled
 				highlightStyle = v.matches[lineN][colN]
 			}
-			// } else if lineN < len(v.lastMatches) && colN < len(v.lastMatches[lineN]) {
-			// highlightStyle = v.lastMatches[lineN][colN]
-			// } else {
-			// highlightStyle = defStyle
-			// }
 
 			if v.cursor.HasSelection() &&
 				(charNum >= v.cursor.curSelection[0] && charNum < v.cursor.curSelection[1] ||
@@ -732,7 +652,6 @@ func (v *View) DisplayView() {
 			} else {
 				lineStyle = highlightStyle
 			}
-			// matches[lineN][colN] = highlightStyle
 
 			if ch == '\t' {
 				screen.SetContent(x+tabchars, lineN, ' ', nil, lineStyle)