From a682ac94b9e4ee27d4edba7469561378c81fb768 Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Thu, 15 Aug 2024 23:30:02 -0700 Subject: [PATCH] refactor: remove file reference from ruleRecord (#1869) **What type of PR is this?** refactor **What package or component does this PR mostly affect?** all **What does this PR do? Why is it needed?** Minor cleanup, also working toward making `ruleRecord` being serializable. --- resolve/index.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/resolve/index.go b/resolve/index.go index 410c5c046..e5d5737ca 100644 --- a/resolve/index.go +++ b/resolve/index.go @@ -84,7 +84,8 @@ type RuleIndex struct { type ruleRecord struct { rule *rule.Rule label label.Label - file *rule.File + + pkg string // importedAs is a list of ImportSpecs by which this rule may be imported. // Used to build a map from ImportSpecs to ruleRecords. @@ -149,8 +150,8 @@ func (ix *RuleIndex) AddRule(c *config.Config, r *rule.Rule, f *rule.File) { record := &ruleRecord{ rule: r, + pkg: f.Pkg, label: label.New(c.RepoName, f.Pkg, r.Name()), - file: f, importedAs: imps, lang: lang, } @@ -179,7 +180,7 @@ func (ix *RuleIndex) collectEmbeds(r *ruleRecord) { if r.didCollectEmbeds { return } - resolver := ix.mrslv(r.rule, r.file.Pkg) + resolver := ix.mrslv(r.rule, r.pkg) r.didCollectEmbeds = true embedLabels := resolver.Embeds(r.rule, r.label) r.embeds = embedLabels @@ -189,7 +190,7 @@ func (ix *RuleIndex) collectEmbeds(r *ruleRecord) { continue } ix.collectEmbeds(er) - erResolver := ix.mrslv(er.rule, er.file.Pkg) + erResolver := ix.mrslv(er.rule, er.pkg) if resolver.Name() == erResolver.Name() { er.embedded = true r.embeds = append(r.embeds, er.embeds...)