|
4 | 4 | "fmt" |
5 | 5 | "os" |
6 | 6 | "path/filepath" |
| 7 | + "reflect" |
7 | 8 | "slices" |
8 | 9 |
|
9 | 10 | sitter "github.com/smacker/go-tree-sitter" |
@@ -50,14 +51,19 @@ type Analyzer struct { |
50 | 51 | Category Category |
51 | 52 | Severity Severity |
52 | 53 | Language Language |
53 | | - Run func(*Pass) (interface{}, error) |
| 54 | + Requires []*Analyzer |
| 55 | + Run func(*Pass) (any, error) |
| 56 | + ResultType reflect.Type |
54 | 57 | } |
55 | 58 |
|
56 | 59 | type Pass struct { |
57 | 60 | Analyzer *Analyzer |
58 | 61 | FileContext *ParseResult |
59 | 62 | Files []*ParseResult |
| 63 | + ResultOf map[*Analyzer]any |
60 | 64 | Report func(*Pass, *sitter.Node, string) |
| 65 | + // TODO (opt): the cache should ideally not be stored in-memory |
| 66 | + ResultCache map[*Analyzer]map[*ParseResult]any |
61 | 67 | } |
62 | 68 |
|
63 | 69 | func walkTree(node *sitter.Node, f func(*sitter.Node)) { |
@@ -88,11 +94,21 @@ var defaultIgnoreDirs = []string{ |
88 | 94 | ".vitepress", |
89 | 95 | } |
90 | 96 |
|
| 97 | +func findAnalyzers(analyzer *Analyzer) []*Analyzer { |
| 98 | + analyzers := []*Analyzer{} |
| 99 | + for _, req := range analyzer.Requires { |
| 100 | + analyzers = append(analyzers, findAnalyzers(req)...) |
| 101 | + } |
| 102 | + analyzers = append(analyzers, analyzer) |
| 103 | + return analyzers |
| 104 | +} |
| 105 | + |
91 | 106 | func RunAnalyzers(path string, analyzers []*Analyzer, fileFilter func(string) bool) ([]*Issue, error) { |
92 | 107 | raisedIssues := []*Issue{} |
93 | 108 | langAnalyzerMap := make(map[Language][]*Analyzer) |
| 109 | + |
94 | 110 | for _, analyzer := range analyzers { |
95 | | - langAnalyzerMap[analyzer.Language] = append(langAnalyzerMap[analyzer.Language], analyzer) |
| 111 | + langAnalyzerMap[analyzer.Language] = append(langAnalyzerMap[analyzer.Language], findAnalyzers(analyzer)...) |
96 | 112 | } |
97 | 113 |
|
98 | 114 | trees := make(map[Language][]*ParseResult) |
@@ -138,24 +154,32 @@ func RunAnalyzers(path string, analyzers []*Analyzer, fileFilter func(string) bo |
138 | 154 | } |
139 | 155 |
|
140 | 156 | for lang, analyzers := range langAnalyzerMap { |
141 | | - for _, analyzer := range analyzers { |
142 | | - allFiles := trees[lang] |
143 | | - if len(allFiles) == 0 { |
144 | | - continue |
145 | | - } |
| 157 | + pass := &Pass{ |
| 158 | + Files: trees[lang], |
| 159 | + Report: reportFunc, |
| 160 | + ResultOf: make(map[*Analyzer]any), |
| 161 | + ResultCache: make(map[*Analyzer]map[*ParseResult]any), |
| 162 | + } |
| 163 | + |
| 164 | + for _, file := range pass.Files { |
| 165 | + pass.FileContext = file |
| 166 | + for _, analyzer := range analyzers { |
| 167 | + pass.Analyzer = analyzer |
146 | 168 |
|
147 | | - for _, file := range allFiles { |
148 | | - pass := &Pass{ |
149 | | - Analyzer: analyzer, |
150 | | - FileContext: file, |
151 | | - Files: trees[lang], |
152 | | - Report: reportFunc, |
| 169 | + if len(pass.Files) == 0 { |
| 170 | + continue |
153 | 171 | } |
154 | 172 |
|
155 | | - _, err := analyzer.Run(pass) |
| 173 | + result, err := analyzer.Run(pass) |
156 | 174 | if err != nil { |
157 | 175 | return raisedIssues, err |
158 | 176 | } |
| 177 | + |
| 178 | + pass.ResultOf[analyzer] = result |
| 179 | + if _, ok := pass.ResultCache[analyzer]; !ok { |
| 180 | + pass.ResultCache[analyzer] = make(map[*ParseResult]any) |
| 181 | + } |
| 182 | + pass.ResultCache[analyzer][file] = result |
159 | 183 | } |
160 | 184 | } |
161 | 185 | } |
|
0 commit comments