Skip to content

Commit

Permalink
refactor: remove file reference from ruleRecord (#1869)
Browse files Browse the repository at this point in the history
**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.
  • Loading branch information
jbedard authored Aug 16, 2024
1 parent bc4ad6b commit a682ac9
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions resolve/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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,
}
Expand Down Expand Up @@ -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
Expand All @@ -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...)
Expand Down

0 comments on commit a682ac9

Please sign in to comment.