Skip to content

Commit 18dda56

Browse files
a-hCopilot
a-h
and
Copilot
authored
refactor: fix linter warnings (#1175)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 32ee560 commit 18dda56

File tree

56 files changed

+331
-248
lines changed

Some content is hidden

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

56 files changed

+331
-248
lines changed

‎cmd/templ/fmtcmd/main_test.go‎

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var testDataTxTar []byte
1919

2020
type testProject struct {
2121
dir string
22-
cleanup func()
22+
cleanup func() error
2323
testFiles map[string]testFile
2424
}
2525

@@ -47,8 +47,11 @@ func setupProjectDir() (tp testProject, err error) {
4747
expected: string(testData.Files[i+1].Data),
4848
}
4949
}
50-
tp.cleanup = func() {
51-
os.RemoveAll(tp.dir)
50+
tp.cleanup = func() error {
51+
if err := os.RemoveAll(tp.dir); err != nil {
52+
return fmt.Errorf("failed to remove test directory %q: %w", tp.dir, err)
53+
}
54+
return nil
5255
}
5356
return tp, nil
5457
}
@@ -60,7 +63,11 @@ func TestFormat(t *testing.T) {
6063
if err != nil {
6164
t.Fatalf("failed to setup project dir: %v", err)
6265
}
63-
defer tp.cleanup()
66+
defer func() {
67+
if err := tp.cleanup(); err != nil {
68+
t.Errorf("cleanup error: %v", err)
69+
}
70+
}()
6471
stdin := strings.NewReader(tp.testFiles["a.templ"].input)
6572
stdout := new(strings.Builder)
6673
if err = Run(log, stdin, stdout, Arguments{
@@ -77,7 +84,11 @@ func TestFormat(t *testing.T) {
7784
if err != nil {
7885
t.Fatalf("failed to setup project dir: %v", err)
7986
}
80-
defer tp.cleanup()
87+
defer func() {
88+
if err := tp.cleanup(); err != nil {
89+
t.Errorf("cleanup error: %v", err)
90+
}
91+
}()
8192
stdout := new(strings.Builder)
8293
if err = Run(log, nil, stdout, Arguments{
8394
ToStdout: true,
@@ -97,7 +108,11 @@ func TestFormat(t *testing.T) {
97108
if err != nil {
98109
t.Fatalf("failed to setup project dir: %v", err)
99110
}
100-
defer tp.cleanup()
111+
defer func() {
112+
if err := tp.cleanup(); err != nil {
113+
t.Errorf("cleanup error: %v", err)
114+
}
115+
}()
101116
if err = Run(log, nil, nil, Arguments{
102117
Files: []string{
103118
tp.testFiles["a.templ"].name,
@@ -120,7 +135,11 @@ func TestFormat(t *testing.T) {
120135
if err != nil {
121136
t.Fatalf("failed to setup project dir: %v", err)
122137
}
123-
defer tp.cleanup()
138+
defer func() {
139+
if err := tp.cleanup(); err != nil {
140+
t.Errorf("cleanup error: %v", err)
141+
}
142+
}()
124143
if err = Run(log, nil, nil, Arguments{
125144
Files: []string{
126145
tp.testFiles["a.templ"].name,
@@ -143,7 +162,11 @@ func TestFormat(t *testing.T) {
143162
if err != nil {
144163
t.Fatalf("failed to setup project dir: %v", err)
145164
}
146-
defer tp.cleanup()
165+
defer func() {
166+
if err := tp.cleanup(); err != nil {
167+
t.Errorf("cleanup error: %v", err)
168+
}
169+
}()
147170
if err = Run(log, nil, nil, Arguments{
148171
Files: []string{
149172
tp.testFiles["c.templ"].name,

‎cmd/templ/generatecmd/cmd.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func (cmd Generate) Run(ctx context.Context) (err error) {
229229
if err != nil {
230230
errs <- err
231231
}
232-
if !(r.GoUpdated || r.TextUpdated || r.WatchfileUpdated) {
232+
if !r.GoUpdated && !r.TextUpdated && !r.WatchfileUpdated {
233233
cmd.Log.Debug("File not updated", slog.String("file", event.Name))
234234
return
235235
}
@@ -286,7 +286,9 @@ func (cmd Generate) Run(ctx context.Context) (err error) {
286286
if cmd.Args.Command != "" && (goUpdated || watchedFileUpdated) {
287287
cmd.Log.Debug("Executing command", slog.String("command", cmd.Args.Command))
288288
if cmd.Args.Watch {
289-
os.Setenv("TEMPL_DEV_MODE", "true")
289+
if err := os.Setenv("TEMPL_DEV_MODE", "true"); err != nil {
290+
cmd.Log.Error("Error setting TEMPL_DEV_MODE environment variable", slog.Any("error", err))
291+
}
290292
}
291293
if _, err := run.Run(ctx, cmd.Args.Path, cmd.Args.Command); err != nil {
292294
cmd.Log.Error("Error executing command", slog.Any("error", err))

‎cmd/templ/generatecmd/eventhandler.go‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,15 +340,24 @@ func generateSourceMapVisualisation(ctx context.Context, templFileName, goFileNa
340340
if goErr != nil {
341341
return templErr
342342
}
343+
component := visualize.HTML(templFileName, string(templContents), string(goContents), sourceMap)
343344

344345
targetFileName := strings.TrimSuffix(templFileName, ".templ") + "_templ_sourcemap.html"
345346
w, err := os.Create(targetFileName)
346347
if err != nil {
347348
return fmt.Errorf("%s sourcemap visualisation error: %w", templFileName, err)
348349
}
349-
defer w.Close()
350350
b := bufio.NewWriter(w)
351-
defer b.Flush()
352-
353-
return visualize.HTML(templFileName, string(templContents), string(goContents), sourceMap).Render(ctx, b)
351+
if err = component.Render(ctx, b); err != nil {
352+
_ = w.Close()
353+
return fmt.Errorf("%s sourcemap visualisation render error: %w", templFileName, err)
354+
}
355+
if err = b.Flush(); err != nil {
356+
_ = w.Close()
357+
return fmt.Errorf("%s sourcemap visualisation flush error: %w", templFileName, err)
358+
}
359+
if err = w.Close(); err != nil {
360+
return fmt.Errorf("%s sourcemap visualisation close error: %w", templFileName, err)
361+
}
362+
return nil
354363
}

‎cmd/templ/generatecmd/main_test.go‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ func TestGenerate(t *testing.T) {
2323
if err != nil {
2424
t.Fatalf("failed to create test project: %v", err)
2525
}
26-
defer os.RemoveAll(dir)
26+
defer func() {
27+
if err := os.RemoveAll(dir); err != nil {
28+
t.Errorf("failed to remove test project directory: %v", err)
29+
}
30+
}()
2731

2832
// Delete the templates_templ.go file to ensure it is generated.
2933
err = os.Remove(path.Join(dir, "templates_templ.go"))
@@ -51,7 +55,11 @@ func TestGenerate(t *testing.T) {
5155
if err != nil {
5256
t.Fatalf("failed to create test project: %v", err)
5357
}
54-
defer os.RemoveAll(dir)
58+
defer func() {
59+
if err := os.RemoveAll(dir); err != nil {
60+
t.Errorf("failed to remove test project directory: %v", err)
61+
}
62+
}()
5563

5664
// Delete the templates_templ.go file to ensure it is generated.
5765
err = os.Remove(path.Join(dir, "templates_templ.go"))

‎cmd/templ/generatecmd/proxy/proxy.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ func (h *Handler) modifyResponse(r *http.Response) error {
122122
if err != nil {
123123
return err
124124
}
125-
defer r.Body.Close()
125+
defer func() {
126+
_ = r.Body.Close()
127+
}()
126128
body, err := io.ReadAll(encr)
127129
if err != nil {
128130
return err
@@ -256,7 +258,9 @@ func (rt *roundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
256258
if err != nil {
257259
return nil, err
258260
}
259-
r.Body.Close()
261+
if err = r.Body.Close(); err != nil {
262+
return nil, fmt.Errorf("failed to close request body: %w", err)
263+
}
260264
}
261265

262266
// Retry logic.

‎cmd/templ/generatecmd/proxy/proxy_test.go‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,9 @@ func TestProxy(t *testing.T) {
310310
if err != nil {
311311
t.Fatalf("unexpected error writing gzip: %v", err)
312312
}
313-
gzw.Close()
313+
if err = gzw.Close(); err != nil {
314+
t.Fatalf("unexpected error closing gzip writer: %v", err)
315+
}
314316

315317
expectedString, err := insertScriptTagIntoBody("", body)
316318
if err != nil {
@@ -323,7 +325,9 @@ func TestProxy(t *testing.T) {
323325
if err != nil {
324326
t.Fatalf("unexpected error writing gzip: %v", err)
325327
}
326-
gzw.Close()
328+
if err = gzw.Close(); err != nil {
329+
t.Fatalf("unexpected error closing gzip writer: %v", err)
330+
}
327331
expectedLength := len(expectedBytes.Bytes())
328332

329333
r := &http.Response{
@@ -374,7 +378,9 @@ func TestProxy(t *testing.T) {
374378
if err != nil {
375379
t.Fatalf("unexpected error writing gzip: %v", err)
376380
}
377-
brw.Close()
381+
if err = brw.Close(); err != nil {
382+
t.Fatalf("unexpected error closing brotli writer: %v", err)
383+
}
378384

379385
expectedString, err := insertScriptTagIntoBody("", body)
380386
if err != nil {
@@ -387,7 +393,9 @@ func TestProxy(t *testing.T) {
387393
if err != nil {
388394
t.Fatalf("unexpected error writing gzip: %v", err)
389395
}
390-
brw.Close()
396+
if err = brw.Close(); err != nil {
397+
t.Fatalf("unexpected error closing brotli writer: %v", err)
398+
}
391399
expectedLength := len(expectedBytes.Bytes())
392400

393401
r := &http.Response{
@@ -468,7 +476,9 @@ func TestProxy(t *testing.T) {
468476
errChan <- err
469477
return
470478
}
471-
defer resp.Body.Close()
479+
defer func() {
480+
_ = resp.Body.Close()
481+
}()
472482

473483
sseListening <- true
474484
lines := []string{}

‎cmd/templ/generatecmd/run/run_test.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,8 @@ func TestGoRun(t *testing.T) {
3838
t.Fatalf("failed to read src file %q: %v", srcFileName, err)
3939
}
4040
tgtFileName := filepath.Join(dir, file.Name())
41-
tgtFile, err := os.Create(tgtFileName)
42-
if err != nil {
43-
t.Fatalf("failed to create tgt file %q: %v", tgtFileName, err)
44-
}
45-
defer tgtFile.Close()
46-
if _, err := tgtFile.Write(srcData); err != nil {
47-
t.Fatalf("failed to write to tgt file %q: %v", tgtFileName, err)
41+
if err = os.WriteFile(tgtFileName, srcData, 0644); err != nil {
42+
t.Fatalf("failed to write tgt file %q: %v", tgtFileName, err)
4843
}
4944
}
5045
// Rename the go.mod.embed file to go.mod.
@@ -99,9 +94,12 @@ func readResponse(url string) (body string, err error) {
9994
if err != nil {
10095
return body, err
10196
}
102-
defer resp.Body.Close()
10397
b, err := io.ReadAll(resp.Body)
10498
if err != nil {
99+
_ = resp.Body.Close()
100+
return body, err
101+
}
102+
if err = resp.Body.Close(); err != nil {
105103
return body, err
106104
}
107105
return string(b), nil

‎cmd/templ/generatecmd/run/testprogram/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func main() {
3939
// its pid.
4040
go func() {
4141
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
42-
fmt.Fprintf(w, "%d", os.Getpid())
42+
_, _ = fmt.Fprintf(w, "%d", os.Getpid())
4343
})
4444
err := http.ListenAndServe("127.0.0.1:7777", nil)
4545
if err != nil {

‎cmd/templ/generatecmd/symlink/symlink_test.go‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,22 @@ func TestSymlink(t *testing.T) {
2020
if err != nil {
2121
t.Fatalf("failed to create test project: %v", err)
2222
}
23-
defer os.RemoveAll(dir)
23+
defer func() {
24+
if err := os.RemoveAll(dir); err != nil {
25+
t.Errorf("failed to remove test project directory: %v", err)
26+
}
27+
}()
2428

2529
symlinkPath := dir + "-symlink"
2630
err = os.Symlink(dir, symlinkPath)
2731
if err != nil {
2832
t.Fatalf("failed to create dir symlink: %v", err)
2933
}
30-
defer os.Remove(symlinkPath)
34+
defer func() {
35+
if err = os.Remove(symlinkPath); err != nil {
36+
t.Errorf("failed to remove symlink directory: %v", err)
37+
}
38+
}()
3139

3240
// Delete the templates_templ.go file to ensure it is generated.
3341
err = os.Remove(path.Join(symlinkPath, "templates_templ.go"))

0 commit comments

Comments
 (0)