-
-
Notifications
You must be signed in to change notification settings - Fork 11
/
wanix_vendor.patch
178 lines (163 loc) · 5.15 KB
/
wanix_vendor.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
diff --git a/vendor/github.com/mattn/go-isatty/isatty_js.go b/vendor/github.com/mattn/go-isatty/isatty_js.go
new file mode 100644
index 00000000..4800321c
--- /dev/null
+++ b/vendor/github.com/mattn/go-isatty/isatty_js.go
@@ -0,0 +1,16 @@
+//go:build js
+// +build js
+
+package isatty
+
+// IsTerminal returns true if the file descriptor is terminal which
+// is always false on js and appengine classic which is a sandboxed PaaS.
+func IsTerminal(fd uintptr) bool {
+ return true
+}
+
+// IsCygwinTerminal() return true if the file descriptor is a cygwin or msys2
+// terminal. This is also always false on this environment.
+func IsCygwinTerminal(fd uintptr) bool {
+ return false
+}
diff --git a/vendor/github.com/mattn/go-isatty/isatty_others.go b/vendor/github.com/mattn/go-isatty/isatty_others.go
index ff714a37..de398b3a 100644
--- a/vendor/github.com/mattn/go-isatty/isatty_others.go
+++ b/vendor/github.com/mattn/go-isatty/isatty_others.go
@@ -1,4 +1,5 @@
-// +build appengine js nacl
+//go:build appengine || nacl
+// +build appengine nacl
package isatty
diff --git a/vendor/github.com/zyedidia/tcell/v2/tscreen_js.go b/vendor/github.com/zyedidia/tcell/v2/tscreen_js.go
new file mode 100644
index 00000000..d56e4524
--- /dev/null
+++ b/vendor/github.com/zyedidia/tcell/v2/tscreen_js.go
@@ -0,0 +1,30 @@
+//go:build js
+
+package tcell
+
+import (
+ "fmt"
+ "os"
+)
+
+// This stub file is for systems that have no termios.
+
+type termiosPrivate struct{}
+
+func (t *tScreen) termioInit() error {
+ t.in = os.Stdin
+ t.out = os.Stdout
+ return nil
+}
+
+func (t *tScreen) termioFini() {
+}
+
+func (t *tScreen) getWinSize() (int, int, error) {
+ return 129, 24, nil
+}
+
+func (t *tScreen) Beep() error {
+ fmt.Fprintln(os.Stderr, "Beep!")
+ return nil
+}
diff --git a/vendor/github.com/zyedidia/terminal/ioctl_other.go b/vendor/github.com/zyedidia/terminal/ioctl_other.go
index c08989bf..9ac64ca9 100644
--- a/vendor/github.com/zyedidia/terminal/ioctl_other.go
+++ b/vendor/github.com/zyedidia/terminal/ioctl_other.go
@@ -1,4 +1,5 @@
-// +build plan9 nacl windows
+//go:build plan9 || nacl || windows || js
+// +build plan9 nacl windows js
package terminal
diff --git a/vendor/github.com/zyedidia/terminal/vt_other.go b/vendor/github.com/zyedidia/terminal/vt_other.go
index d16c91e1..b97e26af 100644
--- a/vendor/github.com/zyedidia/terminal/vt_other.go
+++ b/vendor/github.com/zyedidia/terminal/vt_other.go
@@ -1,5 +1,5 @@
-//go:build plan9 || nacl || windows
-// +build plan9 nacl windows
+//go:build plan9 || nacl || windows || js
+// +build plan9 nacl windows js
package terminal
diff --git a/Makefile b/Makefile
index fc9601aa..34c7ce1e 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,9 @@ VSCODE_TESTS_BASE_URL = 'https://raw.githubusercontent.com/microsoft/vscode/e6a4
build: generate build-quick
+wasm: generate
+ GOOS=js GOARCH=wasm go build -o ./micro.wasm -trimpath -ldflags "-s -w $(GOVARS)" ./cmd/micro
+
build-quick:
go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
diff --git a/internal/action/actions_other.go b/internal/action/actions_other.go
index 6d62581b..71fccc6e 100644
--- a/internal/action/actions_other.go
+++ b/internal/action/actions_other.go
@@ -1,4 +1,5 @@
-// +build plan9 nacl windows
+//go:build plan9 || nacl || windows || js
+// +build plan9 nacl windows js
package action
diff --git a/vendor/github.com/zyedidia/tcell/v2/tscreen.go b/vendor/github.com/zyedidia/tcell/v2/tscreen.go
index 5d1ec0b1..af4a3823 100644
--- a/vendor/github.com/zyedidia/tcell/v2/tscreen.go
+++ b/vendor/github.com/zyedidia/tcell/v2/tscreen.go
@@ -950,7 +950,7 @@ func (t *tScreen) nColors() int {
func (t *tScreen) PollEvent() Event {
select {
case <-t.quit:
- return nil
+ return NewEventError(io.EOF)
case ev := <-t.evch:
return ev
}
diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go
index 3e6756bc..9f71377b 100644
--- a/cmd/micro/micro.go
+++ b/cmd/micro/micro.go
@@ -361,8 +361,7 @@ func main() {
sigterm = make(chan os.Signal, 1)
sighup = make(chan os.Signal, 1)
- signal.Notify(sigterm, syscall.SIGTERM, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGABRT)
- signal.Notify(sighup, syscall.SIGHUP)
+ signal.Notify(sigterm, syscall.SIGTERM, syscall.SIGINT, syscall.SIGQUIT)
// Here is the event loop which runs in a separate thread
go func() {
@@ -450,8 +449,6 @@ func DoEvent() {
}
if e, ok := event.(*tcell.EventError); ok {
- log.Println("tcell event error: ", e.Error())
-
if e.Err() == io.EOF {
// shutdown due to terminal closing/becoming inaccessible
for _, b := range buffer.OpenBuffers {
@@ -464,6 +461,8 @@ func DoEvent() {
screen.Screen.Fini()
}
os.Exit(0)
+ } else {
+ log.Println("tcell event error: ", e.Error())
}
return
}
diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go
index dc4d037f..8e09ed32 100644
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -234,6 +234,11 @@ func NewBufferFromFileAtLoc(path string, btype BufType, cursorLoc Loc) (*Buffer,
return nil, err
}
+ filename, err = filepath.Abs(filename)
+ if err != nil {
+ return nil, err
+ }
+
f, err := os.OpenFile(filename, os.O_WRONLY, 0)
readonly := os.IsPermission(err)
f.Close()