@@ -50,7 +50,6 @@ import (
50
50
"golang.org/x/tools/gopls/internal/analysis/fillreturns"
51
51
"golang.org/x/tools/gopls/internal/analysis/infertypeargs"
52
52
"golang.org/x/tools/gopls/internal/analysis/nonewvars"
53
- "golang.org/x/tools/gopls/internal/analysis/norangeoverfunc"
54
53
"golang.org/x/tools/gopls/internal/analysis/noresultvalues"
55
54
"golang.org/x/tools/gopls/internal/analysis/simplifycompositelit"
56
55
"golang.org/x/tools/gopls/internal/analysis/simplifyrange"
@@ -60,7 +59,6 @@ import (
60
59
"golang.org/x/tools/gopls/internal/analysis/unusedvariable"
61
60
"golang.org/x/tools/gopls/internal/analysis/useany"
62
61
"golang.org/x/tools/gopls/internal/protocol"
63
- "honnef.co/go/tools/staticcheck"
64
62
)
65
63
66
64
// Analyzer augments a [analysis.Analyzer] with additional LSP configuration.
@@ -108,32 +106,7 @@ func (a *Analyzer) String() string { return a.analyzer.String() }
108
106
var DefaultAnalyzers = make (map [string ]* Analyzer ) // initialized below
109
107
110
108
func init () {
111
- // Emergency workaround for #67237 to allow standard library
112
- // to use range over func: disable SSA-based analyses of
113
- // go1.23 packages that use range-over-func.
114
- suppressOnRangeOverFunc := func (a * analysis.Analyzer ) {
115
- a .Requires = append (a .Requires , norangeoverfunc .Analyzer )
116
- }
117
- // buildir is non-exported so we have to scan the Analysis.Requires graph to find it.
118
- var buildir * analysis.Analyzer
119
- for _ , a := range staticcheck .Analyzers {
120
- for _ , req := range a .Analyzer .Requires {
121
- if req .Name == "buildir" {
122
- buildir = req
123
- }
124
- }
125
-
126
- // Temporarily disable SA4004 CheckIneffectiveLoop as
127
- // it crashes when encountering go1.23 range-over-func
128
- // (#67237, dominikh/go-tools#1494).
129
- if a .Analyzer .Name == "SA4004" {
130
- suppressOnRangeOverFunc (a .Analyzer )
131
- }
132
- }
133
- if buildir != nil {
134
- suppressOnRangeOverFunc (buildir )
135
- }
136
-
109
+ // The traditional vet suite:
137
110
analyzers := []* Analyzer {
138
111
// The traditional vet suite:
139
112
{analyzer : appends .Analyzer , enabled : true },
0 commit comments