Support csharp-script syntax. (#1425)

[micro.git] / internal / buffer / save.go

diff --git a/internal/buffer/save.go b/internal/buffer/save.go
index 990e2f256a952f28a8e12efdda0d8d8a8dd7db96..6f07ea6c8b6b923a6558986b73872ee7bfc765b7 100644 (file)
--- a/internal/buffer/save.go
+++ b/internal/buffer/save.go
@@ -1,6 +1,7 @@
 package buffer
 
 import (
+       "bufio"
        "bytes"
        "errors"
        "io"
@@ -28,41 +29,42 @@ const LargeFileThreshold = 50000
 // the supplied function with the file as io.Writer object, also making sure the file is
 // closed afterwards.
 func overwriteFile(name string, enc encoding.Encoding, fn func(io.Writer) error, withSudo bool) (err error) {
-    var writeCloser io.WriteCloser
-
-    if withSudo {
-        cmd := exec.Command(config.GlobalSettings["sucmd"].(string), "dd", "bs=4k", "of="+name)
-
-        if writeCloser, err = cmd.StdinPipe(); err != nil {
-            return
-        }
-
-        c := make(chan os.Signal, 1)
-        signal.Notify(c, os.Interrupt)
-        go func() {
-            <-c
-            cmd.Process.Kill()
-        }()
-
-        defer func() {
-            screenb := screen.TempFini()
-            if e := cmd.Run(); e != nil && err == nil {
-                err = e
-            }
-            screen.TempStart(screenb)
-        }()
-    } else if writeCloser, err = os.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644); err != nil {
-        return
-    }
-
-    w := transform.NewWriter(writeCloser, enc.NewEncoder())
-    err = fn(w)
-
-    if e := writeCloser.Close(); e != nil && err == nil {
-        err = e
-    }
-
-    return
+       var writeCloser io.WriteCloser
+
+       if withSudo {
+               cmd := exec.Command(config.GlobalSettings["sucmd"].(string), "dd", "bs=4k", "of="+name)
+
+               if writeCloser, err = cmd.StdinPipe(); err != nil {
+                       return
+               }
+
+               c := make(chan os.Signal, 1)
+               signal.Notify(c, os.Interrupt)
+               go func() {
+                       <-c
+                       cmd.Process.Kill()
+               }()
+
+               defer func() {
+                       screenb := screen.TempFini()
+                       if e := cmd.Run(); e != nil && err == nil {
+                               err = e
+                       }
+                       screen.TempStart(screenb)
+               }()
+       } else if writeCloser, err = os.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644); err != nil {
+               return
+       }
+
+       w := bufio.NewWriter(transform.NewWriter(writeCloser, enc.NewEncoder()))
+       err = fn(w)
+       w.Flush()
+
+       if e := writeCloser.Close(); e != nil && err == nil {
+               err = e
+       }
+
+       return
 }
 
 // Save saves the buffer to its default path
@@ -92,7 +94,7 @@ func (b *Buffer) saveToFile(filename string, withSudo bool) error {
                return errors.New("Cannot save scratch buffer")
        }
        if withSudo && runtime.GOOS == "windows" {
-           return errors.New("Save with sudo not supported on Windows")
+               return errors.New("Save with sudo not supported on Windows")
        }
 
        b.UpdateRules()
@@ -109,8 +111,8 @@ func (b *Buffer) saveToFile(filename string, withSudo bool) error {
 
        if b.Settings["eofnewline"].(bool) {
                end := b.End()
-               if b.RuneAt(Loc{end.X - 1, end.Y}) != '\n' {
-                       b.Insert(end, "\n")
+               if b.RuneAt(Loc{end.X, end.Y}) != '\n' {
+                       b.insert(end, []byte{'\n'})
                }
        }
 
@@ -178,7 +180,7 @@ func (b *Buffer) saveToFile(filename string, withSudo bool) error {
        }
 
        if err = overwriteFile(absFilename, enc, fwriter, withSudo); err != nil {
-           return err
+               return err
        }
 
        if !b.Settings["fastdirty"].(bool) {