fix highlighting

config/language_servers.toml

@@ -1,7 +1,7 @@
 # Language Server Protocol configuration
 # For a list of available language servers, see: https://langserver.org/#implementations-server
 
-use_servers = { only = ['gopls', 'golangci-lint', 'superhtml'], except = [] }
+use_servers = { only = ['gopls'], except = [] }
 
 [language_servers.gopls]
 command = 'gopls'

config/queries/go/highlights.scm

@@ -171,7 +171,7 @@
 
 "func" @keyword.function
 
-"return" @keyword.return
+"return" @keyword.control.return
 
 [
   "import"
@@ -183,9 +183,9 @@
   "case"
   "switch"
   "if"
-  ] @keyword.conditional
+  ] @keyword.control.conditional
 
-"for" @keyword.repeat
+"for" @keyword.control.repeat
 
 [
   "var"

config/themes/dark.toml

@@ -261,28 +261,50 @@ unnecessary_char = { curly_underline = true, underline_color = '$red' }
 "constant.numeric.float" = { foreground = '$yellow' }
 "constant.builtin" = { foreground = '$bright_red' }
 "constant.builtin.boolean" = { foreground = '$yellow' }
+"constant.character" = { foreground = '$yellow' }
 "constant.character.escape" = { foreground = '$cyan', bold = true }
 "constant.other.placeholder" = { foreground = '$cyan', bold = true }
 
 "function" = { foreground = '$bright_cyan' }
 "function.builtin" = { foreground = '$bright_cyan' }
+"function.method" = { foreground = '$bright_cyan' }
+"function.method.private" = { foreground = '$bright_cyan' }
 "function.macro" = { foreground = '$bright_cyan' }
+
 "constructor" = { foreground = '$bright_cyan' }
+
 "keyword" = { foreground = '$bright_magenta', italic = true }
+"keyword.control" = { foreground = '$bright_magenta', italic = true }
+"keyword.control.conditional" = { foreground = '$bright_magenta', italic = true }
+"keyword.control.repeat" = { foreground = '$bright_magenta', italic = true }
+"keyword.control.import" = { foreground = '$bright_magenta', italic = true }
+"keyword.control.return" = { foreground = '$bright_magenta', italic = true }
+"keyword.control.exception" = { foreground = '$bright_magenta', italic = true }
+"keyword.operator" = { foreground = '$bright_magenta', italic = true }
 "keyword.directive" = { foreground = '$bright_magenta', italic = true }
+"keyword.function" = { foreground = '$bright_magenta', italic = true }
+"keyword.storage" = { foreground = '$bright_magenta', italic = true }
+"keyword.storage.type" = { foreground = '$bright_magenta', italic = true }
+"keyword.storage.modifier" = { foreground = '$bright_magenta', italic = true }
+
 "section" = { foreground = '$bright_magenta' }
 
 "punctuation.delimiter" = { foreground = '$white' }
 "punctuation.special" = { foreground = '$bright_magenta' }
 "punctuation.bracket" = { foreground = '$white' }
 
 "operator" = { foreground = '$white' }
+
 "special" = { foreground = '$bright_cyan' }
+
 "string" = { foreground = '$bright_green', bold = true }
 "string.special" = { foreground = '$yellow' }
 "string.special.path" = { foreground = '$bright_green', bold = true }
 "string.special.url" = { foreground = '$blue' }
+
 "type" = { foreground = '$bright_yellow', bold = true }
+"type.builtin" = { foreground = '$bright_yellow', bold = true }
+"type.parameter" = { foreground = '$bright_yellow', bold = true }
 
 "markup.heading" = { foreground = '$cyan' }
 "markup.heading.marker" = { foreground = '$bright_magenta' }

gopad/actions.go

@@ -126,6 +126,18 @@ var Actions = []Action{
 			return OpenLSPOverlay
 		},
 	},
+	{
+		Name: "Stop LSP",
+		Run: func() tea.Cmd {
+			return OpenLSPOverlay
+		},
+	},
+	{
+		Name: "Format Document",
+		Run: func() tea.Cmd {
+			return editor.FormatAction
+		},
+	},
 }
 
 type Action struct {

gopad/config/config.go

@@ -31,6 +31,7 @@ var (
 	Keys            Keymap
 	Keymaps         []KeymapConfig
 	Theme           ThemeStyles
+	CodeTheme       *CodeStyles
 	Themes          []ThemeConfig
 )
 
@@ -109,6 +110,7 @@ func Load(name string, defaultConfigs embed.FS) error {
 		}
 	}
 	Theme = theme.Theme()
+	CodeTheme = NewCodeStyles(Theme.CodeStyles)
 
 	return nil
 }

