Merge pull request #158 from rabbitmq/resolve-honors-gazelle-exclude

HoloRin · web-flow · commit d77f64d87a09 · 2023-02-27T12:18:25.000+01:00
gazelle: exclude directives are honored when resolving local deps
diff --git a/gazelle/resolve.go b/gazelle/resolve.go
@@ -64,7 +64,11 @@ func appsDirApps(c *config.Config, rel string) map[string]string {
 			}
 			for _, d := range dirs {
 				if d.IsDir() {
-					result[d.Name()] = filepath.Join(appsDir, d.Name())
+					configs := c.Exts[languageName].(ErlangConfigs)
+					dRel := filepath.Join(appsDir, d.Name())
+					if _, ok := configs[dRel]; ok {
+						result[d.Name()] = dRel
+					}
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,11 @@ func appsDirApps(c *config.Config, rel string) map[string]string {`
`64`	`64`	`}`
`65`	`65`	`for _, d := range dirs {`
`66`	`66`	`if d.IsDir() {`
`67`		`- result[d.Name()] = filepath.Join(appsDir, d.Name())`
	`67`	`+ configs := c.Exts[languageName].(ErlangConfigs)`
	`68`	`+ dRel := filepath.Join(appsDir, d.Name())`
	`69`	`+ if _, ok := configs[dRel]; ok {`
	`70`	`+ result[d.Name()] = dRel`
	`71`	`+ }`
`68`	`72`	`}`
`69`	`73`	`}`
`70`	`74`	`}`