mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-17 16:38:54 +00:00
* refine the plan
* Fix all staticcheck lint findings (uncapped)
golangci-lint's default max-same-issues=3 was hiding most of the backlog:
the true pre-fix count was 69 staticcheck findings, not 34. This fixes all
of them, driving staticcheck to zero:
- ST1023/QF1011 (37): omit explicit types inferred from the RHS
- S1009/S1031 (15): drop redundant nil checks before len()/range
- SA9003 (9): remove comment-only empty branches, keeping the comments
- QF1007 (3): merge conditional assignment into declaration
- QF1006 (3): lift break conditions into loop conditions
- QF1001 (3): apply De Morgan's law / name the negated predicate
Also updates plans/lintfixes.md with the cap discovery and the corrected
errcheck picture (1202 uncapped, ~949 of them fmt.Fprint*).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* Drive errcheck to zero: config for bulk categories, propagate real errors
Adds .golangci.yml with errcheck exclude-functions for fmt.Fprint* (usage
printers), (*bufio.Writer).Write/WriteString (sticky errors, surfaced at the
now-checked final Flush), and (*strings.Builder).WriteString; pins
max-issues-per-linter/max-same-issues to 0 so CI reports true counts.
Real error paths now propagate instead of being dropped:
- Finalize{Reader,Writer}Options in join/put/filter/split/tee and the
repl/script entry points: 'mlr join -i badformat' now errors instead of
silently using wrong separators
- final output-stream Flush in pkg/stream: write failure no longer exits 0
- DSL emit/print/dump redirect writes, matching their sibling branches
- CSV writer WriteCSVRecordMaybeColorized, close-time Flush in file output
handlers, ENV[...] Setenv, REPL record-write and redirect-close errors
- termcvt write-side Close before rename (had "TODO: check return status")
The rest are deliberate ignores, marked with _ = and a comment where the
reason isn't obvious: unset-of-missing-path no-ops, read-side closes,
mid-stream FlushOnEveryRecord, init-time strftime registrations, in-memory
usage-capture pipes, and regtest-harness env/temp-file teardown.
golangci-lint now reports 0 issues on ./cmd/mlr ./pkg/... with all caps off.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
74 lines
2 KiB
Go
74 lines
2 KiB
Go
// Machine-readable (JSON) accessors over the keyword catalog, for
|
|
// `mlr help --as-json` and similar tooling. The per-keyword usage functions print
|
|
// their bodies directly to stdout (they predate any structured-help need), so
|
|
// here we capture that output by temporarily redirecting os.Stdout.
|
|
|
|
package cst
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"os"
|
|
"strings"
|
|
)
|
|
|
|
// KeywordInfoForJSON is the structured view of a single DSL keyword.
|
|
type KeywordInfoForJSON struct {
|
|
Name string `json:"name"`
|
|
Help string `json:"help"`
|
|
}
|
|
|
|
// captureStdout runs f with os.Stdout redirected to a pipe and returns whatever
|
|
// f printed. The keyword usage functions write via fmt.Println/Printf, which
|
|
// resolve os.Stdout at call time, so swapping it here captures their output.
|
|
// Help generation is single-threaded and one-shot, so the global swap is safe.
|
|
func captureStdout(f func()) string {
|
|
old := os.Stdout
|
|
r, w, err := os.Pipe()
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
os.Stdout = w
|
|
|
|
done := make(chan string)
|
|
go func() {
|
|
var buf bytes.Buffer
|
|
_, _ = io.Copy(&buf, r)
|
|
done <- buf.String()
|
|
}()
|
|
|
|
f()
|
|
|
|
_ = w.Close()
|
|
os.Stdout = old
|
|
s := <-done
|
|
_ = r.Close()
|
|
return s
|
|
}
|
|
|
|
func makeKeywordInfoForJSON(entry *tKeywordUsageEntry) *KeywordInfoForJSON {
|
|
return &KeywordInfoForJSON{
|
|
Name: entry.name,
|
|
Help: strings.TrimRight(captureStdout(entry.usageFunc), "\n"),
|
|
}
|
|
}
|
|
|
|
// GetKeywordInfosForJSON returns the full keyword catalog in source-table order.
|
|
func GetKeywordInfosForJSON() []*KeywordInfoForJSON {
|
|
infos := make([]*KeywordInfoForJSON, 0, len(KEYWORD_USAGE_TABLE))
|
|
for i := range KEYWORD_USAGE_TABLE {
|
|
infos = append(infos, makeKeywordInfoForJSON(&KEYWORD_USAGE_TABLE[i]))
|
|
}
|
|
return infos
|
|
}
|
|
|
|
// GetKeywordInfoForJSON returns the structured view of a single keyword, or nil
|
|
// if there is no such keyword.
|
|
func GetKeywordInfoForJSON(name string) *KeywordInfoForJSON {
|
|
for i := range KEYWORD_USAGE_TABLE {
|
|
if KEYWORD_USAGE_TABLE[i].name == name {
|
|
return makeKeywordInfoForJSON(&KEYWORD_USAGE_TABLE[i])
|
|
}
|
|
}
|
|
return nil
|
|
}
|