Moved lime/backend/primitives to github.com/quarnster/util/text

backend/commands/find.go

@@ -1,8 +1,8 @@
 package commands
 
 import (
+	. "github.com/quarnster/util/text"
 	. "lime/backend"
-	. "lime/backend/primitives"
 )
 
 type (

backend/commands/glue_test.go

@@ -1,8 +1,8 @@
 package commands
 
 import (
+	"github.com/quarnster/util/text"
 	. "lime/backend"
-	"lime/backend/primitives"
 	"testing"
 )
 
@@ -23,24 +23,24 @@ func TestGlueCmds(t *testing.T) {
 	ch.RunTextCommand(v, "glue_marked_undo_groups", nil)
 	if v.UndoStack().Position() != 1 {
 		t.Error(v.UndoStack().Position())
-	} else if d := v.Buffer().Substr(primitives.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
+	} else if d := v.Buffer().Substr(text.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
 		t.Error(d)
 	}
 	ch.RunTextCommand(v, "undo", nil)
-	if d := v.Buffer().Substr(primitives.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\n" {
+	if d := v.Buffer().Substr(text.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\n" {
 		t.Error(d)
 	}
 	ch.RunTextCommand(v, "redo", nil)
-	if d := v.Buffer().Substr(primitives.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
+	if d := v.Buffer().Substr(text.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
 		t.Error(d)
 	}
 	if v.UndoStack().Position() != 1 {
 		t.Error(v.UndoStack().Position())
-	} else if d := v.Buffer().Substr(primitives.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
+	} else if d := v.Buffer().Substr(text.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
 		t.Error(d)
 	}
 	ch.RunTextCommand(v, "undo", nil)
-	if d := v.Buffer().Substr(primitives.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\n" {
+	if d := v.Buffer().Substr(text.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\n" {
 		t.Error(d)
 	}
 
@@ -54,20 +54,20 @@ func TestGlueCmds(t *testing.T) {
 	ch.RunTextCommand(v, "glue_marked_undo_groups", nil)
 	if v.UndoStack().Position() != 1 {
 		t.Error(v.UndoStack().Position())
-	} else if d := v.Buffer().Substr(primitives.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
+	} else if d := v.Buffer().Substr(text.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
 		t.Error(d)
 	}
 	ch.RunTextCommand(v, "undo", nil)
-	if d := v.Buffer().Substr(primitives.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\n" {
+	if d := v.Buffer().Substr(text.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\n" {
 		t.Error(d)
 	}
 	ch.RunTextCommand(v, "redo", nil)
-	if d := v.Buffer().Substr(primitives.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
+	if d := v.Buffer().Substr(text.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
 		t.Error(d)
 	}
 	if v.UndoStack().Position() != 1 {
 		t.Error(v.UndoStack().Position())
-	} else if d := v.Buffer().Substr(primitives.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
+	} else if d := v.Buffer().Substr(text.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
 		t.Error(d)
 	}
 
@@ -82,14 +82,14 @@ func TestGlueCmds(t *testing.T) {
 	ch.RunTextCommand(v, "glue_marked_undo_groups", nil)
 	if v.UndoStack().Position() != 2 {
 		t.Error(v.UndoStack().Position())
-	} else if d := v.Buffer().Substr(primitives.Region{0, v.Buffer().Size()}); d != "Helabc" {
+	} else if d := v.Buffer().Substr(text.Region{0, v.Buffer().Size()}); d != "Helabc" {
 		t.Error(d)
 	}
 
 	ch.RunTextCommand(v, "undo", nil)
 	if v.UndoStack().Position() != 1 {
 		t.Error(v.UndoStack().Position())
-	} else if d := v.Buffer().Substr(primitives.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
+	} else if d := v.Buffer().Substr(text.Region{0, v.Buffer().Size()}); d != "Hello World!\nTest123123\nAbrakadabra\nabc" {
 		t.Error(d)
 	}
 }

backend/commands/insdel.go

@@ -2,8 +2,8 @@ package commands
 
 import (
 	"fmt"
+	"github.com/quarnster/util/text"
 	. "lime/backend"
-	"lime/backend/primitives"
 )
 
 type (
@@ -66,7 +66,7 @@ func (c *LeftDeleteCommand) Run(v *View, e *Edit, args Args) error {
 				if prev_col < 0 {
 					prev_col = 0
 				}
-				d := v.Buffer().SubstrR(primitives.Region{prev_col, r.A})
+				d := v.Buffer().SubstrR(text.Region{prev_col, r.A})
 				i := len(d) - 1
 				for r.A > prev_col && i >= 0 && d[i] == ' ' {
 					r.A--

backend/commands/insdel_test.go

@@ -1,8 +1,8 @@
 package commands
 
 import (
+	. "github.com/quarnster/util/text"
 	. "lime/backend"
-	. "lime/backend/primitives"
 	"reflect"
 	"strings"
 	"testing"

backend/commands/move.go

@@ -2,8 +2,8 @@ package commands
 
 import (
 	"fmt"
+	"github.com/quarnster/util/text"
 	. "lime/backend"
-	"lime/backend/primitives"
 	"lime/backend/util"
 )
 
@@ -21,7 +21,7 @@ type (
 	}
 )
 
-func move_action(v *View, extend bool, transform func(r primitives.Region) int) {
+func move_action(v *View, extend bool, transform func(r text.Region) int) {
 	sel := v.Sel()
 	r := sel.Regions()
 	for i := range r {
@@ -40,21 +40,21 @@ func (c *MoveToCommand) Run(v *View, e *Edit, args Args) error {
 
 	switch to {
 	case "eol":
-		move_action(v, extend, func(r primitives.Region) int {
+		move_action(v, extend, func(r text.Region) int {
 			line := v.Buffer().Line(r.B)
 			return line.B
 		})
 	case "bol":
-		move_action(v, extend, func(r primitives.Region) int {
+		move_action(v, extend, func(r text.Region) int {
 			line := v.Buffer().Line(r.B)
 			return line.A
 		})
 	case "bof":
-		move_action(v, extend, func(r primitives.Region) int {
+		move_action(v, extend, func(r text.Region) int {
 			return 0
 		})
 	case "eof":
-		move_action(v, extend, func(r primitives.Region) int {
+		move_action(v, extend, func(r text.Region) int {
 			return v.Buffer().Size()
 		})
 	default:
@@ -84,12 +84,12 @@ func (c *MoveCommand) Run(v *View, e *Edit, args Args) error {
 		if !fwd {
 			dir = -1
 		}
-		move_action(v, extend, func(r primitives.Region) int {
+		move_action(v, extend, func(r text.Region) int {
 			return r.B + dir
 		})
 	case "stops":
-		move_action(v, extend, func(r primitives.Region) int {
-			var next primitives.Region
+		move_action(v, extend, func(r text.Region) int {
+			var next text.Region
 			word := v.Buffer().Word(r.B)
 			if word_end && fwd && r.B < word.End() {
 				next = word
@@ -110,7 +110,7 @@ func (c *MoveCommand) Run(v *View, e *Edit, args Args) error {
 			return r.B
 		})
 	case "lines":
-		move_action(v, extend, func(in primitives.Region) int {
+		move_action(v, extend, func(in text.Region) int {
 			r, c := v.Buffer().RowCol(in.B)
 			_ = r
 			if !fwd {
@@ -153,7 +153,7 @@ func (c *ScrollLinesCommand) Run(v *View, e *Edit, args Args) error {
 		r -= amount
 	}
 	r = v.Buffer().TextPoint(r, 0)
-	fe.Show(v, primitives.Region{r, r})
+	fe.Show(v, text.Region{r, r})
 	return nil
 }
 

backend/commands/move_test.go

@@ -1,8 +1,8 @@
 package commands
 
 import (
+	. "github.com/quarnster/util/text"
 	. "lime/backend"
-	. "lime/backend/primitives"
 	"reflect"
 	"testing"
 )

backend/commands/undoredo_test.go

@@ -1,8 +1,8 @@
 package commands
 
 import (
+	. "github.com/quarnster/util/text"
 	. "lime/backend"
-	. "lime/backend/primitives"
 	"testing"
 )
 

backend/editor.go

@@ -3,9 +3,9 @@ package backend
 import (
 	"code.google.com/p/log4go"
 	"fmt"
+	. "github.com/quarnster/util/text"
 	"io/ioutil"
 	"lime/backend/loaders"
-	. "lime/backend/primitives"
 	. "lime/backend/util"
 	"runtime"
 	"runtime/debug"

backend/loaders/json.go

@@ -4,8 +4,8 @@ import (
 	sj "encoding/json"
 	"errors"
 	"fmt"
+	. "github.com/quarnster/util/text"
 	"lime/backend/loaders/json"
-	. "lime/backend/primitives"
 )
 
 func LoadJSON(data []byte, intf interface{}) error {

backend/parser/parser.go

@@ -3,7 +3,7 @@ package parser
 import (
 	"bytes"
 	"github.com/quarnster/parser"
-	"lime/backend/primitives"
+	"github.com/quarnster/util/text"
 	"sort"
 	"sync"
 )
@@ -14,14 +14,14 @@ type (
 	}
 
 	NamedRegion struct {
-		primitives.Region
+		text.Region
 		Name string
 	}
 
 	SyntaxHighlighter interface {
-		ScopeExtent(point int) primitives.Region
+		ScopeExtent(point int) text.Region
 		ScopeName(point int) string
-		Flatten(viewport primitives.Region) []NamedRegion
+		Flatten(viewport text.Region) []NamedRegion
 	}
 
 	nodeHighlighter struct {
@@ -92,13 +92,13 @@ func (nh *nodeHighlighter) updateScope(point int) {
 	}
 }
 
-func (nh *nodeHighlighter) ScopeExtent(point int) primitives.Region {
+func (nh *nodeHighlighter) ScopeExtent(point int) text.Region {
 	nh.updateScope(point)
 	if nh.lastScopeNode != nil {
 		r := nh.lastScopeNode.Range
-		return primitives.Region{r.Start, r.End}
+		return text.Region{r.Start, r.End}
 	}
-	return primitives.Region{}
+	return text.Region{}
 }
 
 func (nh *nodeHighlighter) ScopeName(point int) string {
@@ -129,6 +129,6 @@ func (nh *nodeHighlighter) flatten(in []NamedRegion, scopename string, node *par
 	return in
 }
 
-func (nh *nodeHighlighter) Flatten(viewport primitives.Region) []NamedRegion {
+func (nh *nodeHighlighter) Flatten(viewport text.Region) []NamedRegion {
 	return nh.flatten(nil, "", nh.rootNode)
 }