Skip to content

Commit 0474dd9

Browse files
authored
refactor: vendor LSP code, and reduce dependencies, fixes #1050 (#1054)
1 parent 8501201 commit 0474dd9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+34530
-304
lines changed

.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.3.828
1+
0.3.832

cmd/templ/generatecmd/fatalerror.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func (e FatalError) Is(target error) bool {
1717
return ok
1818
}
1919

20-
func (e FatalError) As(target interface{}) bool {
20+
func (e FatalError) As(target any) bool {
2121
_, ok := target.(*FatalError)
2222
return ok
2323
}

cmd/templ/lspcmd/httpdebug/handler.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ package httpdebug
33
import (
44
"encoding/json"
55
"io"
6+
"log/slog"
67
"net/http"
78
"net/url"
89

910
"github.com/a-h/templ"
1011
"github.com/a-h/templ/cmd/templ/lspcmd/proxy"
1112
"github.com/a-h/templ/cmd/templ/visualize"
12-
"go.uber.org/zap"
1313
)
1414

15-
var log *zap.Logger
15+
var log *slog.Logger
1616

17-
func NewHandler(l *zap.Logger, s *proxy.Server) http.Handler {
17+
func NewHandler(l *slog.Logger, s *proxy.Server) http.Handler {
1818
m := http.NewServeMux()
1919
log = l
2020
m.HandleFunc("/templ", func(w http.ResponseWriter, r *http.Request) {
@@ -112,19 +112,19 @@ func JSON(w http.ResponseWriter, v any) {
112112
enc := json.NewEncoder(w)
113113
enc.SetIndent("", " ")
114114
if err := enc.Encode(v); err != nil {
115-
log.Error("failed to write JSON response", zap.Error(err))
115+
log.Error("failed to write JSON response", slog.Any("error", err))
116116
}
117117
}
118118

119119
func String(w http.ResponseWriter, s string) {
120120
if _, err := io.WriteString(w, s); err != nil {
121-
log.Error("failed to write string response", zap.Error(err))
121+
log.Error("failed to write string response", slog.Any("error", err))
122122
}
123123
}
124124

125125
func Error(w http.ResponseWriter, msg string, status int) {
126126
w.WriteHeader(status)
127127
if _, err := io.WriteString(w, msg); err != nil {
128-
log.Error("failed to write error response", zap.Error(err))
128+
log.Error("failed to write error response", slog.Any("error", err))
129129
}
130130
}

0 commit comments

Comments
 (0)