From c14af2a4eb80811e8fb25502b4a07ad2f33804c2 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Thu, 26 Jan 2023 22:45:39 -0700
Subject: .golangci.yml: Turn on formatting linters 'gci' and 'gofumpt', fix

All formatting changes are made by

    ./tools/bin/golangci-lint run --fix ./...
---
 .golangci.yml              | 13 +++++++++++--
 compat/json/compat.go      |  6 +++---
 compat/json/compat_test.go |  1 +
 decode.go                  |  3 +++
 internal/parse.go          |  2 ++
 misc.go                    |  2 ++
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index d51fec0..d35fd4e 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -6,13 +6,22 @@ linters:
   disable:
     - structcheck # doesn't support Go 1.18 yet
   enable:
+    - gci
     - gofmt
+    - gofumpt
 linters-settings:
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(git.lukeshu.com/go/lowmemjson)
   gofmt:
     simplify: true
 issues:
   exclude-rules:
-    - path: borrowed_example_test.go
-      linters: [errcheck]
+    - path: "borrowed_.*_test\\.go"
+      linters:
+        - errcheck
+        - gofumpt
   max-issues-per-linter: 0
   max-same-issues: 0
diff --git a/compat/json/compat.go b/compat/json/compat.go
index f8b23e3..fb4fc90 100644
--- a/compat/json/compat.go
+++ b/compat/json/compat.go
@@ -22,14 +22,14 @@ type (
 	Unmarshaler = json.Unmarshaler
 
 	// low-level decode errors
-	//SyntaxError        = json.SyntaxError // duplicated to access a private field
+	// SyntaxError        = json.SyntaxError // duplicated to access a private field
 	UnmarshalTypeError = json.UnmarshalTypeError
 
 	// high-level decode errors
 	InvalidUnmarshalError = json.InvalidUnmarshalError
 
 	// marshal errors
-	//MarshalerError        = json.MarshalerError // duplicated to access a private field
+	// MarshalerError        = json.MarshalerError // duplicated to access a private field
 	UnsupportedTypeError  = json.UnsupportedTypeError
 	UnsupportedValueError = json.UnsupportedValueError
 )
@@ -241,4 +241,4 @@ func (dec *Decoder) Buffered() io.Reader {
 	return bytes.NewReader(dat)
 }
 
-//func (dec *Decoder) Token() (Token, error)
+// func (dec *Decoder) Token() (Token, error)
diff --git a/compat/json/compat_test.go b/compat/json/compat_test.go
index 23ee977..dac5e54 100644
--- a/compat/json/compat_test.go
+++ b/compat/json/compat_test.go
@@ -54,6 +54,7 @@ type encodeState struct {
 func (es *encodeState) string(str string, _ bool) {
 	internal.EncodeStringFromString(&es.Buffer, str)
 }
+
 func (es *encodeState) stringBytes(str []byte, _ bool) {
 	internal.EncodeStringFromBytes(&es.Buffer, str)
 }
diff --git a/decode.go b/decode.go
index 5a03d5d..0b5b6cc 100644
--- a/decode.go
+++ b/decode.go
@@ -153,9 +153,11 @@ func (dec *Decoder) More() bool {
 func (dec *Decoder) stackPush(par reflect.Type, idx any) {
 	dec.stack = append(dec.stack, decodeStackItem{par, idx})
 }
+
 func (dec *Decoder) stackPop() {
 	dec.stack = dec.stack[:len(dec.stack)-1]
 }
+
 func (dec *Decoder) stackStr() string {
 	var buf strings.Builder
 	buf.WriteString("v")
@@ -326,6 +328,7 @@ func (sc *decRuneTypeScanner) ReadRuneType() (rune, int, internal.RuneType, erro
 	}
 	return c, s, t, nil
 }
+
 func (sc *decRuneTypeScanner) ReadRune() (rune, int, error) {
 	r, s, t, _ := sc.ReadRuneType()
 	switch t {
diff --git a/internal/parse.go b/internal/parse.go
index 73470ae..70e793e 100644
--- a/internal/parse.go
+++ b/internal/parse.go
@@ -285,10 +285,12 @@ func (par *Parser) pushState(state RuneType) RuneType {
 	par.stack = append(par.stack, state)
 	return state
 }
+
 func (par *Parser) replaceState(state RuneType) RuneType {
 	par.stack[len(par.stack)-1] = state
 	return state
 }
+
 func (par *Parser) popState() {
 	par.stack = par.stack[:len(par.stack)-1]
 }
diff --git a/misc.go b/misc.go
index ecb28ca..c3ce785 100644
--- a/misc.go
+++ b/misc.go
@@ -149,6 +149,7 @@ func writeStringUnicodeEscape(w io.Writer, c rune) (int, error) {
 	}
 	return w.Write(buf[:])
 }
+
 func writeStringShortEscape(w io.Writer, c rune) (int, error) {
 	var b byte
 	switch c {
@@ -170,6 +171,7 @@ func writeStringShortEscape(w io.Writer, c rune) (int, error) {
 	buf := [2]byte{'\\', b}
 	return w.Write(buf[:])
 }
+
 func writeStringChar(w io.Writer, c rune, wasEscaped BackslashEscapeMode, escaper BackslashEscaper) (int, error) {
 	if escaper == nil {
 		escaper = EscapeDefault
-- 
cgit v1.2.3-54-g00ecf