gci: add new option

Author: ldez

.golangci.next.reference.yml

@@ -594,6 +594,14 @@ linters-settings:
       - alias                          # Alias section: contains all alias imports. This section is not present unless explicitly enabled.
       - localmodule                    # Local module section: contains all local packages. This section is not present unless explicitly enabled.
 
+    # Checks that no inline Comments are present.
+    # Default: false
+    no-inline-comments: true
+
+    # Checks that no prefix Comments(comment lines above an import) are present.
+    # Default: false
+    no-prefix-comments: true
+
     # Skip generated files.
     # Default: true
     skip-generated: false

jsonschema/golangci.next.jsonschema.json

@@ -1120,6 +1120,16 @@
               "type": "boolean",
               "default": true
             },
+            "no-inline-comments": {
+              "description": "Checks that no inline Comments are present.",
+              "type": "boolean",
+              "default": false
+            },
+            "no-prefix-comments": {
+              "description": "Checks that no prefix Comments(comment lines above an import) are present.",
+              "type": "boolean",
+              "default": false
+            },
             "custom-order": {
               "description": "Enable custom order of sections.",
               "type": "boolean",

pkg/config/linters_settings.go

@@ -477,10 +477,12 @@ type FunlenSettings struct {
 }
 
 type GciSettings struct {
-	Sections      []string `mapstructure:"sections"`
-	SkipGenerated bool     `mapstructure:"skip-generated"`
-	CustomOrder   bool     `mapstructure:"custom-order"`
-	NoLexOrder    bool     `mapstructure:"no-lex-order"`
+	Sections         []string `mapstructure:"sections"`
+	NoInlineComments bool     `mapstructure:"no-inline-comments"`
+	NoPrefixComments bool     `mapstructure:"no-prefix-comments"`
+	SkipGenerated    bool     `mapstructure:"skip-generated"`
+	CustomOrder      bool     `mapstructure:"custom-order"`
+	NoLexOrder       bool     `mapstructure:"no-lex-order"`
 
 	// Deprecated: use Sections instead.
 	LocalPrefixes string `mapstructure:"local-prefixes"`

pkg/golinters/gci/gci.go

@@ -11,11 +11,11 @@ import (
 	"github.com/daixiang0/gci/pkg/io"
 	"github.com/daixiang0/gci/pkg/log"
 	"github.com/daixiang0/gci/pkg/section"
-	"github.com/golangci/modinfo"
 	"github.com/hexops/gotextdiff"
 	"github.com/hexops/gotextdiff/myers"
 	"github.com/hexops/gotextdiff/span"
 	"golang.org/x/tools/go/analysis"
+	"golang.org/x/tools/go/analysis/passes/inspect"
 
 	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/goanalysis"
@@ -34,17 +34,19 @@ func New(settings *config.GciSettings) *goanalysis.Linter {
 		Doc:  goanalysis.TheOnlyanalyzerDoc,
 		Run:  goanalysis.DummyRun,
 		Requires: []*analysis.Analyzer{
-			modinfo.Analyzer,
+			inspect.Analyzer,
 		},
 	}
 
 	var cfg *gcicfg.Config
 	if settings != nil {
 		rawCfg := gcicfg.YamlConfig{
 			Cfg: gcicfg.BoolConfig{
-				SkipGenerated: settings.SkipGenerated,
-				CustomOrder:   settings.CustomOrder,
-				NoLexOrder:    settings.NoLexOrder,
+				NoInlineComments: settings.NoInlineComments,
+				NoPrefixComments: settings.NoPrefixComments,
+				SkipGenerated:    settings.SkipGenerated,
+				CustomOrder:      settings.CustomOrder,
+				NoLexOrder:       settings.NoLexOrder,
 			},
 			SectionStrings: settings.Sections,
 		}
@@ -158,16 +160,11 @@ func hackSectionList(pass *analysis.Pass, cfg *gcicfg.Config) (section.SectionLi
 	for _, sect := range cfg.Sections {
 		// local module hack
 		if v, ok := sect.(*section.LocalModule); ok {
-			info, err := modinfo.FindModuleFromPass(pass)
-			if err != nil {
-				return nil, err
-			}
-
-			if info.Path == "" {
+			if pass.Module == nil {
 				continue
 			}
 
-			v.Path = info.Path
+			v.Path = pass.Module.Path
 		}
 
 		sections = append(sections, sect)