From a6365e5137146eb02ef4aa75e570b397fa060f65 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Fri, 5 Aug 2022 23:37:47 +0200 Subject: [PATCH 1/2] docs: remove allow-leading-space option --- .golangci.reference.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.golangci.reference.yml b/.golangci.reference.yml index ab044ff71188..96a3ba1fa3f8 100644 --- a/.golangci.reference.yml +++ b/.golangci.reference.yml @@ -1159,9 +1159,6 @@ linters-settings: # Disable to ensure that all nolint directives actually have an effect. # Default: false allow-unused: true - # Disable to ensure that nolint directives don't have a leading space. - # Default: true - allow-leading-space: false # Exclude following linters from requiring an explanation. # Default: [] allow-no-explanation: [ ] From 76ebd696109ecd9fda745b6bf8baf07d1d0c4314 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Fri, 5 Aug 2022 23:42:07 +0200 Subject: [PATCH 2/2] chore: remove allow-leading-space --- .golangci.yml | 1 - test/testdata/fix/in/nolintlint.go | 1 - test/testdata/fix/out/nolintlint.go | 1 - test/testdata/nolintlint.go | 1 - 4 files changed, 4 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 9778170cb97a..344c0e8431b7 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -61,7 +61,6 @@ linters-settings: misspell: locale: US nolintlint: - allow-leading-space: false allow-unused: false # report any unused nolint directives require-explanation: false # don't require an explanation for nolint directives require-specific: false # don't require nolint directives to be specific about which linter is being skipped diff --git a/test/testdata/fix/in/nolintlint.go b/test/testdata/fix/in/nolintlint.go index 96468754da6b..bfb0e91eef93 100644 --- a/test/testdata/fix/in/nolintlint.go +++ b/test/testdata/fix/in/nolintlint.go @@ -1,6 +1,5 @@ //golangcitest:args -Enolintlint -Elll //golangcitest:expected_linter nolintlint -//golangcitest:config linters-settings.nolintlint.allow-leading-space=false package p import "fmt" diff --git a/test/testdata/fix/out/nolintlint.go b/test/testdata/fix/out/nolintlint.go index 8858f3eeecbd..93b34c6ed955 100644 --- a/test/testdata/fix/out/nolintlint.go +++ b/test/testdata/fix/out/nolintlint.go @@ -1,6 +1,5 @@ //golangcitest:args -Enolintlint -Elll //golangcitest:expected_linter nolintlint -//golangcitest:config linters-settings.nolintlint.allow-leading-space=false package p import "fmt" diff --git a/test/testdata/nolintlint.go b/test/testdata/nolintlint.go index 6d3bf0539e29..1043b9846d28 100644 --- a/test/testdata/nolintlint.go +++ b/test/testdata/nolintlint.go @@ -2,7 +2,6 @@ //golangcitest:expected_linter nolintlint //golangcitest:config linters-settings.nolintlint.require-explanation=true //golangcitest:config linters-settings.nolintlint.require-specific=true -//golangcitest:config linters-settings.nolintlint.allow-leading-space=false package testdata import "fmt"