Przeglądaj źródła

Go format: go fmt

Johan Rong 1 tydzień temu
rodzic
commit
1211d85ec0

+ 5 - 5
cmd/moose/main.go

@@ -2,12 +2,12 @@ package main
 
 import (
 	"fmt"
-	"os"
-	"moose/internal/editor"
-	"moose/internal/extension"
+	"github.com/davecgh/go-spew/spew"
 	"github.com/gdamore/tcell/v3"
 	"golang.design/x/clipboard"
-	"github.com/davecgh/go-spew/spew"
+	"moose/internal/editor"
+	"moose/internal/extension"
+	"os"
 )
 
 func main() {
@@ -87,4 +87,4 @@ func init_extensions(m *editor.Model) {
 		m.BM.PaletteBuffer.Clear()
 		m.BM.PaletteBuffer.Insert("moose.error:Lua error " + err.Error())
 	}
-}
+}

+ 2 - 2
internal/editor/action.go

@@ -99,7 +99,7 @@ func DefaultActionManager() ActionManager {
 			Action{
 				Bindings: []Binding{
 					Binding{
-						Type:  BindingSingle,
+						Type:   BindingSingle,
 						Single: "ctrl+tab",
 					},
 				},
@@ -123,7 +123,7 @@ func DefaultActionManager() ActionManager {
 			Action{
 				Bindings: []Binding{
 					Binding{
-						Type:  BindingSingle,
+						Type:   BindingSingle,
 						Single: "ctrl+shift+tab",
 					},
 				},

+ 1 - 1
internal/editor/keyinput.go

@@ -136,4 +136,4 @@ Out:
 			m.BM.PaletteBuffer.Insert(ev.Str())
 		}
 	}
-}
+}

+ 31 - 31
internal/editor/layout.go

@@ -30,34 +30,34 @@ func (m *Model) CycleActiveBuffer(horisontal float32, vertical float32) {
 }
 
 func (m *Model) RemoveActiveBuffer() {
-    if len(m.BM.Buffers) == 0 {
-        m.BM.Buffers = []buffer.Buffer{buffer.NewBuffer()}
-        m.BM.CurrentIdx = 0
-        return
-    }
-
-    removedIdx := m.BM.CurrentIdx
-    if removedIdx < 0 || removedIdx >= len(m.BM.Buffers) {
-        return
-    }
-
-    ws, ok := m.LM.Workspaces[m.LM.ActiveIdx]
-    if !ok || !ws.RootContainer.ContainsBufferIdx(removedIdx) {
-        return
-    }
-
-    newActiveIdx := m.LM.RemoveActiveBufferAndReindex(removedIdx)
-    m.BM.Buffers = slices.Delete(m.BM.Buffers, removedIdx, removedIdx+1)
-
-    if len(m.BM.Buffers) == 0 {
-        m.BM.Buffers = []buffer.Buffer{buffer.NewBuffer()}
-        m.BM.CurrentIdx = 0
-        return
-    }
-
-    if newActiveIdx < 0 || newActiveIdx >= len(m.BM.Buffers) {
-        newActiveIdx = len(m.BM.Buffers) - 1
-    }
-
-    m.BM.CurrentIdx = newActiveIdx
-}
+	if len(m.BM.Buffers) == 0 {
+		m.BM.Buffers = []buffer.Buffer{buffer.NewBuffer()}
+		m.BM.CurrentIdx = 0
+		return
+	}
+
+	removedIdx := m.BM.CurrentIdx
+	if removedIdx < 0 || removedIdx >= len(m.BM.Buffers) {
+		return
+	}
+
+	ws, ok := m.LM.Workspaces[m.LM.ActiveIdx]
+	if !ok || !ws.RootContainer.ContainsBufferIdx(removedIdx) {
+		return
+	}
+
+	newActiveIdx := m.LM.RemoveActiveBufferAndReindex(removedIdx)
+	m.BM.Buffers = slices.Delete(m.BM.Buffers, removedIdx, removedIdx+1)
+
+	if len(m.BM.Buffers) == 0 {
+		m.BM.Buffers = []buffer.Buffer{buffer.NewBuffer()}
+		m.BM.CurrentIdx = 0
+		return
+	}
+
+	if newActiveIdx < 0 || newActiveIdx >= len(m.BM.Buffers) {
+		newActiveIdx = len(m.BM.Buffers) - 1
+	}
+
+	m.BM.CurrentIdx = newActiveIdx
+}

+ 10 - 5
internal/editor/mode.go

@@ -1,6 +1,7 @@
 package editor
 
 type Mode int
