view: Incremental adjustments done to syntax highlighting

Requires pulling the latest changes from github.com/quarnster/parser
and github.com/quarnster/util

README.md

@@ -125,6 +125,8 @@ Done!
 	cd ../frontend/termbox
 	go run main.go
 
+Press Ctrl+Q to exit.
+
 # To use qt5 frontend
 
 	cd ../frontend/qt5

backend/parser/parser.go

@@ -19,9 +19,10 @@ type (
 	}
 
 	SyntaxHighlighter interface {
+		Adjust(position, delta int)
 		ScopeExtent(point int) text.Region
 		ScopeName(point int) string
-		Flatten(viewport text.Region) []NamedRegion
+		//		Flatten() []NamedRegion
 	}
 
 	nodeHighlighter struct {
@@ -129,6 +130,10 @@ func (nh *nodeHighlighter) flatten(in []NamedRegion, scopename string, node *par
 	return in
 }
 
-func (nh *nodeHighlighter) Flatten(viewport text.Region) []NamedRegion {
-	return nh.flatten(nil, "", nh.rootNode)
+func (nh *nodeHighlighter) Adjust(position, delta int) {
+	nh.rootNode.Adjust(position, delta)
 }
+
+// func (nh *nodeHighlighter) Flatten() []NamedRegion {
+// 	return nh.flatten(nil, "", nh.rootNode)
+// }

backend/render/renderer.go

@@ -11,11 +11,12 @@ type (
 	Colour color.RGBA
 
 	// The Flavour struct contains the specific settings
-	// used to style a particular section of text.
+	// used to style a particular Region.
 	Flavour struct {
 		Background Colour
 		Foreground Colour
 		Font       Font
+		Flags      ViewRegionFlags
 	}
 
 	// The Recipe type groups text.RegionSets by their Flavour.

backend/render/view.go

@@ -18,6 +18,7 @@ const (
 	FOREGROUND
 	SELECTION
 	HIGHLIGHT
+	DRAW_TEXT
 	DEFAULT ViewRegionFlags = 0
 )
 

backend/view.go

@@ -104,22 +104,25 @@ func (v *View) setBuffer(b Buffer) error {
 	}
 	v.buffer = b
 	// TODO(q): Dynamically load the correct syntax file
-	b.AddCallback(func(_ Buffer, a, b int) {
-		v.flush(a, b)
+	b.AddCallback(func(_ Buffer, position, delta int) {
+		v.flush(position, delta)
 	})
 	return nil
 }
 
-func (v *View) flush(a, b int) {
+func (v *View) flush(position, delta int) {
 	func() {
 		v.lock.Lock()
 		defer v.lock.Unlock()
 
 		e := Prof.Enter("view.flush")
 		defer e.Exit()
-		v.selection.Adjust(a, b)
+		v.selection.Adjust(position, delta)
+		if v.syntax != nil {
+			v.syntax.Adjust(position, delta)
+		}
 		for k, v2 := range v.regions {
-			v2.Regions.Adjust(a, b)
+			v2.Regions.Adjust(position, delta)
 			v.regions[k] = v2
 		}
 	}()
@@ -129,6 +132,7 @@ func (v *View) flush(a, b int) {
 
 func (v *View) parsethread() {
 	pc := 0
+	lastParse := -1
 	doparse := func() {
 		p := Prof.Enter("syntax.parse")
 		defer p.Exit()
@@ -155,15 +159,20 @@ func (v *View) parsethread() {
 			} else {
 				v.lock.Lock()
 				defer v.lock.Unlock()
-				v.syntax = syn
+				// Only set if it isn't invalid already, otherwise the
+				// current syntax highlighting will be more accurate
+				// as it will have had incremental adjustments done to it
+				if v.buffer.ChangeCount() == lastParse {
+					v.syntax = syn
+				}
 			}
 		}
 	}
-	lastParse := -1
 	for pr := range v.reparseChan {
 		if cc := v.buffer.ChangeCount(); lastParse != cc || pr.forced {
 			lastParse = cc
 			doparse()
+			v.Settings().Set("lime.syntax.updated", lastParse)
 		}
 	}
 }