github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-02-17 12:30:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix serialization

Browse Source
This commit is contained in:
Zachary Yedidia
2018-08-29 20:53:40 -04:00
parent ab37901f98
commit 47c899ae46
6 changed files with 68 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/micro/action/actions.go
View File

@@ -348,6 +348,7 @@ func (h *BufHandler) SaveAll() bool {
// Save the buffer to disk
func (h *BufHandler) Save() bool {
h.Buf.Save()
return false
}

5
cmd/micro/action/bufhandler.go
View File

@@ -85,10 +85,7 @@ func NewBufHandler(buf *buffer.Buffer) *BufHandler {
h := new(BufHandler)
h.Buf = buf
h.cursors = []*buffer.Cursor{&buffer.Cursor{
Buf: buf,
Loc: buf.StartCursor,
}}
h.cursors = []*buffer.Cursor{buffer.NewCursor(buf, buf.StartCursor)}
h.Cursor = h.cursors[0]
buf.SetCursors(h.cursors)

8
cmd/micro/buffer/buffer.go
View File

@@ -96,14 +96,6 @@ type Buffer struct {
Type BufType
}
// The SerializedBuffer holds the types that get serialized when a buffer is saved
// These are used for the savecursor and saveundo options
type SerializedBuffer struct {
EventHandler *EventHandler
Cursor Loc
ModTime time.Time
}
// NewBufferFromFile opens a new buffer using the given path
// It will also automatically handle `~`, and line/column with filename:l:c
// It will return an empty buffer if the path does not exist

89
cmd/micro/buffer/cursor.go
View File

@@ -20,7 +20,7 @@ func InBounds(pos Loc, buf *Buffer) bool {
// The Cursor struct stores the location of the cursor in the buffer
// as well as the selection
type Cursor struct {
Buf *Buffer
buf *Buffer
Loc
// Last cursor x position
@@ -37,6 +37,23 @@ type Cursor struct {
Num int
}
func NewCursor(b *Buffer, l Loc) *Cursor {
c := &Cursor{
buf: b,
Loc: l,
}
c.StoreVisualX()
return c
}
func (c *Cursor) SetBuf(b *Buffer) {
c.buf = b
}
func (c *Cursor) Buf() *Buffer {
return c.buf
}
// Goto puts the cursor at the given cursor's location and gives
// the current cursor its selection too
func (c *Cursor) Goto(b Cursor) {
@@ -58,8 +75,8 @@ func (c *Cursor) GetVisualX() int {
return 0
}
bytes := c.Buf.LineBytes(c.Y)
tabsize := int(c.Buf.Settings["tabsize"].(float64))
bytes := c.buf.LineBytes(c.Y)
tabsize := int(c.buf.Settings["tabsize"].(float64))
if c.X > utf8.RuneCount(bytes) {
c.X = utf8.RuneCount(bytes) - 1
}
@@ -71,7 +88,7 @@ func (c *Cursor) GetVisualX() int {
// coordinate (this is necessary because tabs are 1 char but
// 4 visual spaces)
func (c *Cursor) GetCharPosInLine(b []byte, visualPos int) int {
tabsize := int(c.Buf.Settings["tabsize"].(float64))
tabsize := int(c.buf.Settings["tabsize"].(float64))
// Scan rune by rune until we exceed the visual width that we are
// looking for. Then we can return the character position we have found
@@ -112,7 +129,7 @@ func (c *Cursor) Start() {
func (c *Cursor) StartOfText() {
c.Start()
for util.IsWhitespace(c.RuneUnder(c.X)) {
if c.X == utf8.RuneCount(c.Buf.LineBytes(c.Y)) {
if c.X == utf8.RuneCount(c.buf.LineBytes(c.Y)) {
break
}
c.Right()
@@ -121,7 +138,7 @@ func (c *Cursor) StartOfText() {
// End moves the cursor to the end of the line it is on
func (c *Cursor) End() {
c.X = utf8.RuneCount(c.Buf.LineBytes(c.Y))
c.X = utf8.RuneCount(c.buf.LineBytes(c.Y))
c.LastVisualX = c.GetVisualX()
}
@@ -129,7 +146,7 @@ func (c *Cursor) End() {
// or "clipboard"
func (c *Cursor) CopySelection(target string) {
if c.HasSelection() {
if target != "primary" || c.Buf.Settings["useprimary"].(bool) {
if target != "primary" || c.buf.Settings["useprimary"].(bool) {
clipboard.WriteAll(string(c.GetSelection()), target)
}
}
@@ -137,8 +154,8 @@ func (c *Cursor) CopySelection(target string) {
// ResetSelection resets the user's selection
func (c *Cursor) ResetSelection() {
c.CurSelection[0] = c.Buf.Start()
c.CurSelection[1] = c.Buf.Start()
c.CurSelection[0] = c.buf.Start()
c.CurSelection[1] = c.buf.Start()
}
// SetSelectionStart sets the start of the selection
@@ -159,12 +176,12 @@ func (c *Cursor) HasSelection() bool {
// DeleteSelection deletes the currently selected text
func (c *Cursor) DeleteSelection() {
if c.CurSelection[0].GreaterThan(c.CurSelection[1]) {
c.Buf.Remove(c.CurSelection[1], c.CurSelection[0])
c.buf.Remove(c.CurSelection[1], c.CurSelection[0])
c.Loc = c.CurSelection[1]
} else if !c.HasSelection() {
return
} else {
c.Buf.Remove(c.CurSelection[0], c.CurSelection[1])
c.buf.Remove(c.CurSelection[0], c.CurSelection[1])
c.Loc = c.CurSelection[0]
}
}
@@ -186,11 +203,11 @@ func (c *Cursor) Deselect(start bool) {
// GetSelection returns the cursor's selection
func (c *Cursor) GetSelection() []byte {
if InBounds(c.CurSelection[0], c.Buf) && InBounds(c.CurSelection[1], c.Buf) {
if InBounds(c.CurSelection[0], c.buf) && InBounds(c.CurSelection[1], c.buf) {
if c.CurSelection[0].GreaterThan(c.CurSelection[1]) {
return c.Buf.Substr(c.CurSelection[1], c.CurSelection[0])
return c.buf.Substr(c.CurSelection[1], c.CurSelection[0])
}
return c.Buf.Substr(c.CurSelection[0], c.CurSelection[1])
return c.buf.Substr(c.CurSelection[0], c.CurSelection[1])
}
return []byte{}
}
@@ -200,8 +217,8 @@ func (c *Cursor) SelectLine() {
c.Start()
c.SetSelectionStart(c.Loc)
c.End()
if len(c.Buf.lines)-1 > c.Y {
c.SetSelectionEnd(c.Loc.Move(1, c.Buf))
if len(c.buf.lines)-1 > c.Y {
c.SetSelectionEnd(c.Loc.Move(1, c.buf))
} else {
c.SetSelectionEnd(c.Loc)
}
@@ -218,7 +235,7 @@ func (c *Cursor) AddLineToSelection() {
}
if c.Loc.GreaterThan(c.OrigSelection[1]) {
c.End()
c.SetSelectionEnd(c.Loc.Move(1, c.Buf))
c.SetSelectionEnd(c.Loc.Move(1, c.buf))
c.SetSelectionStart(c.OrigSelection[0])
}
@@ -232,11 +249,11 @@ func (c *Cursor) UpN(amount int) {
proposedY := c.Y - amount
if proposedY < 0 {
proposedY = 0
} else if proposedY >= len(c.Buf.lines) {
proposedY = len(c.Buf.lines) - 1
} else if proposedY >= len(c.buf.lines) {
proposedY = len(c.buf.lines) - 1
}
bytes := c.Buf.LineBytes(proposedY)
bytes := c.buf.LineBytes(proposedY)
c.X = c.GetCharPosInLine(bytes, c.LastVisualX)
if c.X > utf8.RuneCount(bytes) || (amount < 0 && proposedY == c.Y) {
@@ -264,7 +281,7 @@ func (c *Cursor) Down() {
// Left moves the cursor left one cell (if possible) or to
// the previous line if it is at the beginning
func (c *Cursor) Left() {
if c.Loc == c.Buf.Start() {
if c.Loc == c.buf.Start() {
return
}
if c.X > 0 {
@@ -279,10 +296,10 @@ func (c *Cursor) Left() {
// Right moves the cursor right one cell (if possible) or
// to the next line if it is at the end
func (c *Cursor) Right() {
if c.Loc == c.Buf.End() {
if c.Loc == c.buf.End() {
return
}
if c.X < utf8.RuneCount(c.Buf.LineBytes(c.Y)) {
if c.X < utf8.RuneCount(c.buf.LineBytes(c.Y)) {
c.X++
} else {
c.Down()
@@ -297,26 +314,26 @@ func (c *Cursor) Right() {
func (c *Cursor) Relocate() {
if c.Y < 0 {
c.Y = 0
} else if c.Y >= len(c.Buf.lines) {
c.Y = len(c.Buf.lines) - 1
} else if c.Y >= len(c.buf.lines) {
c.Y = len(c.buf.lines) - 1
}
if c.X < 0 {
c.X = 0
} else if c.X > utf8.RuneCount(c.Buf.LineBytes(c.Y)) {
c.X = utf8.RuneCount(c.Buf.LineBytes(c.Y))
} else if c.X > utf8.RuneCount(c.buf.LineBytes(c.Y)) {
c.X = utf8.RuneCount(c.buf.LineBytes(c.Y))
}
}
// SelectWord selects the word the cursor is currently on
func (c *Cursor) SelectWord() {
if len(c.Buf.LineBytes(c.Y)) == 0 {
if len(c.buf.LineBytes(c.Y)) == 0 {
return
}
if !util.IsWordChar(c.RuneUnder(c.X)) {
c.SetSelectionStart(c.Loc)
c.SetSelectionEnd(c.Loc.Move(1, c.Buf))
c.SetSelectionEnd(c.Loc.Move(1, c.buf))
c.OrigSelection = c.CurSelection
return
}
@@ -330,12 +347,12 @@ func (c *Cursor) SelectWord() {
c.SetSelectionStart(Loc{backward, c.Y})
c.OrigSelection[0] = c.CurSelection[0]
lineLen := utf8.RuneCount(c.Buf.LineBytes(c.Y)) - 1
lineLen := utf8.RuneCount(c.buf.LineBytes(c.Y)) - 1
for forward < lineLen && util.IsWordChar(c.RuneUnder(forward+1)) {
forward++
}
c.SetSelectionEnd(Loc{forward, c.Y}.Move(1, c.Buf))
c.SetSelectionEnd(Loc{forward, c.Y}.Move(1, c.buf))
c.OrigSelection[1] = c.CurSelection[1]
c.Loc = c.CurSelection[1]
}
@@ -362,12 +379,12 @@ func (c *Cursor) AddWordToSelection() {
if c.Loc.GreaterThan(c.OrigSelection[1]) {
forward := c.X
lineLen := utf8.RuneCount(c.Buf.LineBytes(c.Y)) - 1
lineLen := utf8.RuneCount(c.buf.LineBytes(c.Y)) - 1
for forward < lineLen && util.IsWordChar(c.RuneUnder(forward+1)) {
forward++
}
c.SetSelectionEnd(Loc{forward, c.Y}.Move(1, c.Buf))
c.SetSelectionEnd(Loc{forward, c.Y}.Move(1, c.buf))
c.SetSelectionStart(c.OrigSelection[0])
}
@@ -389,7 +406,7 @@ func (c *Cursor) SelectTo(loc Loc) {
// WordRight moves the cursor one word to the right
func (c *Cursor) WordRight() {
for util.IsWhitespace(c.RuneUnder(c.X)) {
if c.X == utf8.RuneCount(c.Buf.LineBytes(c.Y)) {
if c.X == utf8.RuneCount(c.buf.LineBytes(c.Y)) {
c.Right()
return
}
@@ -397,7 +414,7 @@ func (c *Cursor) WordRight() {
}
c.Right()
for util.IsWordChar(c.RuneUnder(c.X)) {
if c.X == utf8.RuneCount(c.Buf.LineBytes(c.Y)) {
if c.X == utf8.RuneCount(c.buf.LineBytes(c.Y)) {
return
}
c.Right()
@@ -425,7 +442,7 @@ func (c *Cursor) WordLeft() {
// RuneUnder returns the rune under the given x position
func (c *Cursor) RuneUnder(x int) rune {
line := c.Buf.LineBytes(c.Y)
line := c.buf.LineBytes(c.Y)
if len(line) == 0 || x >= utf8.RuneCount(line) {
return '\n'
} else if x < 0 {

14
cmd/micro/buffer/serialize.go
View File

@@ -5,11 +5,20 @@ import (
"errors"
"io"
"os"
"time"
"github.com/zyedidia/micro/cmd/micro/config"
. "github.com/zyedidia/micro/cmd/micro/util"
)
// The SerializedBuffer holds the types that get serialized when a buffer is saved
// These are used for the savecursor and saveundo options
type SerializedBuffer struct {
EventHandler *EventHandler
Cursor Loc
ModTime time.Time
}
func init() {
gob.Register(TextEvent{})
gob.Register(SerializedBuffer{})
@@ -24,11 +33,12 @@ func (b *Buffer) Serialize() error {
name := config.ConfigDir + "/buffers/" + EscapePath(b.AbsPath)
return overwriteFile(name, func(file io.Writer) error {
return gob.NewEncoder(file).Encode(SerializedBuffer{
err := gob.NewEncoder(file).Encode(SerializedBuffer{
b.EventHandler,
b.GetActiveCursor().Loc,
b.ModTime,
})
return err
})
}
@@ -57,5 +67,5 @@ func (b *Buffer) Unserialize() error {
}
}
}
return err
return nil
}

2
cmd/micro/micro.go
View File

@@ -1,5 +1,5 @@
package main
//asdf
import (
"flag"
"fmt"