azpect/Gim
1
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fixed issues the @janitor found

Browse Source
This commit is contained in:
Hayden Hargreaves 2026-04-08 17:28:01 -07:00
parent 64c448c639
commit e27c7560a2
5 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/editor/model.go
View File

@ -51,7 +51,6 @@ type Model struct {
registers map[rune]core.Register // name -> register registers map[rune]core.Register // name -> register
// Visual styles // Visual styles
// currentTheme string // Name of current theme
themes map[string]theme.EditorTheme themes map[string]theme.EditorTheme
syntax syntax.Engine syntax syntax.Engine
@ -186,7 +185,7 @@ func (m *Model) replayInsert() {
} }
} }
// TODO: Fix this shitty shit shit shit // TODO: This can't be the best way....
func (m *Model) processInsertKey(key string) { func (m *Model) processInsertKey(key string) {
win := m.ActiveWindow() win := m.ActiveWindow()
buf := m.ActiveBuffer() buf := m.ActiveBuffer()

2
internal/editor/model_builder.go
View File

@ -20,7 +20,7 @@ func NewModelBuilder() *ModelBuilder {
var embededThemes map[string]theme.EditorTheme var embededThemes map[string]theme.EditorTheme
embededThemesJson, err := theme.LoadEmbeddedThemesJSON() embededThemesJson, err := theme.LoadEmbeddedThemesJSON()
if err == nil { if err == nil {
embededThemes = theme.MapEmbededThemeToEditorTheme(embededThemesJson) embededThemes = theme.MapEmbeddedThemeToEditorTheme(embededThemesJson)
} }
// Always have a default theme // Always have a default theme

5
internal/syntax/treesitter_behavior_test.go
View File

@ -2,6 +2,7 @@ package syntax
import ( import (
"fmt" "fmt"
"maps"
"strings" "strings"
"testing" "testing"
@ -361,9 +362,7 @@ func makeThemeWithCaptureOverrides(lineFg, keywordFg, stringFg lipgloss.Color) t
func cloneStyleMap(in map[string]lipgloss.Style) map[string]lipgloss.Style { func cloneStyleMap(in map[string]lipgloss.Style) map[string]lipgloss.Style {
out := make(map[string]lipgloss.Style, len(in)) out := make(map[string]lipgloss.Style, len(in))
for k, v := range in { maps.Copy(out, in)
out[k] = v
}
return out return out
} }

8
internal/theme/loader.go
View File

@ -46,7 +46,7 @@ func LoadEmbeddedThemesJSON() (map[string]ThemeJSON, error) {
return out, nil return out, nil
} }
func MapEmbededThemeToEditorTheme(em map[string]ThemeJSON) map[string]EditorTheme { func MapEmbeddedThemeToEditorTheme(em map[string]ThemeJSON) map[string]EditorTheme {
out := make(map[string]EditorTheme, len(em)) out := make(map[string]EditorTheme, len(em))
for name, in := range em { for name, in := range em {
@ -111,12 +111,6 @@ func MapEmbededThemeToEditorTheme(em map[string]ThemeJSON) map[string]EditorThem
return out return out
} }
// MapEmbeddedThemeToEditorTheme is a correctly spelled alias for
// MapEmbededThemeToEditorTheme.
func MapEmbeddedThemeToEditorTheme(em map[string]ThemeJSON) map[string]EditorTheme {
return MapEmbededThemeToEditorTheme(em)
}
func styleFromJSON(in ColorStyleJSON) lipgloss.Style { func styleFromJSON(in ColorStyleJSON) lipgloss.Style {
out := lipgloss.NewStyle() out := lipgloss.NewStyle()

22
internal/theme/loader_test.go
View File

@ -90,28 +90,6 @@ func TestMapEmbeddedThemeToEditorTheme_MapsStylesAndNormalizesSyntaxKeys(t *test
} }
} }
func TestMapEmbededThemeToEditorTheme_AliasMatchesPrimary(t *testing.T) {
in := map[string]ThemeJSON{
"x": {
Name: "x",
Line: ColorStyleJSON{FG: "#ffffff", BG: "#000000"},
Syntax: SyntaxJSON{
Group: map[string]string{"keyword": "#123456"},
},
},
}
a := MapEmbededThemeToEditorTheme(in)
b := MapEmbeddedThemeToEditorTheme(in)
if len(a) != len(b) {
t.Fatalf("alias map size mismatch: %d vs %d", len(a), len(b))
}
if colorHex(a["x"].Syntax.Group["keyword"].GetForeground()) != colorHex(b["x"].Syntax.Group["keyword"].GetForeground()) {
t.Fatalf("alias should produce identical mapped styles")
}
}
func colorHex(c any) string { func colorHex(c any) string {
return fmt.Sprint(c) return fmt.Sprint(c)
} }