Skip to content

Commit

Permalink
Merge branch 'main' into ed/pluginUpdateCmd
Browse files Browse the repository at this point in the history
  • Loading branch information
emcfarlane authored Dec 5, 2024
2 parents 2d13f10 + f93c18a commit 44df42b
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions private/bufpkg/bufmodule/module_read_bucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,12 @@ func (b *moduleReadBucket) getIsTargetFileForPathUncached(ctx context.Context, p
// We've now deferred having to get fastscan.Results as much as we can.
protoFileTargetFastscanResult, err := b.getFastscanResultForPath(ctx, b.protoFileTargetPath)
if err != nil {
// In the case where multiple modules may have shared module roots through the includes key
// in the module configs, the protoFileTargetPath may not exist in the target module.
// In that case, we just return false.
if errors.Is(err, fs.ErrNotExist) {
return false, nil
}
return false, err
}
if protoFileTargetFastscanResult.PackageName == "" {
Expand Down

0 comments on commit 44df42b

Please sign in to comment.