wip: fixing highlighting

.gitignore

@@ -1,10 +1,14 @@
 .idea/
-dist/
-/test/
 .gopad/
 
+/dist/
+/test/
+/config/grammars/
+
 go.work
 go.work.sum
-/debug.log
-/lsp.log
-/config/grammars/
+
+debug.log
+lsp.log
+trace.log
+panic.log

config/languages.toml

@@ -16,6 +16,7 @@ line_comment_tokens = ['//']
 block_comment_tokens = [{ start = '/*', end = '*/' }]
 auto_pairs = [{ open = '(', close = ')' }, { open = '{', close = '}' }, { open = '[', close = ']' }, { open = '"', close = '"' }, { open = "'", close = "'" }, { open = '`', close = '`' }]
 grammar = { name = 'go', symbol_name = 'go', install = { git = '/~https://github.com/tree-sitter/tree-sitter-go', rev = '7ee8d928db5202f6831a78f8112fd693bf69f98b', ref = 'master', ref_type = 'commit' } }
+formatter = { command = 'gofmt', args = ['-s'] }
 
 [languages.go-mod]
 alt_names = ['go.mod']

gopad/editor/buffer/buffer.go

@@ -62,7 +62,7 @@ type Buffer interface {
 	// Bytes returns the buffer as a byte slice. This uses \n as the line ending.
 	Bytes() []byte
 	// BytesRange returns the buffer as a byte slice from the given range. This uses \n as the line ending.
-	BytesRange(r Range) []byte
+	BytesRange(r ByteRange) []byte
 	// Rune returns the rune at the given index.
 	Rune(i int) rune
 
@@ -90,11 +90,11 @@ type Buffer interface {
 	LineLen(l int) int
 
 	// Insert inserts text at the given position.
-	Insert(p Point, text []byte)
+	Insert(i uint, text []byte)
 	// Replace replaces the text in the given range with the given text.
-	Replace(r Range, text []byte)
+	Replace(r ByteRange, text []byte)
 	// Delete deletes the range of text between the two positions.
-	Delete(r Range)
+	Delete(r ByteRange)
 }
 
 // Line represents a line in a buffer.

gopad/editor/buffer/byte_range.go

@@ -0,0 +1,47 @@
+package buffer
+
+import (
+	"github.com/tree-sitter/go-tree-sitter"
+)
+
+func NewByteRange(startByte uint, endByte uint) ByteRange {
+	return ByteRange{
+		StartByte: startByte,
+		EndByte:   endByte,
+	}
+}
+
+func ParseByteRange(r tree_sitter.Range) ByteRange {
+	return ByteRange{
+		StartByte: r.StartByte,
+		EndByte:   r.EndByte,
+	}
+}
+
+type ByteRange struct {
+	StartByte uint
+	EndByte   uint
+}
+
+func (r ByteRange) Contains(i uint) bool {
+	return i >= r.StartByte && i <= r.EndByte
+}
+
+func (r ByteRange) ContainsRange(other ByteRange) bool {
+	return r.StartByte <= other.StartByte && r.EndByte >= other.EndByte
+}
+
+func (r ByteRange) IsEmpty() bool {
+	return r.StartByte == r.EndByte
+}
+
+func (r ByteRange) Bytes() uint {
+	return r.EndByte - r.StartByte
+}
+
+func (r ByteRange) ToTreeSitter() tree_sitter.Range {
+	return tree_sitter.Range{
+		StartByte: r.StartByte,
+		EndByte:   r.EndByte,
+	}
+}

gopad/editor/doc/change.go

@@ -2,6 +2,7 @@ package doc
 
 import (
 	"iter"
+	"slices"
 
 	"go.gopad.dev/gopad/gopad/editor/buffer"
 	"go.gopad.dev/gopad/internal/xbytes"
@@ -141,18 +142,16 @@ func (c ChangeSet) Invert(originalBuf buffer.Buffer) ChangeSet {
 		LenAfter: 0,
 	}
 
-	var pos int
+	var pos uint
 	for _, change := range c.Changes {
 		switch change := change.(type) {
 		case Move:
 			changes.Move(change.N)
-			pos += change.N
+			pos = uint(int(pos) + change.N)
 		case Delete:
-			start := originalBuf.Position(pos)
-			end := originalBuf.Position(pos + change.N)
-			text := originalBuf.BytesRange(buffer.Range{Start: start, End: end})
+			text := originalBuf.BytesRange(buffer.ByteRange{StartByte: pos, EndByte: uint(int(pos) + change.N)})
 			changes.Insert(text)
-			pos += change.N
+			pos = uint(int(pos) + change.N)
 		case Insert:
 			changes.Delete(xbytes.RuneCount(change.Text))
 		}
@@ -166,18 +165,16 @@ func (c ChangeSet) Apply(buf buffer.Buffer) bool {
 		return false
 	}
 
-	var pos int
+	var pos uint
 	for _, change := range c.Changes {
 		switch change := change.(type) {
 		case Move:
-			pos += change.N
+			pos = uint(int(pos) + change.N)
 		case Delete:
-			start := buf.Position(pos)
-			end := buf.Position(pos + change.N)
-			buf.Delete(buffer.Range{Start: start, End: end})
+			buf.Delete(buffer.ByteRange{StartByte: pos, EndByte: uint(int(pos) + change.N)})
 		case Insert:
-			buf.Insert(buf.Position(pos), change.Text)
-			pos += xbytes.RuneCount(change.Text)
+			buf.Insert(pos, change.Text)
+			pos += uint(xbytes.RuneCount(change.Text))
 		}
 	}
 
@@ -317,6 +314,36 @@ func (c ChangeSet) Merge(other ChangeSet) ChangeSet {
 	}
 }
 
+func (c ChangeSet) UpdatePosition(selections []Selection) []Selection {
+	slices.SortFunc(selections, func(a, b Selection) int {
+		return int(a.Anchor) - int(b.Anchor)
+	})
+
+	for i, selection := range selections {
+		anchor := selection.Anchor
+		head := selection.Head
+		for _, change := range c.Changes {
+			switch change := change.(type) {
+			case Move:
+				anchor = uint(int(anchor) + change.N)
+				head = uint(int(head) + change.N)
+			case Delete:
+				anchor = uint(int(anchor) + change.N)
+				head += uint(int(head) + change.N)
+			case Insert:
+				anchor += uint(xbytes.RuneCount(change.Text))
+				head += uint(xbytes.RuneCount(change.Text))
+			}
+		}
+		selections[i] = Selection{
+			Anchor: anchor,
+			Head:   head,
+		}
+	}
+
+	return selections
+}
+
 func newChangeIterator(changeSet ChangeSet) *changeIterator {
 	return &changeIterator{
 		changes: changeSet.Changes,