+
 const (
 	ModeNormal Mode = iota
 	ModeWrite
@@ -10,11 +11,15 @@ const (
 
 func (mode Mode) String() string {
 	switch mode {
-	case ModeNormal:  return "normal"
-	case ModeWrite:   return "write"
-	case ModePalette: return "palette"
-	case ModeFind:    return "find"
+	case ModeNormal:
+		return "normal"
+	case ModeWrite:
+		return "write"
+	case ModePalette:
+		return "palette"
+	case ModeFind:
+		return "find"
 	}
 
 	return "unknown"
-}
+}

+ 27 - 24
internal/editor/model.go

@@ -1,46 +1,49 @@
 package editor
 
 import (
+	"github.com/gdamore/tcell/v3"
 	"moose/internal/buffer"
 	"moose/internal/layout"
-	"github.com/gdamore/tcell/v3"
 )
 
 type Model struct {
-	Screen	   tcell.Screen
+	Screen     tcell.Screen
 	Config     Config
-	Mode 	   Mode
-	BM		   buffer.BufferManager
+	Mode       Mode
+	BM         buffer.BufferManager
 	AM         ActionManager
-	LM		   layout.LayoutManager
+	LM         layout.LayoutManager
 	ShouldQuit bool
 	DebugLog   string
 }
 
 func NewModel(screen tcell.Screen) Model {
-    blank := buffer.NewBuffer()
+	blank := buffer.NewBuffer()
 
-    model := Model{
-        Screen: screen,
-        Config: DefaultConfig(),
-        Mode:   ModeNormal,
-        BM: buffer.BufferManager{
-            Buffers:       []buffer.Buffer{blank},
-            CurrentIdx:    0,
-            PaletteBuffer: buffer.NewBuffer(),
-        },
-        AM:         DefaultActionManager(),
-        LM:         layout.NewLayoutManager(),
-        ShouldQuit: false,
-    }
+	model := Model{
+		Screen: screen,
+		Config: DefaultConfig(),
+		Mode:   ModeNormal,
+		BM: buffer.BufferManager{
+			Buffers:       []buffer.Buffer{blank},
+			CurrentIdx:    0,
+			PaletteBuffer: buffer.NewBuffer(),
+		},
+		AM:         DefaultActionManager(),
+		LM:         layout.NewLayoutManager(),
+		ShouldQuit: false,
+	}
 
-    return model
+	return model
 }
 func (m *Model) CurrentActionSet() []Action {
 	switch m.Mode {
-	case ModeNormal:  return m.AM.Normal
-	case ModeWrite:   return m.AM.Insert
-	case ModePalette: return m.AM.Palette
+	case ModeNormal:
+		return m.AM.Normal
+	case ModeWrite:
+		return m.AM.Insert
+	case ModePalette:
+		return m.AM.Palette
 	}
 
 	return nil
@@ -48,4 +51,4 @@ func (m *Model) CurrentActionSet() []Action {
 
 func (m *Model) Quit() {
 	m.ShouldQuit = true
-}
+}

+ 1 - 1
internal/extension/config.go

@@ -14,4 +14,4 @@ func GetConfigTable(em *ExtensionManager) *lua.LTable {
 	})
 
 	return config
-}
+}

+ 4 - 5
internal/extension/extension.go

@@ -1,17 +1,17 @@
 package extension
 
 import (
+	"embed"
 	"fmt"
 	lua "github.com/yuin/gopher-lua"
 	"moose/internal/editor"
-	"embed"
 	"path/filepath"
 	"strings"
 )
 
 type ExtensionManager struct {
-	L *lua.LState
-	M *editor.Model
+	L           *lua.LState
+	M           *editor.Model
 	LoadedFiles []string
 }
 
@@ -77,7 +77,6 @@ func (em *ExtensionManager) registerEmbedSearcher() {
 	packageLoaders.Append(embedSearcher)
 }
 
-
 func (em *ExtensionManager) Close() {
 	if em.L != nil {
 		em.L.Close()
@@ -135,4 +134,4 @@ func (em *ExtensionManager) LoadString(name string, src string) error {
 
 	em.LoadedFiles = append(em.LoadedFiles, name)
 	return nil
-}
+}

+ 36 - 30
internal/layout/rect.go

@@ -13,46 +13,52 @@ type Rect struct {
 
 func RectDivide(rect Rect, split SplitType, num int) Rect {
 	switch split {
-	case SplitHorizontal: return Rect{
-		X: rect.X,
-		Y: rect.Y,
-		Width: rect.Width / num,
-		Height: rect.Height,
-	}
-	case SplitVertical: return Rect{
-		X: rect.X,
-		Y: rect.Y,
-		Width: rect.Width,
-		Height: rect.Height / num,
-	}
-	default: panic("[moose-error] impossible split type")
+	case SplitHorizontal:
+		return Rect{
+			X:      rect.X,
+			Y:      rect.Y,
+			Width:  rect.Width / num,
+			Height: rect.Height,
+		}
+	case SplitVertical:
+		return Rect{
+			X:      rect.X,
+			Y:      rect.Y,
+			Width:  rect.Width,
+			Height: rect.Height / num,
+		}
+	default:
+		panic("[moose-error] impossible split type")
 	}
 }
 
 func RectDisplace(rect Rect, split SplitType, idx int) Rect {
 	switch split {
-	case SplitHorizontal: return Rect{
-		X: rect.X + (rect.Width * idx),
-		Y: rect.Y,// + 1,
-		Width: rect.Width,
-		Height: rect.Height,// - 1,
-	}
-	case SplitVertical: return Rect{
-		X: rect.X,
-		Y: rect.Y + (rect.Height * idx),// + 1,
-		Width: rect.Width,
-		Height: rect.Height,// - 1,
-	}
-	default: panic("[moose-error] impossible split type")
+	case SplitHorizontal:
+		return Rect{
+			X:      rect.X + (rect.Width * idx),
+			Y:      rect.Y, // + 1,
+			Width:  rect.Width,
+			Height: rect.Height, // - 1,
+		}
+	case SplitVertical:
+		return Rect{
+			X:      rect.X,
+			Y:      rect.Y + (rect.Height * idx), // + 1,
+			Width:  rect.Width,
+			Height: rect.Height, // - 1,
+		}
+	default:
+		panic("[moose-error] impossible split type")
 	}
 }
 
 func RectFromScren(s tcell.Screen) Rect {
 	sWidth, sHeight := s.Size()
 	return Rect{
-		X: 0,
-		Y: 0,
-		Width: sWidth,
+		X:      0,
+		Y:      0,
+		Width:  sWidth,
 		Height: sHeight,
 	}
-}
+}