From 7b9f40d8226d502cf83066d1eca3139f72223690 Mon Sep 17 00:00:00 2001 From: Anton Telyshev Date: Wed, 13 Nov 2024 23:08:29 +0300 Subject: [PATCH 1/2] testifylint: formatter: improve description of require-f-funcs flag --- .golangci.next.reference.yml | 7 ++++++- jsonschema/golangci.next.jsonschema.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml index 92efcfbebd62..ef600b999dc5 100644 --- a/.golangci.next.reference.yml +++ b/.golangci.next.reference.yml @@ -3383,7 +3383,12 @@ linters-settings: # To enable go vet's printf checks. # Default: true check-format-string: false - # To require f-assertions if format string is used. + # To require f-assertions (e.g. assert.Equalf) if format string is used, even if there are no variable-length + # variables, i.e. it requires require.NoErrorf for both these cases: + # require.NoErrorf(t, err, "unexpected error") + # require.NoErrorf(t, err, "unexpected error for sid: %v", sid) + # To understand this behavior, please read the + # https://github.com/Antonboom/testifylint?tab=readme-ov-file#historical-reference-of-formatter. # Default: false require-f-funcs: true go-require: diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json index 5ccb898a57a7..4048750fedf5 100644 --- a/jsonschema/golangci.next.jsonschema.json +++ b/jsonschema/golangci.next.jsonschema.json @@ -3059,7 +3059,7 @@ "default": true }, "require-f-funcs": { - "description": "To require f-assertions if format string is used.", + "description": "To require f-assertions (e.g. assert.Equalf) if format string is used, even if there are no variable-length variables.", "type": "boolean", "default": false } From aed163b4fcab03556e94cb61233b0261a07d2d40 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Wed, 13 Nov 2024 21:24:22 +0100 Subject: [PATCH 2/2] review --- .golangci.next.reference.yml | 8 ++++---- .golangci.reference.yml | 7 ++++++- jsonschema/golangci.jsonschema.json | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml index ef600b999dc5..c737eb16a3d9 100644 --- a/.golangci.next.reference.yml +++ b/.golangci.next.reference.yml @@ -3383,10 +3383,10 @@ linters-settings: # To enable go vet's printf checks. # Default: true check-format-string: false - # To require f-assertions (e.g. assert.Equalf) if format string is used, even if there are no variable-length - # variables, i.e. it requires require.NoErrorf for both these cases: - # require.NoErrorf(t, err, "unexpected error") - # require.NoErrorf(t, err, "unexpected error for sid: %v", sid) + # To require f-assertions (e.g. `assert.Equalf`) if format string is used, even if there are no variable-length + # variables, i.e. it requires `require.NoErrorf` for both these cases: + # - require.NoErrorf(t, err, "unexpected error") + # - require.NoErrorf(t, err, "unexpected error for sid: %v", sid) # To understand this behavior, please read the # https://github.com/Antonboom/testifylint?tab=readme-ov-file#historical-reference-of-formatter. # Default: false diff --git a/.golangci.reference.yml b/.golangci.reference.yml index 92efcfbebd62..c737eb16a3d9 100644 --- a/.golangci.reference.yml +++ b/.golangci.reference.yml @@ -3383,7 +3383,12 @@ linters-settings: # To enable go vet's printf checks. # Default: true check-format-string: false - # To require f-assertions if format string is used. + # To require f-assertions (e.g. `assert.Equalf`) if format string is used, even if there are no variable-length + # variables, i.e. it requires `require.NoErrorf` for both these cases: + # - require.NoErrorf(t, err, "unexpected error") + # - require.NoErrorf(t, err, "unexpected error for sid: %v", sid) + # To understand this behavior, please read the + # https://github.com/Antonboom/testifylint?tab=readme-ov-file#historical-reference-of-formatter. # Default: false require-f-funcs: true go-require: diff --git a/jsonschema/golangci.jsonschema.json b/jsonschema/golangci.jsonschema.json index 5ccb898a57a7..4048750fedf5 100644 --- a/jsonschema/golangci.jsonschema.json +++ b/jsonschema/golangci.jsonschema.json @@ -3059,7 +3059,7 @@ "default": true }, "require-f-funcs": { - "description": "To require f-assertions if format string is used.", + "description": "To require f-assertions (e.g. assert.Equalf) if format string is used, even if there are no variable-length variables.", "type": "boolean", "default": false }