Skip to content

fix: Propagate errors when creating repro SCIP index (part 2) #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2024
Merged

fix: Propagate errors when creating repro SCIP index (part 2) #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cmd/scip/tests/reprolang/bindings/go/repro/indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,17 @@ func Index(
}

// Phase 2: resolve names for definitions
var allErrs error
for _, dependency := range reproDependencies {
dependency.enterGlobalDefinitions(ctx)
if err := dependency.enterGlobalDefinitions(ctx); err != nil {
allErrs = errors.CombineErrors(allErrs, errors.Wrapf(err, "package: %v", dependency.Package))
}
}
for _, file := range reproSources {
file.enterDefinitions(ctx)
}

// Phase 3: resolve names for references
var allErrs error
for _, file := range reproSources {
if err := file.resolveReferences(ctx); err != nil {
allErrs = errors.CombineErrors(allErrs, errors.Wrapf(err, "file %q", file.Source.AbsolutePath))
Expand Down
5 changes: 4 additions & 1 deletion cmd/scip/tests/reprolang/bindings/go/repro/namer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,16 @@ import (

// enterGlobalDefinitions inserts the names of the global symbols that are defined in this
// dependency into the provided global scope.
func (d *reproDependency) enterGlobalDefinitions(context *reproContext) {
func (d *reproDependency) enterGlobalDefinitions(context *reproContext) error {
var errs error
enter := func(file *reproSourceFile, name *identifier) {
if name.isLocalSymbol() {
return
}
symbol := newGlobalSymbol(d.Package, file, name)
parsedSymbol, err := scip.ParseSymbol(symbol)
if err != nil {
errs = errors.CombineErrors(errs, errors.Wrapf(err, "file: %q", file.Source.AbsolutePath))
return
}
newName := newGlobalName(context.pkg, parsedSymbol)
Expand All @@ -30,6 +32,7 @@ func (d *reproDependency) enterGlobalDefinitions(context *reproContext) {
enter(file, relationship.name)
}
}
return errs
}

// enterDefinitions inserts the names of the definitions into the appropriate scope (local symbols go into the local scope).
Expand Down
Loading