gopad/config/languages.go

@@ -52,6 +52,7 @@ type LanguageConfig struct {
 	AutoPairs          []LanguageAutoPairs `toml:"auto_pairs"`
 	Indent             Indent              `toml:"indent"`
 	Grammar            *GrammarConfig      `toml:"grammar"`
+	Formatter          *FormatterConfig    `toml:"formatter"`
 }
 
 type BlockCommentToken struct {
@@ -108,3 +109,8 @@ const (
 	RefTypeCommit RefType = "commit"
 	RefTypeTag    RefType = "tag"
 )
+
+type FormatterConfig struct {
+	Command string   `toml:"command"`
+	Args    []string `toml:"args"`
+}

gopad/config/styles.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"fmt"
 	"image/color"
 
 	"github.com/charmbracelet/lipgloss/v2"
@@ -17,6 +18,41 @@ import (
 	"go.gopad.dev/gopad/internal/bubbles/textinput"
 )
 
+func NewCodeStyles(styles map[string]lipgloss.Style) *CodeStyles {
+	var scopes []string
+
+	for key := range styles {
+		scopes = append(scopes, key)
+	}
+
+	return &CodeStyles{
+		styles: styles,
+		scopes: scopes,
+	}
+}
+
+type CodeStyles struct {
+	styles map[string]lipgloss.Style
+	scopes []string
+}
+
+func (t *CodeStyles) Highlight(i int, languageName string) lipgloss.Style {
+	scope := t.scopes[i]
+	style, ok := t.styles[fmt.Sprintf("%s.%s", scope, languageName)]
+	if ok {
+		return style
+	}
+	return t.styles[scope]
+}
+
+func (t *CodeStyles) Scope(i int) string {
+	return t.scopes[i]
+}
+
+func (t *CodeStyles) Scopes() []string {
+	return t.scopes
+}
+
 type ThemeStyles struct {
 	Name       string
 	Foreground color.Color

gopad/editor/buffer/buffer.go

@@ -66,8 +66,10 @@ type Buffer interface {
 	// Rune returns the rune at the given index.
 	Rune(i int) rune
 
-	// ByteIndex returns the byte index in the buffer for the rune index.
+	// ByteIndex converts the rune index to a byte index.
 	ByteIndex(i int) int
+	// RuneIndex converts the byte index to a rune index.
+	RuneIndex(i int) int
 	// ByteIndexByPoint returns the byte index in the buffer for the given point.
 	ByteIndexByPoint(p Point) int
 	// Position returns the point for the given byte index.
@@ -103,8 +105,10 @@ type Line interface {
 	Len() int
 	// BytesLen returns the byte length of the line.
 	BytesLen() int
-	// Index returns the byte index in the line for the given rune index.
-	Index(i int) int
+	// ByteIndex converts the rune index to a byte index.
+	ByteIndex(i int) int
+	// RuneIndex converts the byte index to a rune index.
+	RuneIndex(i int) int
 
 	// Rune returns the rune at the given index.
 	Rune(i int) rune

gopad/editor/buffer/byte_line.go

@@ -38,12 +38,16 @@ func (l byteLine) BytesLen() int {
 	return len(l.data)
 }
 
-func (l byteLine) Index(index int) int {
+func (l byteLine) Rune(index int) rune {
+	return xbytes.Rune(l.data, index)
+}
+
+func (l byteLine) ByteIndex(index int) int {
 	return xbytes.RuneIndex(l.data, index)
 }
 
-func (l byteLine) Rune(index int) rune {
-	return xbytes.Rune(l.data, index)
+func (l byteLine) RuneIndex(index int) int {
+	return xbytes.RuneIndex(l.data, index)
 }
 
 func (l byteLine) Runes() []rune {

gopad/editor/buffer/line_buffer.go

@@ -199,13 +199,24 @@ func (b *lineBuffer) Rune(i int) rune {
 	return 0
 }
 
-// ByteIndex returns the byte index in the buffer for the rune index.
 func (b *lineBuffer) ByteIndex(i int) int {
 	var n int
 	for _, line := range b.lines {
-		byteLen := line.BytesLen()
+		runeLen := line.Len() + 1
+		if n+runeLen >= i {
+			return n + line.ByteIndex(i-n)
+		}
+		n += runeLen
+	}
+	return n
+}
+
+func (b *lineBuffer) RuneIndex(i int) int {
+	var n int
+	for _, line := range b.lines {
+		byteLen := len(line.Bytes())
 		if n+byteLen >= i {
-			return n + line.Index(i-n)
+			return n + line.RuneIndex(i-n)
 		}
 		n += byteLen + 1
 	}