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

Create tab struct and reorganize tab bar

Browse Source
This commit is contained in:
Zachary Yedidia
2016-06-08 13:26:50 -04:00
parent 5f19f69681
commit 40affa56c7
9 changed files with 137 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
cmd/micro/bindings.go
View File

@@ -73,8 +73,9 @@ var bindingActions = map[string]func(*View) bool{
"ShellMode": (*View).ShellMode,
"CommandMode": (*View).CommandMode,
"Quit": (*View).Quit,
"LastView": (*View).LastView,
"NextView": (*View).NextView,
"AddTab": (*View).AddTab,
"LastTab": (*View).LastTab,
"NextTab": (*View).NextTab,
}
var bindingKeys = map[string]tcell.Key{
@@ -382,6 +383,7 @@ func DefaultBindings() map[string]string {
"CtrlD": "DuplicateLine",
"CtrlV": "Paste",
"CtrlA": "SelectAll",
"CtrlT": "AddTab",
"Home": "Start",
"End": "End",
"PageUp": "CursorPageUp",
@@ -921,12 +923,6 @@ func (v *View) OpenFile() bool {
return false
}
func (v *View) openInNewView(buf *Buffer) {
views = append(views, NewView(buf))
mainView++
views[mainView].Num = mainView
}
// Start moves the viewport to the start of the buffer
func (v *View) Start() bool {
v.Topline = 0
@@ -1089,16 +1085,16 @@ func (v *View) Quit() bool {
return v.ToggleHelp()
}
// Make sure not to quit if there are unsaved changes
if views[mainView].CanClose("Quit anyway? (yes, no, save) ") {
views[mainView].CloseBuffer()
if len(views) > 1 {
views = views[:v.Num+copy(views[v.Num:], views[v.Num+1:])]
for i, v := range views {
v.Num = i
}
if v.Num <= mainView {
if !(v.Num == mainView && mainView == 0) {
mainView--
if v.CanClose("Quit anyway? (yes, no, save) ") {
v.CloseBuffer()
if len(tabs) > 1 {
if len(tabs[v.TabNum].views) == 1 {
tabs = tabs[:v.TabNum+copy(tabs[v.TabNum:], tabs[v.TabNum+1:])]
for i, t := range tabs {
t.SetNum(i)
}
if curTab >= len(tabs) {
curTab--
}
}
} else {
@@ -1109,16 +1105,24 @@ func (v *View) Quit() bool {
return false
}
func (v *View) LastView() bool {
if mainView > 0 {
mainView--
func (v *View) AddTab() bool {
tab := NewTabFromView(NewView(NewBuffer([]byte{}, "")))
tab.SetNum(len(tabs))
tabs = append(tabs, tab)
curTab++
return true
}
func (v *View) LastTab() bool {
if curTab > 0 {
curTab--
}
return true
}
func (v *View) NextView() bool {
if mainView < len(views)-1 {
mainView++
func (v *View) NextTab() bool {
if curTab < len(tabs)-1 {
curTab++
}
return true
}

5
cmd/micro/buffer.go
View File

@@ -51,9 +51,14 @@ type SerializedBuffer struct {
func NewBuffer(txt []byte, path string) *Buffer {
b := new(Buffer)
b.LineArray = NewLineArray(txt)
b.Path = path
b.Name = path
if path == "" {
b.Name = "No name"
}
b.ModTime, _ = GetModTime(b.Path)
b.EventHandler = NewEventHandler(b)

12
cmd/micro/command.go
View File

@@ -62,8 +62,10 @@ func DefaultCommands() map[string]string {
// Set sets an option
func Set(args []string) {
// Set an option and we have to set it for every view
for _, view := range views {
SetOption(view, args)
for _, tab := range tabs {
for _, view := range tab.views {
SetOption(view, args)
}
}
}
@@ -85,13 +87,13 @@ func Run(args []string) {
// Quit closes the main view
func Quit(args []string) {
// Close the main view
views[mainView].Quit()
CurView().Quit()
}
// Save saves the buffer in the main view
func Save(args []string) {
// Save the main view
views[mainView].Save()
CurView().Save()
}
// Replace runs search and replace
@@ -138,7 +140,7 @@ func Replace(args []string) {
return
}
view := views[mainView]
view := CurView()
found := false
for {

32
cmd/micro/micro.go
View File

@@ -48,10 +48,10 @@ var (
L *lua.LState
// The list of views
views []*View
// This is the currently open view
// It's just an index to the view in the views array
mainView int
tabs []*Tab
// This is the currently open tab
// It's just an index to the tab in the tabs array
curTab int
)
// LoadInput loads the file input for the editor
@@ -181,10 +181,10 @@ func InitScreen() {
// RedrawAll redraws everything -- all the views and the messenger
func RedrawAll() {
messenger.Clear()
// for _, v := range views {
views[mainView].Display()
// }
DisplayTabBar()
for _, v := range tabs[curTab].views {
v.Display()
}
DisplayTabs()
messenger.Display()
screen.Show()
}
@@ -233,21 +233,21 @@ func main() {
messenger = new(Messenger)
messenger.history = make(map[string][]string)
// views = make([]*View, 1)
buffers := LoadInput()
for i, buf := range buffers {
views = append(views, NewView(buf))
views[i].Num = i
for _, buf := range buffers {
tabs = append(tabs, NewTabFromView(NewView(buf)))
}
L.SetGlobal("OS", luar.New(L, runtime.GOOS))
L.SetGlobal("views", luar.New(L, views))
L.SetGlobal("mainView", luar.New(L, mainView))
L.SetGlobal("tabs", luar.New(L, tabs))
L.SetGlobal("curTab", luar.New(L, curTab))
L.SetGlobal("messenger", luar.New(L, messenger))
L.SetGlobal("GetOption", luar.New(L, GetOption))
L.SetGlobal("AddOption", luar.New(L, AddOption))
L.SetGlobal("BindKey", luar.New(L, BindKey))
L.SetGlobal("MakeCommand", luar.New(L, MakeCommand))
L.SetGlobal("CurView", luar.New(L, CurView))
LoadPlugins()
@@ -261,10 +261,10 @@ func main() {
if searching {
// Since searching is done in real time, we need to redraw every time
// there is a new event in the search bar
HandleSearchEvent(event, views[mainView])
HandleSearchEvent(event, CurView())
} else {
// Send it to the view
views[mainView].HandleEvent(event)
CurView().HandleEvent(event)
}
}
}

28
cmd/micro/runtime.go
View File

@@ -195,7 +195,7 @@ func runtimeColorschemesDefaultMicro() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "runtime/colorschemes/default.micro", size: 440, mode: os.FileMode(420), modTime: time.Unix(1464789733, 0)}
info := bindataFileInfo{name: "runtime/colorschemes/default.micro", size: 440, mode: os.FileMode(420), modTime: time.Unix(1465309572, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -215,7 +215,7 @@ func runtimeColorschemesSolarizedTcMicro() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "runtime/colorschemes/solarized-tc.micro", size: 659, mode: os.FileMode(420), modTime: time.Unix(1464789148, 0)}
info := bindataFileInfo{name: "runtime/colorschemes/solarized-tc.micro", size: 659, mode: os.FileMode(420), modTime: time.Unix(1465309572, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -235,7 +235,7 @@ func runtimeColorschemesSolarizedMicro() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "runtime/colorschemes/solarized.micro", size: 530, mode: os.FileMode(420), modTime: time.Unix(1464789633, 0)}
info := bindataFileInfo{name: "runtime/colorschemes/solarized.micro", size: 530, mode: os.FileMode(420), modTime: time.Unix(1465309572, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -255,12 +255,12 @@ func runtimeHelpHelpMd() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "runtime/help/help.md", size: 7253, mode: os.FileMode(420), modTime: time.Unix(1464788885, 0)}
info := bindataFileInfo{name: "runtime/help/help.md", size: 7253, mode: os.FileMode(420), modTime: time.Unix(1465309572, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
var _runtimePluginsGoGoLua = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xac\x52\x4f\x6b\xdb\x30\x14\xbf\xfb\x53\x3c\x04\x03\x6b\xf1\x0c\xbb\x1a\x72\xd8\x06\xcb\x69\x64\x6c\x63\x97\x90\x16\xd5\x7e\x8e\x45\x65\xc9\x48\x72\xd2\x52\xfa\xdd\xfb\xfc\x27\xad\x9c\x38\x14\x42\x75\x49\xfc\xfc\x7b\xbf\x7f\x96\x2c\x61\x85\x7e\xdd\x78\x69\x74\xcc\x76\x46\xd6\x8d\xb1\xde\x31\x0e\xcb\x25\x68\xa9\xc0\x57\xa8\x23\xa0\xf3\xad\x28\xce\x61\x09\x94\x42\x39\xe4\x11\xea\x22\x3a\xe5\x2a\x6b\xff\x1e\x4f\x07\x49\xc0\xdb\x76\xa4\x88\x7e\x89\x7b\xfc\x61\xea\x5a\xe8\x62\xaa\x43\x0f\xb7\x81\xbd\x53\xe0\x40\x34\x80\x7a\xdd\x28\x2a\x5b\x9d\x77\x3a\x40\x43\xa3\xff\x8a\x3d\xc6\xbc\x77\x40\x3e\xf7\x12\x0f\x6e\x53\x0b\xa9\xff\xd3\xbf\xc5\xd7\x6d\xfa\xbd\x2d\xd3\x9f\x52\xe1\xbf\xc7\x06\x3b\xcf\x6c\x65\xd8\x9b\xe9\x71\xed\x42\x55\x13\x58\x77\x42\xaf\xa3\x68\x77\x90\xaa\x9a\x2f\x69\x9e\x81\xde\x85\xdb\xd4\xcf\xf1\xb7\xef\x2a\x0c\x18\x82\xcf\xc2\x65\x41\x78\x65\x72\xa1\xa0\xa2\xda\x14\xe5\x04\x69\xd2\xc6\x34\x78\xb4\x02\x5f\x0e\xc0\x20\x4d\x2f\x14\xf4\x5b\xf8\x2a\xa4\xb1\xe8\x5a\xe5\x89\x66\xe0\xcb\x2c\x0a\xfa\x1a\x9f\x05\x1b\x40\xe3\x34\x57\xc6\x75\xf2\x17\xcc\xfd\xc1\x75\x67\x80\xcf\x85\x9a\x76\x78\x6d\xb0\x91\xe5\xda\x70\xe4\xc4\x35\x4a\xfa\xf8\x2c\x25\xdd\xb8\xec\x83\xb2\x0e\x0a\xce\xdb\x04\x1c\x36\xb3\x3e\x9e\x9e\x27\xd3\x1d\x3e\xd0\x30\x66\xf1\xe6\xe6\x93\xdb\x2e\x38\xe3\x59\x69\x6c\x2d\x88\xe5\x48\x40\xcf\x80\x22\xaf\x40\x6a\x20\xea\x6c\x47\x6f\xf3\x2a\xee\x77\x39\x14\xe6\xf5\x6e\x79\x71\xa7\x30\x95\xda\xa1\xf5\xf1\x20\x98\xf4\x9b\x3c\x0a\xaf\x9e\x45\xdf\x5a\x3d\x3a\xea\x33\xbc\x04\x00\x00\xff\xff\x96\x4d\x4a\x5a\x40\x04\x00\x00")
var _runtimePluginsGoGoLua = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xa4\x52\xdd\x6a\xdb\x30\x14\xbe\xf7\x53\x1c\x04\x03\x69\xf3\xfc\x00\x86\x5c\x6c\x81\xe5\x6a\x64\x6c\x63\x37\x63\x1b\x9a\x7d\x1c\x8b\xca\x92\x91\xe4\xa6\xa5\xf4\xdd\x7b\xfc\x93\x54\x76\x5c\x4a\xa8\x6e\x8c\x8f\xbe\xf3\xfd\x21\x55\xc1\x0e\xc3\xbe\x0d\xca\x1a\xce\x0e\x56\x35\xad\x75\xc1\x33\x01\x9b\x0d\x18\xa5\x21\xd4\x68\x12\xa0\xf3\xa9\x2c\x2f\x61\x29\x54\x52\x7b\x14\x09\x9a\x32\x59\x72\x55\x4d\x78\x8d\xa7\x87\xa4\x10\x5c\x37\x51\x24\x5f\xe5\x0d\x6e\x6d\xd3\x48\x53\xce\x75\xe8\xe7\x5f\x64\x6f\x09\x1c\x89\x46\xd0\xa0\x9b\x24\x55\x67\x8a\x5e\x07\x68\x68\xcd\x0f\x79\x8b\x5c\x0c\x0e\xc8\xe7\xb6\x73\xbf\x14\x1e\xb9\xc8\x3e\x77\x55\xf6\x45\x69\xfc\x79\xdf\x62\xef\x95\xed\x2c\x7b\x36\x3b\xc1\x5f\xa8\x68\x06\xeb\x4f\xec\x71\x12\xeb\x0f\x52\x45\xeb\xe5\xac\x33\xd0\x5d\xbc\x4d\xbd\x9c\xbe\x43\x47\x71\xb0\x18\x7c\x0e\x95\x47\x61\xb5\x2d\xa4\x86\x9a\x6a\xd2\x94\x0f\x94\xcd\x5a\xdb\xe2\xc9\x02\x7c\x3c\x02\x83\x2c\x5b\x14\xf2\x4d\x86\x3a\x5e\x77\xe8\x3b\x1d\x68\x7d\xe4\xc9\x1d\x4a\x6a\xfd\xbd\x64\x23\x68\x9a\x16\xda\xfa\x5e\x76\x61\xe6\x3b\xee\x7b\x41\xb1\x66\x7e\xde\xd5\xb5\x01\xa6\xed\x6b\x43\x90\xb2\x6f\xb5\x0a\xfc\x22\x0d\xbd\xa0\xfc\x8d\x99\x46\x66\x1f\x5c\x0a\x1e\xdb\x55\xfd\x87\xc7\xd9\xf4\x80\x77\x34\xe4\x8c\xff\xfe\xfb\xce\xff\xf9\x20\x98\xc8\x2b\xeb\x1a\x49\x2c\x27\x02\xfa\x07\x94\x45\x0d\xca\x00\x51\xe7\x07\xba\x2d\x6a\x3e\xec\x0a\x28\xed\xf9\xad\x04\xf9\x5f\x63\xa6\x8c\x47\x17\xf8\x28\x98\x0e\x9b\x22\x89\x9f\x92\xc3\xd0\x39\x33\x39\x1a\x32\x3c\x05\x00\x00\xff\xff\x06\xfe\xea\x24\x08\x04\x00\x00")
func runtimePluginsGoGoLuaBytes() ([]byte, error) {
return bindataRead(
@@ -275,12 +275,12 @@ func runtimePluginsGoGoLua() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "runtime/plugins/go/go.lua", size: 1088, mode: os.FileMode(420), modTime: time.Unix(1464645544, 0)}
info := bindataFileInfo{name: "runtime/plugins/go/go.lua", size: 1032, mode: os.FileMode(420), modTime: time.Unix(1465403835, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
var _runtimePluginsLinterLinterLua = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x8c\x55\xdf\x6f\xdb\x36\x10\x7e\xf7\x5f\x41\x10\xd3\x20\x26\x92\x82\xe6\xd1\x40\x06\x74\x1d\x16\x60\xe8\xd6\x02\xe9\xd6\x87\xae\x2b\x68\xe9\x64\x71\xa5\x48\x81\xa4\xe2\x18\xc3\xfe\xf7\x1d\x49\x45\x96\x35\x39\xaa\x10\x84\x67\x8a\xf7\x7d\xf7\xe3\xd3\x51\xd4\xe4\x1e\xdc\xbb\xce\x09\xad\x52\x2a\x85\x72\x60\x28\x23\x77\x77\x44\x09\x49\x5c\x03\x6a\x43\xf0\x79\x5d\x55\xb3\x33\x19\x71\xa6\x07\xb6\x01\x55\x6d\x36\x75\xaf\x4a\xff\x96\xc4\x97\x5f\xb4\x7a\xe0\x8f\x90\xb2\xe0\x7b\x81\x62\xc4\xf6\x8f\xd4\x25\x97\xa4\x76\xe4\x8e\x3c\x0a\x38\xd8\x4f\x2d\x17\xea\x0f\xb4\xae\x5f\x7d\x2e\x7e\xec\xeb\xe2\x67\x21\xe1\xc3\xb1\x83\xb9\x07\x6e\x5f\xf4\x79\xcf\x5d\x33\x3b\x5f\xc1\xa3\xea\xa5\x44\x17\x7a\x83\xf6\x8d\xff\x41\xc7\x33\x18\xe9\xbb\x07\x9f\x3b\x3d\x08\x55\xe9\x83\xa5\xe7\x51\xfa\x67\x82\xf0\xdb\xef\x6f\x4f\xbe\xbe\x0e\x13\x1c\x9f\x0a\x1e\xb9\xd7\x0b\x10\x43\x91\xfc\x92\xd2\xbd\xde\xf5\x42\x56\x58\x4f\x34\x49\xb0\x49\xae\x09\x25\x45\xf1\xcc\x85\xaf\x92\x7a\x9b\xc8\x2d\x49\x5a\xca\x5e\x82\xf2\x6b\x44\xf2\x56\x04\xb9\x5c\x9b\x11\x37\xa9\xae\x67\xd8\x20\x2d\x9c\xb2\x78\xdb\xf3\xb5\x34\x64\xcf\xcb\x06\xca\xaf\x9e\xfd\xd9\x26\x79\xae\x74\x5e\x6a\xa9\x4d\x0c\xc5\x77\xeb\x9b\x49\xdf\x1f\x5d\xa3\xd5\x1a\x6f\x77\xac\x25\xff\x0a\xd6\xf3\x3e\xdb\x0b\x64\x2f\x11\xbd\x59\x6d\x51\x59\x86\xa2\x96\x25\xc9\x6b\x7b\x54\x8e\x3f\xe5\x5a\xc9\x23\xc9\x3f\x72\x54\x42\xfe\x11\x9e\x9c\xe1\x17\x52\x2c\x5e\xce\xf2\xa7\x35\xf2\xaa\x0d\xda\xc0\x85\xc4\x52\xde\xe9\xba\x46\x85\xe4\x24\x3f\xe0\x9f\xc0\xdd\x19\x73\x92\x26\x32\x61\x6b\xc4\xbf\xf0\xc7\xd5\xa6\xfe\x8d\x67\x42\xea\xc1\x58\x2a\x2b\x18\xa3\xcd\x2a\xcf\x43\x69\x44\xe7\x56\xd9\x6c\x33\xc8\x37\x5a\x73\x3e\x7f\x1a\x48\x22\xb3\xe2\x3a\x9b\x31\x0e\xdf\x9e\x67\x1e\x37\xff\xa7\xfb\xed\x1b\x09\xdc\xbc\x96\xf2\xbe\x77\xc8\xfa\x2b\x58\xcb\xf7\x60\x87\x29\xe5\x31\x16\x67\x59\x08\x2e\xda\x19\x29\xdb\x2a\x8b\x49\xd7\xda\xb4\xdc\x45\xdf\x0b\x54\x33\x9e\x88\xc1\x36\xc1\x25\x8e\xa3\x86\xab\x2a\x0c\x30\xa1\x8b\x4e\x77\x80\xf3\x31\x0d\x59\x23\x8f\x5f\x28\x0b\xbf\x28\xb9\xfd\xe1\xfb\x57\x43\xc2\xd1\xd3\xd7\xc2\xa2\xe3\x10\xa4\xed\xa4\x70\x69\x84\xdb\x1a\xe0\x55\x4a\xaf\x38\x65\x58\xb8\x3f\xd5\xe0\x37\xbc\x2c\xa5\xb6\x7e\x32\x4f\xb0\x0c\xec\xe1\x09\xb1\x26\x79\x6d\xf7\xb6\xdf\xa5\x34\x49\x6a\xdf\x8f\xb4\xb8\x66\x94\x8d\x7b\x32\xec\xa1\xb8\xa7\x9b\xed\xe9\x60\x80\x46\x1c\xf2\x25\x0b\x2d\x13\x8a\x88\x8e\x0b\x13\x4a\x00\x96\x91\x4a\x8f\x5d\xca\x73\xf2\xc1\x88\x96\x1c\x1a\xe1\xc0\x76\xbc\x9c\x4c\x78\xef\x1b\x32\x84\x2d\x86\x54\x36\x29\xfd\x2b\xb1\x57\x9e\x03\x97\xef\x26\xfd\x47\xb5\x59\x67\x84\xda\x17\x35\xce\xed\xc0\x92\xc5\xac\xd8\x82\xe6\xc6\x8b\x23\x23\xf1\x64\x6b\xf7\xc8\x33\x20\x44\xa6\x29\xc4\x99\x37\x52\x0d\x25\xdf\x71\x0b\x8a\xb7\x90\x5e\x1e\xb0\xe1\x1e\x9d\x1f\xf7\xcc\x0b\x61\x2d\xeb\xe8\x4c\x42\xa3\x0a\x9d\x56\x7d\xbb\x03\x13\xc2\x64\x21\x81\x8c\xdc\x9e\x07\x3a\xbd\x8f\xc6\xef\xe3\x92\xc6\xa3\x7c\xb0\x02\x19\xb1\xd0\xb1\x33\x6d\xd8\x5e\xfa\x6b\xf9\x9f\x7f\x17\x14\x83\x72\xfd\x84\x3d\xf9\x1c\x94\x10\x95\x93\x8e\x00\x5e\x01\x80\x37\x81\xef\x3f\x42\x6f\xf7\xb1\xb4\x43\x5f\x26\x1a\x70\x7c\x27\xa1\x10\xca\x82\x71\x69\x24\xcc\x82\xe7\xe9\xcb\xf4\xab\x01\xd7\x1b\x35\x44\xb4\x9c\xc7\x79\x91\x27\x01\xfb\xcd\x53\x8f\x83\x66\x87\xc1\x92\x16\x57\x37\x0c\xff\x31\xaf\xdf\xe4\x76\x50\xd5\xc0\xe5\xdd\x02\xd3\x7f\x01\x00\x00\xff\xff\x42\x2c\x44\xb3\x27\x09\x00\x00")
var _runtimePluginsLinterLinterLua = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x8c\x55\xdb\x6e\xe3\x36\x10\x7d\xf7\x57\x10\x44\x55\x88\x89\xa4\xa0\x79\x34\x90\x02\xdb\x14\x0d\x50\x6c\xbb\x0b\x64\xdb\x7d\xe8\x65\x41\x4b\x23\x8b\x0d\x45\x0a\x24\x15\xc7\x28\xfa\xef\x1d\x92\x8a\x2c\x2b\x4a\xb4\x46\x10\x8e\xa9\x99\x73\xe6\x72\x3c\x12\x35\xb9\x03\xf7\xa1\x73\x42\xab\x94\x4a\xa1\x1c\x18\xca\xc8\xcd\x0d\x51\x42\x12\xd7\x80\xda\x10\xfc\xbc\xab\xaa\x99\x4f\x46\x9c\xe9\x81\x6d\x40\x55\x9b\x4d\xdd\xab\xd2\x3f\x25\xf1\xe1\x17\xad\xee\xf9\x23\xa4\x2c\xc4\xbe\x42\x31\x62\xfb\x8f\xd4\x25\x97\xa4\x76\xe4\x86\xdc\xf6\xe6\x77\x01\x87\x94\x15\x3f\xf4\x75\xf1\x93\x90\xf0\xe9\xd8\xc1\xdc\x13\xaf\x5f\xf8\x7e\xe4\xae\x99\xf9\x55\xf0\xa8\x7a\x29\xd1\x95\x5e\xa1\x7d\xe5\xbf\xd0\xd1\x07\x33\xfb\x70\xef\x6b\xa5\x07\xa1\x2a\x7d\xb0\xf4\x3c\x2b\xff\x99\x20\xfc\xfa\xdb\xfb\x53\xac\xaf\x7b\x82\xe3\x53\x47\x97\x3b\xbd\x00\x31\x34\xc5\x1f\x29\xdd\xeb\x5d\x2f\x64\x85\xfd\x43\x93\x04\x9b\xe4\x9a\x50\x52\x14\xcf\x5c\xf8\x28\xa9\xb7\x89\xdc\x92\xa4\xa5\xec\x2d\x28\x7f\x46\x24\x6f\x45\x90\x97\x3d\x19\xf1\x92\xea\x72\x86\x09\xd2\xc2\x29\xfb\xf7\x3d\x5f\x4b\x5f\xf6\xbc\x6c\xa0\x7c\xf0\xac\xcf\x36\xc9\x73\xa5\xf3\x52\x4b\x6d\x62\x0a\x7e\x3a\x5f\x4d\xfa\xf1\xe8\x1a\xad\xd6\x78\xbb\x63\x2d\xf9\x03\x58\xcf\xfb\x6c\x2f\x90\xbd\x45\x74\xbb\x3a\x9a\xb2\x0c\xcd\x2c\x4b\x92\xd7\xf6\xa8\x1c\x7f\xca\xb5\x92\x47\x92\x7f\xe6\xa8\x80\xfc\x33\x3c\x39\xc3\x5f\x29\xb1\x78\xbb\xca\x1f\xd7\xc8\xab\x36\x68\x02\x0f\x12\x5b\x79\xa3\xeb\x1a\x95\x91\x93\xfc\x80\x7f\x02\x6f\x67\xcc\x49\x9a\xc8\x84\xad\x11\xff\xcc\x1f\x57\x87\xfa\x0f\xfa\x84\xd2\x83\xb1\xd4\x56\x30\x46\x9b\x55\x9e\xfb\xd2\x88\xce\xad\xb2\xd9\x66\x90\x6d\xb4\xe6\x7c\xde\x1b\x48\x22\xb3\xe2\x32\x9b\x31\x0e\xbf\x39\xcf\x3c\x5e\x8e\x7a\xdf\xde\x4a\xe0\xe6\x9d\x94\x77\xbd\x43\xb6\x5f\xc0\x5a\xbe\x07\x3b\x6c\x21\x1f\xbb\xb8\xab\x42\x52\xd1\xce\x48\xd9\x56\x59\x2c\xb6\xd6\xa6\xe5\x2e\xc6\xce\x28\x66\xf8\x31\x96\x6d\x82\x6b\x5c\x3b\x0d\x57\x55\x58\x50\x42\x17\x9d\xee\x00\xf7\x5e\x1a\xaa\x44\x7c\x7f\x50\x16\xbe\x51\x72\xfd\xfd\xb7\xdf\x0d\x05\xc6\x48\x5f\xbb\xc5\xc0\x21\x39\xdb\x49\xe1\xd2\x08\xb7\x35\xc0\xab\x94\x5e\x70\xca\xb0\x51\x7f\xaa\x21\x6e\x78\x58\x4a\x6d\xfd\xc6\x9d\x60\x19\xd8\xc3\x13\x62\x4d\xea\xd9\xee\x6d\xbf\x4b\x69\x92\xd4\xbe\xff\x69\x71\xc9\x28\x1b\xef\x64\xb8\x43\x31\x4f\x2f\xdb\x93\x63\x80\x46\x1c\xf2\x25\x0b\x23\x12\x8a\x88\x8e\x0b\x13\x5a\x00\x96\x91\x4a\x8f\x53\xc9\x73\xf2\xc9\x88\x96\x1c\x1a\xe1\xc0\x76\xbc\x9c\x6c\x70\x1f\x1b\x2a\x84\x2d\xa6\x54\x36\x29\xfd\x3b\xb1\x17\x9e\x03\x8f\x6f\x26\xf3\x46\x75\x59\x67\x84\xda\x17\x35\xee\xe7\xc0\x92\xc5\xaa\xd8\x82\xc6\xc6\x17\x43\x46\xa2\x67\x6b\xf7\xc8\x33\x20\x44\xa6\x29\xc4\x59\x34\x52\x0d\x2d\xdf\x71\x0b\x8a\xb7\x90\xbe\x5c\xa4\xe1\xbd\x38\x77\xf3\x8c\x0b\xe9\x9c\xeb\xe6\x4c\x32\xa3\xda\x9c\x56\x7d\xbb\x03\x13\xd2\x62\x21\xe1\x8c\x5c\x9f\x27\x36\x7d\xcf\x8c\xfa\x7f\x4d\xcb\x51\x2e\x58\x71\x46\x2c\x74\xec\x4c\x0b\xb6\x97\xfe\xf5\xfa\xef\x7f\x0b\x0a\x41\x79\xfe\x81\x33\xf8\x2b\x4c\x3e\x2a\x25\x1d\x01\xfc\xc4\x01\x37\xbd\x9f\x37\x42\x6f\xf7\xb1\x95\xc3\x1c\x26\x33\x77\x7c\x27\xa1\x10\xca\x82\x71\x69\x24\xcc\x42\xe4\xe9\x17\xe8\x4f\x03\xae\x37\x6a\xc8\x68\xb9\x8e\xf3\xe6\x4e\x12\xf6\x97\xa7\x99\x06\x8d\x0e\x8b\x23\x2d\x2e\xae\x18\xfe\x63\x5e\xaf\xc9\xf5\xa0\xa2\x81\xcb\x87\x05\xa6\xff\x03\x00\x00\xff\xff\xc7\x61\x41\xe2\xef\x08\x00\x00")
func runtimePluginsLinterLinterLuaBytes() ([]byte, error) {
return bindataRead(
@@ -295,7 +295,7 @@ func runtimePluginsLinterLinterLua() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "runtime/plugins/linter/linter.lua", size: 2343, mode: os.FileMode(420), modTime: time.Unix(1464645544, 0)}
info := bindataFileInfo{name: "runtime/plugins/linter/linter.lua", size: 2287, mode: os.FileMode(420), modTime: time.Unix(1465403847, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -355,7 +355,7 @@ func runtimeSyntaxMakefile() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "runtime/syntax/Makefile", size: 17, mode: os.FileMode(420), modTime: time.Unix(1464645544, 0)}
info := bindataFileInfo{name: "runtime/syntax/Makefile", size: 17, mode: os.FileMode(420), modTime: time.Unix(1465309572, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -720,7 +720,7 @@ func runtimeSyntaxErbMicro() (*asset, error) {
return a, nil
}
var _runtimeSyntaxFishMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x74\x55\x5b\x6f\x1b\x37\x13\x7d\xf7\xaf\xd8\xac\x8c\xcf\x92\xf3\xd9\x4d\xd2\x24\x68\xd3\x8b\x5b\x14\x28\xfa\xd4\x97\x02\x7d\xa8\xd7\x76\xb9\xdc\xd9\x5d\x66\x79\x0b\x2f\x92\xd5\x4c\xfe\x7b\x0f\x29\xa5\x49\x00\x1b\x10\x87\x5c\x72\x38\x97\x33\x87\xa3\xd5\xaa\xf9\x8d\x02\x35\x2a\x36\xc2\x36\x74\x2f\x8c\xd7\xd4\x8c\x2e\x34\xbf\xaa\x38\x37\x71\x26\xad\x9b\x28\x83\xf2\x29\x5e\x9e\xac\x56\x27\x71\x6f\x93\xb8\x6f\xda\x11\xc7\x6d\xd3\x76\x97\x65\x71\xda\x9e\xcc\x24\x06\x0a\x4d\x7b\xbb\x7a\x72\x79\xfe\xd5\x9a\xec\xb6\x79\xba\xb9\x2a\x87\xeb\x86\x4f\x37\xed\x09\x2e\x37\xbf\x67\xd3\x53\x88\x27\xd2\x69\x78\xe8\x83\x9a\xe6\x24\xf7\x70\xdc\x76\xfd\xf5\xb3\x8b\x6f\x6f\x9e\x76\xfd\x41\xf3\x17\x67\x07\x95\x94\xb3\x42\x97\xc8\x86\x46\x3a\x9b\x82\xd3\xcd\xa8\xdd\xee\x8b\xfb\x7b\x44\xe8\x76\xc5\xc2\x1a\x7a\xdc\xd3\xa4\x2c\xf7\x81\xc4\xc2\x52\x44\xe2\x72\x51\xd9\x4c\x4c\x1a\x5f\x04\x15\x64\xc7\x63\xb6\xb2\x98\x67\x35\xb2\x75\x89\xb1\x15\x28\xe5\x60\x39\x92\x26\x99\x38\xce\x6a\x84\xdc\xa9\x24\x67\xde\xcd\x4a\xd3\xa6\xc4\xf6\xb9\x67\x23\x26\x02\x18\x4d\xbb\xee\xde\x73\xf7\x81\xbb\x35\x77\x1b\xee\xbe\xe3\xee\x86\xbb\x6b\xfe\x9b\xbb\x8e\xbb\x53\xfe\x9e\x7f\xe4\x5b\x7e\xc2\x3f\xf0\xff\xb8\xe3\x23\x12\x15\x5d\xe9\x8c\x41\xcc\x1f\xf1\x98\x02\x51\x85\x62\xdd\x4f\xdc\xab\x92\x8c\x76\x72\x39\x24\xe3\x9d\xb2\x89\xfb\xac\x34\xb2\x61\x39\x20\xaf\x8c\x8d\xa3\x89\x8f\xb3\x56\xb6\x64\x5c\x8a\x98\x88\x07\x15\xe6\x22\x22\x93\x9c\x1d\x93\x51\x89\x69\x2b\x34\xd3\x3d\x49\x08\x7c\x8e\x13\x97\x1a\x55\x71\x07\xa8\x46\x75\xd8\xb8\x53\x03\x72\x3b\x2c\x3d\xf2\x0c\xc7\x65\x80\xed\xe3\x76\xc5\xe0\x8b\x9d\xec\x07\x91\xe8\xee\xe8\x1f\xe8\xc6\xba\x3f\x54\xb4\xe9\x30\x45\xb1\xa5\xff\xd0\x8f\x0c\x7e\x79\x9e\x55\x4c\x2e\xec\xf9\xad\xeb\x23\x1b\x91\x66\x36\xca\xd0\xd0\xb3\xa5\xfb\x34\xb0\xf3\x64\xd9\x3b\x3f\xb0\x0f\xb4\x85\x8c\xb9\x67\x9f\x8b\x61\xbf\x1b\x38\x20\x6f\x67\x50\x3e\x31\xa0\x78\xa9\x8c\xbb\x0a\x28\xc7\x24\x52\x8e\x98\x82\xb2\x13\xa7\x20\x3c\xa7\xbd\x27\xce\x5a\x15\x28\xb2\x11\x71\xe1\xad\x08\x34\x6c\x3e\xf1\xce\x18\x67\x1b\xe0\x98\xef\x1f\xaf\xcf\x7a\x62\x35\x6d\xae\xc4\x0e\xc5\x11\x40\x6f\x10\x15\x42\xd4\xa1\xdb\xbd\x7f\xf6\xff\x97\x1f\xa0\xea\x79\x51\x5a\x57\x21\x30\x1f\x0f\x34\xc5\x92\xe2\x42\xec\xeb\x71\x04\x2c\xb8\x9b\x44\xf8\x2c\x84\x40\x39\x29\xf0\xfe\x71\x7e\x80\xd8\xaf\x5f\x16\xdf\x64\x85\x41\xc5\x05\x98\x30\xa3\x7c\x90\x53\xf0\x90\xc6\x81\x13\xb3\xdb\x95\x9d\xe0\x40\x70\xb9\xc4\x6c\x2a\x4d\x58\x42\x21\x7a\x0d\x04\x64\x4e\x5c\x4a\xc6\xc3\xc0\xc3\x58\xa8\x52\x46\xf5\x16\xcb\xaa\x1a\x1f\x32\x5e\xcd\x16\x74\xf1\x85\x68\x98\xc0\x05\x21\x53\x79\x44\xa2\x3c\xa9\xd1\xa0\xfc\x4e\x0f\x5c\x5a\x00\xcf\x2e\x26\x35\x70\xf9\x59\xe0\x8f\x14\xdf\x82\xb9\x0c\x40\x17\xd6\x98\xdd\x54\x8d\x6a\xa0\x30\xbc\x2a\x21\x99\xa5\xb8\x35\xcb\xa8\x46\x87\xc9\x22\x70\xb3\x24\x32\x9e\xcd\x96\xad\x92\xc4\x56\xe3\x89\xce\xd9\xb3\x05\xd9\x24\xdb\x6c\x8a\x4b\xe8\x79\x11\x11\xbb\x07\x61\xe4\xbc\xb0\x87\x8b\x3d\x28\x82\x1f\x9e\x4a\x09\xb9\x2e\x46\xf6\xe9\xfe\x40\x14\xc4\x57\xe3\xc0\x42\x97\x5b\x1c\x40\x1b\x53\xdc\x07\x10\xd2\x95\xb7\xff\x8e\xd7\x71\x16\xcf\x51\x13\xf1\xe2\xc5\xcb\x3a\xbd\x7a\x5d\xa6\xaf\xbf\xa9\x5f\xaf\x9e\xbf\xd8\x94\xa8\xe3\x1c\x6a\xe5\xf2\xc8\x51\x13\x8a\x1d\x5d\x00\xf5\x2a\xaa\x85\x76\x10\x43\x5f\x0e\x53\xda\x73\xbd\xb0\xb7\x12\x65\x2e\x43\x69\x4e\x44\x18\x31\x71\x02\xd1\xab\x70\x28\x45\x72\x19\xcd\x26\x05\xfc\xd0\xaf\x52\x09\xaa\x14\x27\x55\xdb\xc5\x50\xae\xd8\x65\x7b\xac\x45\xb6\xea\x1d\x44\xcd\x29\x47\x34\x56\xde\x96\x64\x76\x12\x0d\xcb\x95\x21\x8c\xe2\x3d\xc5\xcd\x03\x5d\x15\x8d\x54\x4c\xf1\xc1\x4e\x7a\x71\x71\x2d\x2e\xfe\xb9\xb8\x79\xda\x3e\xdc\x68\x9b\x7a\x5e\x8e\x8b\xcd\x3f\xea\xeb\x7a\xa8\xa7\xa3\x2f\x76\x97\x7c\x7d\xdb\xde\x6c\xce\xdb\xf6\x01\x85\xb3\xa3\xc2\x19\x14\xce\x1e\xe9\xad\xed\x23\xfb\x67\x07\xef\x7f\x8a\xa0\x44\x8f\x57\xf5\xa0\xd6\x5a\x6d\x10\xef\x69\xf7\xfe\xaa\xfc\xbb\xfc\x7c\xf1\xd7\xdd\x93\x9f\x56\xa7\xe7\x57\xc8\xad\xfb\x70\xf5\xe9\xc5\x43\xf9\x4b\x03\xbd\x16\x72\x41\x63\xbf\xe5\xeb\xeb\x37\xd1\x0b\x49\x6f\x6e\x6e\x36\xab\xcb\x73\xfc\xd3\xfd\x1b\x00\x00\xff\xff\x09\x05\x1b\x07\x33\x07\x00\x00")
var _runtimeSyntaxFishMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x74\x55\x6d\x6f\x1c\x35\x10\xfe\x9e\x5f\xb1\xdd\x44\xcd\x5d\x4a\x42\x5b\xda\x0a\xca\x4b\x40\x40\x25\x3e\x40\x3f\x80\x50\x44\x36\x09\xde\xb5\x77\xd7\x3d\xbf\xd5\x2f\x77\x39\x3a\xfd\xef\x3c\xe3\xbb\xa6\x42\xa1\xd2\x79\xec\xf5\xd8\xe3\x99\x79\x9e\x99\x4b\x5b\x97\xc5\x6d\xd3\x8e\x3a\xcd\x6d\xd3\x76\x67\xbc\x38\x6a\x0f\x66\x25\xa4\x8a\x4d\x7b\x7d\xf8\xe0\xec\xe4\xf3\x85\x72\xeb\xe6\xd1\xf2\x9c\x95\x8b\x86\x8e\x96\xed\xc1\xc1\x61\xf3\x5b\xb1\xbd\x8a\xe9\x60\xf0\xc6\xc7\x66\xf0\x2e\x65\xe1\x32\x8c\xf4\x97\x8f\x4f\xbf\xba\x7a\xd4\xf5\xf5\xd8\x8f\xde\x49\x9d\xb5\x77\xc2\xa4\x46\x38\xc9\x27\x73\xf4\xa6\x19\x8d\xdf\xec\x2f\xe3\x66\x56\x56\xed\x6e\x2f\x70\x88\x7a\x35\x69\x47\x7d\x54\x62\x45\x83\x48\x8a\xf8\x96\x76\x45\x91\x32\xf8\x52\x38\x32\xfa\x48\x63\x71\x03\xdb\x26\x3d\x92\xf3\x99\xb0\x15\x55\x2e\xd1\x51\x52\x46\x0d\x99\xd2\xac\x47\xc8\x8d\xce\xc3\x4c\x9b\x59\x1b\xb5\x64\xbf\xf6\xcf\x06\x35\x68\x61\x9a\x76\xd1\xbd\xa3\xee\x3d\x75\x0b\xea\x96\xd4\x7d\x4d\xdd\x15\x75\x97\xf4\x37\x75\x1d\x75\x47\xf4\x0d\x7d\x47\xd7\xf4\x80\xbe\xa5\x87\xd4\xd1\x2e\xf8\x57\x48\x05\x22\xb1\x16\xce\x7e\x48\x41\xde\x06\x55\x03\xe8\x27\xea\x35\x07\x61\xfc\xb0\xda\x05\x11\xbc\x76\x99\xfa\xa2\x0d\xa2\xa0\x41\x22\x9e\x82\x8d\xbd\x85\x0f\xb3\xd1\x8e\x23\xb5\xc1\xa8\xac\x48\xea\x38\xb3\x48\xa4\x86\xd9\x93\xb2\x3a\x93\x5a\x0b\x43\xea\x56\x0d\x10\xf8\x1c\x27\x62\x50\xaa\xb8\x41\x8a\x46\xbd\xdb\xb8\xd1\x12\xd9\xdc\x2d\x83\x98\x54\xdc\x2f\x23\x6c\xef\xb7\xa3\x9e\xe6\xfc\x9f\x9d\x12\x24\x60\xb8\xd9\xbf\x8f\xac\xa6\xba\x2f\x6b\x96\xd5\x6e\x4a\x62\xad\xee\xb2\x9e\x68\x56\x26\xd0\xac\x53\xf6\x71\x4b\x6f\x7c\x9f\xc8\x8a\x3c\x93\xd5\x56\xc9\x9e\x9c\xba\xcd\x92\x7c\x50\x8e\x82\x0f\x92\x42\x54\x6b\xc8\x54\x7a\x0a\x85\x0d\x87\x8d\xa4\x88\xb8\xbd\x05\x6c\x42\x02\xb4\xcc\xe3\xa6\xe6\x93\x98\x15\x25\x61\x8a\xda\x4d\x94\xa3\x08\xc4\x29\xa6\x62\x34\xa7\xa2\x58\x91\x56\xb4\x16\x51\xc9\xe5\x1d\xd7\xac\xf5\xae\x41\x1a\xcb\xed\x27\xd1\x59\x4c\xa4\xa7\xe5\xb9\xd8\x00\x1a\x81\xdc\x49\x51\x13\x08\x14\xba\xcd\xbb\xc7\x9f\x3d\x7b\x3f\x45\x15\x68\xa5\x8d\xa9\x42\x60\xde\x2b\x8c\x4a\x1c\xe0\x4a\x51\xa8\xea\x84\xa4\xe0\x6e\x16\xf1\xa3\x03\x51\x95\xac\xc1\xf4\x4f\x72\x03\x64\x7e\xf1\x8c\x5f\x56\x4e\x58\xa0\x2d\xc0\x82\x19\xd0\x41\x4e\x31\x40\x5a\x0f\x3e\xcc\x7e\xc3\x3b\xd1\x83\xd4\xc3\x2a\x15\x5b\x29\x42\x03\x0e\xa4\x60\x10\xfd\x50\x32\x31\x5c\x24\x25\xc9\x91\x69\xc2\xa3\x3e\x96\x78\x55\x8d\xcb\x82\x4a\x59\x83\x2a\x81\x49\x86\x09\x3c\x10\x43\xe6\xc2\x11\x5c\x46\xa3\x05\xf4\xde\x48\xe2\x7a\xa7\xd9\xa7\xac\x25\xf1\x8f\x6b\x19\x01\xbe\x01\x6b\x09\xd9\x5c\x91\xc1\xec\xa7\x6a\xd4\x20\x07\xf2\x39\xbb\x64\x57\xfc\xac\x5d\x8d\x7a\xf4\x98\x1c\x1c\xb7\x2b\x14\x72\x20\xbb\x26\xa7\x07\x45\xce\xa0\x2c\xe7\x12\xc8\x81\x68\x03\xb9\x62\xf9\x49\x9c\x0b\x22\xc1\xf7\x00\xb2\x0c\xf3\x8a\x02\x9e\xd8\x82\x1e\xf8\xa1\x4c\xd8\xe5\xba\x18\x29\xe4\xdb\x1d\x49\xe0\x5f\xf5\x03\x0b\xc3\xb7\x28\x82\x32\x96\x9f\x8f\x20\xa3\xe7\x7a\x7f\x4b\x8b\x34\x8b\x27\x40\x44\x3c\x7d\xfa\xac\x4e\xcf\x5f\xf0\xf4\xc5\x97\xf5\xeb\xf9\x93\xa7\x4b\xf6\x3a\xcd\xb1\xe2\x56\x46\x4a\x46\x01\xea\xe4\x23\x68\x57\xb3\xca\x94\x83\x90\x3d\x2b\x73\xde\x52\xbd\xb0\x75\x03\x40\xe6\xa1\x0d\x65\xa5\x30\x52\xa6\x0c\x92\x57\xe1\x01\x45\xf6\x05\x0d\x26\x47\xfc\xd0\xa3\x32\x3b\xc5\xe0\xe4\x6a\x9b\x0d\x95\x9a\xbb\xe2\xf6\x58\x14\xa7\xdf\x42\xd4\x98\x4a\x42\x1b\xa5\x35\x07\xb3\x19\xd0\xa4\x3c\x0f\x61\x35\x6d\x55\x5a\xde\xef\xa2\x68\x9c\x62\x4a\xf7\x3b\xe7\xe9\xe9\xa5\x38\xfd\xe7\xf4\xea\x51\xfb\x3f\x5d\xb5\xa9\x4a\xd6\xc1\xd8\xef\xb5\xa2\xee\x77\x6e\xf4\xc1\xee\x8c\x2e\xaf\xdb\xab\xe5\x49\xdb\xde\x53\x1f\xef\xd5\xc7\x50\x1f\xdf\xeb\xa1\xed\xbd\x9d\xe3\xfa\xd8\x9f\x22\x6a\xd1\xa3\x74\xf6\xea\xda\x99\xf4\xa8\xf1\xf7\xb2\xd0\x4b\xb8\x76\xd4\xbd\x3b\xe7\x7f\x8c\x1f\x4e\xff\xba\x79\xf0\xfd\xe1\xd1\xc9\x39\x62\xe8\xde\x9f\xdf\x55\x34\xce\xa7\xe6\x61\xf3\xc7\xeb\x9f\x5e\x7f\xf4\xd9\xee\x02\x5b\x5c\xd3\xe5\xe5\xcb\x14\xc4\xa0\x5e\x5e\x5d\x2d\x0f\xcf\x4e\x8e\x3e\xf8\x91\xbd\xf4\x38\xc0\xd7\xe8\xe2\xe2\x82\x5e\xfd\x72\xf1\xeb\xcf\xcb\x97\xe7\xed\xbf\x01\x00\x00\xff\xff\x11\x2a\x5c\x2d\xf5\x06\x00\x00")
func runtimeSyntaxFishMicroBytes() ([]byte, error) {
return bindataRead(
@@ -735,7 +735,7 @@ func runtimeSyntaxFishMicro() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "runtime/syntax/fish.micro", size: 1843, mode: os.FileMode(420), modTime: time.Unix(1464645544, 0)}
info := bindataFileInfo{name: "runtime/syntax/fish.micro", size: 1781, mode: os.FileMode(420), modTime: time.Unix(1465309572, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -1195,7 +1195,7 @@ func runtimeSyntaxMakefileMicro() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "runtime/syntax/makefile.micro", size: 967, mode: os.FileMode(420), modTime: time.Unix(1464645544, 0)}
info := bindataFileInfo{name: "runtime/syntax/makefile.micro", size: 967, mode: os.FileMode(420), modTime: time.Unix(1465309572, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -1740,7 +1740,7 @@ func runtimeSyntaxSedMicro() (*asset, error) {
return a, nil
}
var _runtimeSyntaxShMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x7c\x92\x6f\x6f\xd3\x30\x10\xc6\xdf\xf7\x53\x78\x49\xc5\x92\x96\x16\xde\x32\xfe\x94\x4d\x48\x0c\x6d\x2f\x26\x21\xde\x50\x77\xc3\x75\x2e\x8d\x55\xc7\x09\xb6\xb3\x15\xf6\xec\xbb\x73\x5b\x9b\xb5\x12\x08\xa9\xbd\xde\x9d\x9f\xbb\x3e\xfe\x25\x69\x2a\xce\xc9\x93\x30\x41\x28\x27\x68\xa3\xea\xd6\x92\x28\x1b\x2f\xce\x9a\xce\x3b\x12\xa1\x22\x6b\x45\xd0\xde\xb4\x31\x4c\x07\x69\x3a\x08\xbf\x5c\x54\x1b\x91\x7c\x3d\x4f\x44\x22\xa7\xa1\x1a\x3e\xfd\x2e\x55\xa8\x9e\x13\xaf\x39\x7d\x4e\xb6\xbd\x1b\x65\x8d\x0a\x14\x76\x27\x07\xe5\xee\xbc\xec\x9c\x8e\xa6\x71\xcf\x8a\xc3\xc6\x4e\xd3\xfa\xa6\x34\x96\x7a\xc5\xbe\xbc\x5a\xaf\xfa\xec\xe2\xf3\xd9\xb7\x2f\x97\x9f\x38\x9d\xd2\xb2\x33\xb6\x90\x8f\x0e\x4f\xaf\x2e\xb6\xed\x41\x45\xaa\x20\x2f\x92\xeb\xf4\x68\x3a\x7a\x95\x91\xbb\x15\xe3\x7c\x96\x2d\x55\x3e\x0b\x55\x26\x30\xcc\x93\xc1\x40\x37\x96\x21\x84\xa8\x22\xd5\xe4\x22\x1b\x58\x66\x9a\xfd\xa2\x68\xf8\xe3\x08\x64\x4d\xc9\x81\x3b\x14\x94\x06\x6d\x4c\x44\x69\xc0\xe8\xd0\xfb\x06\x2b\x8c\x83\x6d\xb4\xb2\xf0\xfc\xaf\x1c\x22\x53\x45\x20\x4b\x3a\x22\x54\xa6\x8c\x88\x15\x39\x44\x53\x13\x3a\x17\x8d\xc5\x5d\xc5\xf7\xc8\xe5\x32\xe9\x3d\xb4\xa4\x8d\xb2\x22\xc9\xe4\x3d\xe4\x03\x64\x06\x99\x43\xbe\x85\x5c\x40\xce\xf1\x03\x52\x42\x0e\xf1\x0e\x1f\x70\x84\xf7\x78\x01\x89\xfc\xaf\xd9\xc9\xfc\xb2\xa0\x72\xe5\xbb\xbb\xcd\xe2\x60\xf5\xfe\x7a\x93\x8c\x7e\x82\xaf\xb5\x8a\xb0\x11\x2b\x82\x25\x04\x38\xfc\xce\xff\x29\x7f\xa2\x11\xa1\x0b\xe8\xaa\x6e\x1e\x63\x73\xe7\xa0\x5b\x10\x67\x60\xa4\x0c\xa4\x6d\x3c\x6f\xf2\xd4\x32\x04\x1e\xb5\x96\x77\xf2\x76\x87\x5a\xad\x09\xf5\xba\x30\x1e\xf5\x2d\x7c\xcd\x3c\x0a\xfe\x32\x0a\xe5\x11\x9b\x4e\x57\xe8\x6a\x15\xd6\x0c\x84\xbb\x07\x06\xfa\xf8\xb8\x8e\x5d\x64\x26\xe7\xa7\x28\xc3\x78\xfe\x7a\xf2\xe6\x74\xf2\xfd\x66\x31\xe6\x42\x66\x32\xff\xdf\x80\x1c\xca\xfb\x59\x3f\x71\xf4\x31\x1d\x8e\x66\x13\x1e\x7c\x98\xed\x87\x76\xf2\x84\x91\xcb\x29\xe6\xd7\xc9\x22\x1f\x25\xfc\x0e\x1d\xef\xea\x63\xae\x8f\xf7\xf2\x7a\xcb\x24\xbb\xc6\x7c\x7e\x12\x5a\xa5\xe9\x64\xb1\xc8\xd3\xe9\x68\x98\x0c\xd2\xad\xe8\x25\x73\x20\x27\x92\x03\xc1\x98\x4f\xff\x04\x00\x00\xff\xff\x23\x55\x48\x55\x7f\x03\x00\x00")
var _runtimeSyntaxShMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x94\x54\x69\x6f\xdc\x36\x13\xfe\xee\x5f\x21\xcb\x8b\x58\xb2\xdf\xf5\x9b\xb8\x76\xd0\xba\xc7\x36\x6d\xda\x22\x48\xdb\x04\xe8\x01\xa3\xab\x75\xca\x25\xa9\x15\x2b\x1e\x0a\x0f\xaf\xb7\x1e\xff\xf7\xce\x70\x65\x3b\xc0\x36\x1f\x0a\x88\xc3\x11\x67\xc8\x79\xe6\x0c\x1b\x1b\xd9\x4d\x51\x86\x4e\x6a\x5d\x16\x65\x73\x12\xba\x49\xde\x97\x2c\x74\x0f\x8c\xe7\xc8\x3e\x30\xdb\xb3\x77\x4c\x2b\x16\x64\x18\x25\x1f\xfc\x8e\xf2\x36\x59\x1e\x95\xb3\x0f\x1a\x1f\x1e\x8c\x3a\x83\x77\xad\xd2\xf2\x5e\xe3\xf1\xf7\x6d\xbf\xba\xe7\x5e\xff\xf0\xcd\x6f\xaf\x7e\x7c\x89\xec\x89\x5c\x26\xa5\x45\x43\x08\x5f\xbc\x7d\xbd\x3d\xde\xeb\x24\x13\xd2\x17\xe5\xd5\xc1\xfe\xc9\xd1\xff\x2b\x69\xaf\x8b\xe3\x7a\x56\x2d\x59\x3d\x0b\x5d\x55\xc0\xa4\x2e\xf7\xf6\x0e\x8a\x9f\x93\x59\x4a\x1f\xf6\xb8\xd3\xce\x17\x1c\x61\x44\x66\x23\x22\x59\xce\x9f\x4e\x3f\x5b\x1c\x37\xcb\xac\xf6\xad\xb3\x42\x11\x4a\xa6\x43\xc1\xac\x20\xcd\xe8\x9d\x2e\x5a\xed\xd6\xe3\x65\xbc\x19\xa5\x91\xdb\xdb\x15\x47\xb7\x41\x38\xfc\xac\x04\xa9\x55\x8b\x04\x4f\x64\x60\x1c\xe4\x8d\x8a\xd0\x2a\x68\x9d\x87\x7b\xf7\x01\x35\x94\x05\xed\x38\xd3\xe0\x11\x3c\x92\x98\xbc\x85\x20\xb5\xe4\x11\x42\xa7\xda\x08\xb1\x93\x16\xa2\x32\x12\x92\x8d\x4a\xc3\xba\xc3\x70\xd4\x04\x72\xc4\x30\x48\xae\x98\x2e\xca\xaa\xb9\x85\xe6\x0e\x9a\x0a\x9a\x1a\x9a\xcf\xa1\x59\x40\x33\x87\x3f\xa1\x69\xa0\x99\xc0\x17\xf0\x15\xec\xc3\x97\xf0\x04\x1a\xd8\xc6\xe1\x17\x4a\x35\x7a\x65\x0c\x7a\x77\x1f\x8e\xb8\x19\xe4\xd6\x19\x01\x92\x77\x0e\x81\x0f\xce\x47\xd0\x12\xf1\xe0\x4a\x86\x85\x1e\x91\x20\x5f\x3f\x04\xca\x18\x67\x0b\xad\x6c\xba\xf9\xe8\x73\xd5\x0a\xd4\xaa\x9e\xb1\x75\x0f\x94\x60\x10\x44\x5a\x65\x05\x34\xeb\xdb\xa7\xff\x3b\xbb\x5b\x79\x39\x40\xaf\xb4\xce\x84\xe1\x3e\x0a\xb4\x0c\x01\x0c\xeb\x25\x0c\x59\x1c\xa4\xc0\xc8\x40\x64\xfe\x11\x80\x97\x09\x43\x13\x3e\x6a\x1d\x4d\xca\xe7\x67\x64\x59\x5a\x86\x91\xe4\x2c\x02\xef\x30\xa1\x48\x57\x7e\x40\x6a\x9c\x40\xea\xd6\x74\xe2\x9d\x43\x71\x1f\x92\x01\x7a\x10\x38\x2a\x84\x41\x63\x02\x79\x8a\x88\x3c\x62\x96\x05\x88\x16\x84\xf2\xb4\xb2\xb1\x40\x5c\x7e\x5c\x24\xc0\xd2\xa3\xc0\x21\x14\xda\x30\xe3\x8c\x47\x4a\x3c\xa3\x7a\x68\x0d\x56\x82\xd3\x02\xa8\x5e\xa1\x73\x21\x2a\x01\xf4\x51\x21\xa2\x83\x7f\x39\x2a\x0a\x65\x7b\xd0\x54\x1c\xab\xfc\xa8\xc6\x18\x88\x73\x82\x64\x7a\x32\x6b\xfa\x56\xb5\x0e\x37\x8b\xc0\x4d\x8f\x55\x38\x80\xb9\x06\xab\xb8\x04\xab\xc1\xba\x2e\x0d\x60\xb1\x8d\x38\xd8\x64\xc8\x24\xea\x0d\x2c\x20\xf6\x81\xc5\x8e\x77\x3d\x0c\x68\x62\x03\x88\x6e\xf0\xca\x46\x82\x9c\x99\x16\x86\x78\x03\xc3\x5a\xe4\x92\xcc\x38\x90\xd1\x74\x0b\xbc\xc1\x8f\xcc\x7b\x2c\x61\x47\x85\xfa\x1e\xaa\xd0\xb1\x67\x98\x11\x76\x7a\x7a\x96\xb7\xf3\xe7\xb4\x7d\xf2\x69\xfe\x3b\x7f\x76\x5a\x13\x6a\x9c\x18\x39\x6f\xa9\x85\xa0\x25\xa6\x3a\x50\x55\x6d\xa3\x4a\x5d\x84\x44\x2c\x49\x18\xe3\x06\xf2\x85\x8d\xe5\x98\x64\x5a\x58\xf4\x51\x4a\x5c\x21\x6e\x1b\x81\x88\xc3\x54\x44\x97\x38\x56\x82\xc7\x2f\x49\x22\x96\x53\x72\x62\x7e\x9b\x1e\x4a\x39\x76\xc9\x8e\xb9\x48\x56\xbd\x47\x92\x7d\x4a\x01\x67\x00\x5c\x93\x33\x6b\x8e\x4d\xe5\x68\x31\xa3\x60\x23\x43\xbd\x3b\x02\xb0\xeb\xd9\x2a\xec\xb6\xfd\x74\x3a\x67\xd3\xbf\xa7\x8b\xe3\xf2\x5f\x46\x42\x91\x85\x24\xa3\x76\x8b\x18\xdd\xd5\xee\xd8\xc1\xbe\x6d\x4e\x60\x7e\x55\x2e\xea\xa3\xb2\xdc\x11\x1f\x8e\xe2\x43\x14\x1f\xee\xf4\x7c\xb9\x73\x72\x98\x8d\xfd\xce\xbc\x62\x4b\x6c\x9d\x51\xac\x04\x22\x52\xad\xc2\xf1\x58\xa9\x1a\xa1\x4d\x9a\xdb\x19\x8d\xbb\x17\xd3\x3f\xde\xed\x7f\x7d\x30\x39\x9a\xa1\x0f\xcd\xdd\xac\xfc\xef\x17\xc6\x11\x80\xfa\xa1\x78\x52\xfc\xfa\xe6\xe5\x9b\x47\x27\xcd\x36\x12\xd5\x15\xcc\xe7\x17\x61\x60\x5c\x5e\x2c\x16\xf5\xc1\xc9\xd1\xe4\xde\x50\x74\xc2\xa1\x02\x5d\x83\xcb\xcb\x4b\xf8\xfe\xd5\xe5\x4f\xdf\xd5\x17\xb3\xf2\x9f\x00\x00\x00\xff\xff\x9b\x4e\xdc\x62\x92\x06\x00\x00")
func runtimeSyntaxShMicroBytes() ([]byte, error) {
return bindataRead(
@@ -1755,7 +1755,7 @@ func runtimeSyntaxShMicro() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "runtime/syntax/sh.micro", size: 895, mode: os.FileMode(420), modTime: time.Unix(1464645544, 0)}
info := bindataFileInfo{name: "runtime/syntax/sh.micro", size: 1682, mode: os.FileMode(420), modTime: time.Unix(1465309572, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}

4
cmd/micro/statusline.go
View File

@@ -18,10 +18,6 @@ func (sline *Statusline) Display() {
y := sline.view.height + sline.view.y
file := sline.view.Buf.Name
// If the name is empty, use 'No name'
if file == "" {
file = "No name"
}
// If the buffer is dirty (has been modified) write a little '+'
if sline.view.Buf.IsModified {

65
cmd/micro/tab.go Normal file
View File

@@ -0,0 +1,65 @@
package main
type Tab struct {
// This contains all the views in this tab
// There is generally only one view per tab, but you can have
// multiple views with splits
views []*View
// This is the current view for this tab
curView int
// Generally this is the name of the current view's buffer
name string
}
func NewTabFromView(v *View) *Tab {
t := new(Tab)
t.views = append(t.views, v)
t.views[0].Num = 0
return t
}
func (t *Tab) SetNum(num int) {
for _, v := range t.views {
v.TabNum = num
}
}
// CurView returns the current view
func CurView() *View {
curTab := tabs[curTab]
return curTab.views[curTab.curView]
}
func DisplayTabs() {
str := ""
for i, t := range tabs {
if i == curTab {
str += "["
} else {
str += " "
}
str += t.views[t.curView].Buf.Name
if i == curTab {
str += "]"
} else {
str += " "
}
str += " "
}
tabBarStyle := defStyle.Reverse(true)
if style, ok := colorscheme["tabbar"]; ok {
tabBarStyle = style
}
// Maybe there is a unicode filename?
fileRunes := []rune(str)
w, _ := screen.Size()
for x := 0; x < w; x++ {
if x < len(fileRunes) {
screen.SetContent(x, 0, fileRunes[x], nil, tabBarStyle)
} else {
screen.SetContent(x, 0, ' ', nil, tabBarStyle)
}
}
}

35
cmd/micro/tabbar.go
View File

@@ -1,35 +0,0 @@
package main
func DisplayTabBar() {
str := ""
for i, v := range views {
if i == mainView {
str += "["
} else {
str += " "
}
str += v.Buf.Name
if i == mainView {
str += "]"
} else {
str += " "
}
str += " "
}
tabBarStyle := defStyle.Reverse(true)
if style, ok := colorscheme["tabbar"]; ok {
tabBarStyle = style
}
// Maybe there is a unicode filename?
fileRunes := []rune(str)
w, _ := screen.Size()
for x := 0; x < w; x++ {
if x < len(fileRunes) {
screen.SetContent(x, 0, fileRunes[x], nil, tabBarStyle)
} else {
screen.SetContent(x, 0, ' ', nil, tabBarStyle)
}
}
}

5
cmd/micro/view.go
View File

@@ -45,6 +45,8 @@ type View struct {
// This is the index of this view in the views array
Num int
// What tab is this view stored in
TabNum int
// Is this view modifiable?
Modifiable bool
@@ -602,9 +604,6 @@ func (v *View) DisplayView() {
}
}
indentChar := []rune(settings["indentchar"].(string))
if x-v.leftCol >= v.lineNumOffset {
screen.SetContent(x-v.leftCol, lineN, indentChar[0], nil, lineIndentStyle)
}
if x-v.leftCol >= v.lineNumOffset {
screen.SetContent(x-v.leftCol, lineN+v.y, indentChar[0], nil, lineIndentStyle)
}