Merge branch 'improve-windows-support'

cmdline/cmdline_test.go

@@ -2,6 +2,7 @@ package cmdline
 
 import (
 	"reflect"
+	"runtime"
 	"testing"
 
 	"github.com/itchyny/bed/event"
@@ -430,6 +431,9 @@ func TestCmdlineExecuteGoto(t *testing.T) {
 }
 
 func TestCmdlineComplete(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("skip on Windows")
+	}
 	c := NewCmdline()
 	c.completor = newCompletor(&mockFilesystem{})
 	eventCh, cmdlineCh, redrawCh := make(chan event.Event), make(chan event.Event), make(chan struct{})

cmdline/completor_test.go

@@ -1,6 +1,8 @@
 package cmdline
 
 import (
+	"path/filepath"
+	"runtime"
 	"testing"
 )
 
@@ -35,8 +37,8 @@ func TestCompletorCompleteFilepath(t *testing.T) {
 	for i := 0; i < 4; i++ {
 		cmdline = c.complete(cmdline, cmd, prefix, arg, true)
 	}
-	if cmdline != "new editor/" {
-		t.Errorf("cmdline should be %q but got %q", "new editor/", cmdline)
+	if cmdline != "new editor"+string(filepath.Separator) {
+		t.Errorf("cmdline should be %q but got %q", "new editor"+string(filepath.Separator), cmdline)
 	}
 	if c.target != "new " {
 		t.Errorf("completion target should be %q but got %q", "new ", c.target)
@@ -113,8 +115,8 @@ func TestCompletorCompleteFilepathKeepPrefix(t *testing.T) {
 	cmdline := " : : :  new   C"
 	cmd, _, prefix, arg, _ := parse([]rune(cmdline))
 	cmdline = c.complete(cmdline, cmd, prefix, arg, true)
-	if cmdline != " : : :  new   cmdline/" {
-		t.Errorf("cmdline should be %q but got %q", " : : :  new   cmdline/", cmdline)
+	if cmdline != " : : :  new   cmdline"+string(filepath.Separator) {
+		t.Errorf("cmdline should be %q but got %q", " : : :  new   cmdline"+string(filepath.Separator), cmdline)
 	}
 	if c.target != " : : :  new   C" {
 		t.Errorf("completion target should be %q but got %q", " : : :  new   C", c.target)
@@ -124,8 +126,8 @@ func TestCompletorCompleteFilepathKeepPrefix(t *testing.T) {
 	}
 
 	cmdline = c.complete(cmdline, cmd, prefix, arg, true)
-	if cmdline != " : : :  new   common/" {
-		t.Errorf("cmdline should be %q but got %q", " : : :  new   common/", cmdline)
+	if cmdline != " : : :  new   common"+string(filepath.Separator) {
+		t.Errorf("cmdline should be %q but got %q", " : : :  new   common"+string(filepath.Separator), cmdline)
 	}
 	if c.index != 1 {
 		t.Errorf("completion index should be %d but got %d", 1, c.index)
@@ -142,6 +144,9 @@ func TestCompletorCompleteFilepathKeepPrefix(t *testing.T) {
 }
 
 func TestCompletorCompleteFilepathHomedir(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("skip on Windows")
+	}
 	c := newCompletor(&mockFilesystem{})
 	cmdline := "vnew ~/"
 	cmd, _, prefix, arg, _ := parse([]rune(cmdline))
@@ -186,6 +191,9 @@ func TestCompletorCompleteFilepathHomedir(t *testing.T) {
 }
 
 func TestCompletorCompleteFilepathHomedirDot(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("skip on Windows")
+	}
 	c := newCompletor(&mockFilesystem{})
 	cmdline := "vnew ~/."
 	cmd, _, prefix, arg, _ := parse([]rune(cmdline))
@@ -210,6 +218,9 @@ func TestCompletorCompleteFilepathHomedirDot(t *testing.T) {
 }
 
 func TestCompletorCompleteFilepathRoot(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("skip on Windows")
+	}
 	c := newCompletor(&mockFilesystem{})
 	cmdline := "e /"
 	cmd, _, prefix, arg, _ := parse([]rune(cmdline))

editor/editor_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -95,6 +96,9 @@ func TestEditorOpenEmptyWriteQuit(t *testing.T) {
 }
 
 func TestEditorOpenWriteQuit(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("skip on Windows")
+	}
 	ui := newTestUI()
 	editor := NewEditor(ui, window.NewManager(), cmdline.NewCmdline())
 	if err := editor.Init(); err != nil {

window/manager.go

@@ -437,7 +437,7 @@ func (m *Manager) writeFile(r *event.Range, name string) (string, int64, error)
 	if name == "" {
 		return name, 0, errors.New("no file name")
 	}
-	if runtime.GOOS == "windows" && name == window.filename {
+	if runtime.GOOS == "windows" && m.opened(name) {
 		return name, 0, errors.New("cannot overwrite the original file on Windows")
 	}
 	var err error
@@ -473,6 +473,15 @@ func (m *Manager) filePerm(name string) os.FileMode {
 	return os.FileMode(0644)
 }
 
+func (m *Manager) opened(name string) bool {
+	for _, f := range m.files {
+		if f.name == name {
+			return true
+		}
+	}
+	return false
+}
+
 // Close the Manager.
 func (m *Manager) Close() {
 	for _, f := range m.files {