tree-sitter highlight

Author: topi314

.gitignore

@@ -1,4 +1,5 @@
 .idea/
+grammars/*
 custom_styles/
 gobin.toml
 .gobin

README.md

@@ -365,15 +365,82 @@ GOBIN_DEFAULT_STYLE=snazzy
 
 ## Custom Themes
 
-You can add your own themes to gobin by adding the `custom_styles` directory to the config file and adding your themes
-to it.
+You can add your own themes to gobin by adding them to the `themes` directory.
+
+### Gobin Themes
+
+Gobin themes are written in TOML file format.
+
+All keys specified under `colors` are variables which can be referenced by `$name` in the theme file.
+
+To style UI elements you can use the `ui` key. See below for all available keys.
+
+To style individual scopes you can use the `styles` key. The key is the scope and the value is the style.
+Make sure to quote the keys if the scope name contain a `.`.
+
+```toml file=themes/name.toml
+name = 'name'
+color_scheme = 'dark' # or 'light'
+
+tab_size = 4
+
+[colors]
+text0 = '#F8F8F2'
+text1 = '#F8F8F2'
+text2 = '#8A8A8A'
+
+background0 = '#212122'
+background1 = '#2B2B2B'
+background2 = '#3C3C3C'
+background3 = '#43494A'
+
+white = '#FEFEF8'
+red = '#FF4352'
+blue = '#73FBF1'
+green = '#B8E466'
+yellow = '#FFD750'
+magenta = '#A578EA'
+gray = '#6D7070'
+
+[ui]
+status_bar = '$text1'
+status_bar_background = '$background1'
+status_bar_active_background = '$background2'
+
+code = '$text0'
+code_background = '$background0'
+
+line_number = '$text2'
+line_number_background = '$background1'
+highlight = '$background2'
+
+symbols = '$text1'
+symbols_background = '$background1'
+symbols_active_background = '$background3'
+synbols_kind_background = '$background1'
+
+[styles]
+"variable" = { text = '$text' }
+"variable.other.member" = { text = '$red' }
+"function" = { text = '$blue' }
+"method" = { text = '$blue' }
+"string" = { text = '$green' }
+"type" = { text = '$yellow' }
+"keyword" = { text = '$magenta' }
+"comment" = { text = '$gray' }
+"comment.todo" = { text = '$white' }
+```
+
+### Base16 Themes
 
-The themes have to be in the following format:
+Base16 themes are supported and should be placed in the `themes/base16` directory.
+
+See [base16](https://github.com/chriskempson/base16) for more information about base16 themes.
 
 ```yaml file=custom_styles/name.yaml
 scheme: "name"
 author: "author"
-theme: "dark" # or "light"
+color_scheme: "dark" # or "light"
 base00: "282a36"
 base01: "34353e"
 base02: "43454f"
@@ -392,9 +459,6 @@ base0E: "ff6ac1"
 base0F: "b2643c"
 ```
 
-See [base16](https://github.com/chriskempson/base16) for more information.
-
-Or you can use the [chroma](https://github.com/topi314/chroma/tree/master/styles/embedded) XML themes.
 
 ## Rate Limits
 

cli/cmd/get.go

@@ -11,7 +11,6 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/topi314/chroma/v2/lexers"
 
 	"github.com/topi314/gobin/v2/internal/ezhttp"
 	"github.com/topi314/gobin/v2/server"
@@ -207,10 +206,4 @@ Will return the document with the id of jis74978.`,
 	}); err != nil {
 		log.Printf("failed to register formatter flag completion func: %s", err)
 	}
-
-	if err := cmd.RegisterFlagCompletionFunc("language", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return lexers.Names(true), cobra.ShellCompDirectiveNoFileComp
-	}); err != nil {
-		log.Printf("failed to register language flag completion func: %s", err)
-	}
 }

cli/cmd/post.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/topi314/chroma/v2/lexers"
 
 	"github.com/topi314/gobin/v2/internal/cfg"
 	"github.com/topi314/gobin/v2/internal/ezhttp"
@@ -218,10 +217,4 @@ Will post "hello world!" to the server`,
 	if err := cmd.RegisterFlagCompletionFunc("document", documentCompletion); err != nil {
 		log.Printf("failed to register document flag completion func: %s", err)
 	}
-
-	if err := cmd.RegisterFlagCompletionFunc("languages", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return lexers.Names(true), cobra.ShellCompDirectiveNoFileComp
-	}); err != nil {
-		log.Printf("failed to register languages flag completion func: %s", err)
-	}
 }

go.mod

@@ -2,90 +2,104 @@ module github.com/topi314/gobin/v2
 
 go 1.23
 
+replace github.com/tree-sitter/go-tree-sitter => github.com/gopad-dev/go-tree-sitter v0.0.0-20241124232421-f22ab7977e8c
+
 require (
-	github.com/XSAM/otelsql v0.34.0
-	github.com/a-h/templ v0.2.778
+	github.com/XSAM/otelsql v0.35.0
+	github.com/a-h/templ v0.2.793
 	github.com/cespare/xxhash/v2 v2.3.0
 	github.com/dustin/go-humanize v1.0.1
+	github.com/ebitengine/purego v0.8.1
 	github.com/go-chi/chi/v5 v5.1.0
 	github.com/go-chi/stampede v0.6.0
 	github.com/go-jose/go-jose/v3 v3.0.3
 	github.com/jackc/pgx/v5 v5.7.1
 	github.com/jmoiron/sqlx v1.4.0
 	github.com/mattn/go-colorable v0.1.13
 	github.com/pelletier/go-toml/v2 v2.2.3
-	github.com/prometheus/client_golang v1.20.4
-	github.com/samber/slog-chi v1.11.2
+	github.com/prometheus/client_golang v1.20.5
+	github.com/samber/slog-chi v1.12.3
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
-	github.com/topi314/chroma/v2 v2.0.0-20240614212830-eb9beba2251d
 	github.com/topi314/gomigrate v0.0.0-20241004214626-bb286a22f06c
 	github.com/topi314/otelchi v0.0.0-20240303215413-6ead809329d9
 	github.com/topi314/tint v0.0.0-20240303212505-44dd4a1b4f7f
-	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.55.0
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0
-	go.opentelemetry.io/otel v1.30.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.30.0
-	go.opentelemetry.io/otel/exporters/prometheus v0.52.0
-	go.opentelemetry.io/otel/metric v1.30.0
-	go.opentelemetry.io/otel/sdk v1.30.0
-	go.opentelemetry.io/otel/sdk/metric v1.30.0
-	go.opentelemetry.io/otel/trace v1.30.0
-	golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6
-	modernc.org/sqlite v1.33.1
+	github.com/tree-sitter/go-tree-sitter v0.24.0
+	go.gopad.dev/go-tree-sitter-highlight v0.0.0-20241212010141-660c7ae706ef
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.57.0
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0
+	go.opentelemetry.io/otel v1.32.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0
+	go.opentelemetry.io/otel/exporters/prometheus v0.54.0
+	go.opentelemetry.io/otel/metric v1.32.0
+	go.opentelemetry.io/otel/sdk v1.32.0
+	go.opentelemetry.io/otel/sdk/metric v1.32.0
+	go.opentelemetry.io/otel/trace v1.32.0
+	golang.org/x/exp v0.0.0-20241210194714-1829a127f884
+	modernc.org/sqlite v1.34.2
 )
 
 require (
+	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/dlclark/regexp2 v1.11.4 // indirect
+	github.com/charmbracelet/lipgloss v0.10.0 // indirect
+	github.com/charmbracelet/log v0.4.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.8.0 // indirect
+	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/goware/singleflight v0.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
-	github.com/klauspost/compress v1.17.10 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/magiconair/properties v1.8.9 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-pointer v0.0.1 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/muesli/reflow v0.3.0 // indirect
+	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.60.0 // indirect
+	github.com/prometheus/common v0.61.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/sagikazarmark/locafero v0.6.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.7.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	go.opentelemetry.io/contrib v1.30.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
+	github.com/teacat/noire v1.1.0 // indirect
+	go.opentelemetry.io/contrib v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.28.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/text v0.19.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f // indirect
-	google.golang.org/grpc v1.67.1 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/net v0.32.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
+	google.golang.org/grpc v1.68.1 // indirect
+	google.golang.org/protobuf v1.35.2 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	modernc.org/gc/v3 v3.0.0-20241004144649-1aea3fae8852 // indirect
-	modernc.org/libc v1.61.0 // indirect
+	modernc.org/libc v1.61.4 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
 	modernc.org/memory v1.8.0 // indirect
 	modernc.org/strutil v1.2.0 // indirect