Skip to content

Commit ec7301a

Browse files
committed
fix: requirements to merge
1 parent 2649517 commit ec7301a

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

.golangci.next.reference.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -537,15 +537,15 @@ linters-settings:
537537
- '.+/cobra\.Command$'
538538

539539
filen:
540-
# Min number of lines in a file setting
541-
# Default: 5
542-
min-lines-num: 5
543-
# Max number of lines in a file setting
544-
# Default: 5
545-
max-lines-num: 500
546540
# Ignore comments when counting lines.
547541
# Default false
548-
ignore-comments: false
542+
ignore-comments: true
543+
# Max number of lines in a file setting
544+
# Default: 500
545+
max-lines-num: 1000
546+
# Min number of lines in a file setting
547+
# Default: 5
548+
min-lines-num: 1
549549

550550
forbidigo:
551551
# Forbid the following identifiers (list of regexp).

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/golangci/golangci-lint
22

3-
go 1.23.2
3+
go 1.22.1
44

55
require (
66
4d63.com/gocheckcompilerdirectives v1.2.1
@@ -12,7 +12,7 @@ require (
1212
github.com/Antonboom/testifylint v1.5.0
1313
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c
1414
github.com/Crocmagnon/fatcontext v0.5.2
15-
github.com/DanilXO/filen v0.1.0
15+
github.com/DanilXO/filen v0.2.0
1616
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24
1717
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0
1818
github.com/OpenPeeDeeP/depguard/v2 v2.2.0

go.sum

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/config/linters_settings.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1020,9 +1020,9 @@ type WSLSettings struct {
10201020
}
10211021

10221022
type FilenSettings struct {
1023+
IgnoreComments bool `mapstructure:"ignore-comments"`
10231024
MaxLinesNum int `mapstructure:"min-lines-num"`
10241025
MinLinesNum int `mapstructure:"max-lines-num"`
1025-
IgnoreComments bool `mapstructure:"ignore-comments"`
10261026
}
10271027

10281028
// CustomLinterSettings encapsulates the meta-data of a private linter.

pkg/golinters/filen/filen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package filen
22

33
import (
4-
"github.com/DanilXO/filen/pgk/filen"
4+
"github.com/DanilXO/filen/pkg/filen"
55
"github.com/golangci/golangci-lint/pkg/config"
66
"github.com/golangci/golangci-lint/pkg/goanalysis"
77
"golang.org/x/tools/go/analysis"
File renamed without changes.

0 commit comments

Comments
 (0)