Skip to content

Commit afd978e

Browse files
committed
chore: testing stdlib-import-root
1 parent 5db80b2 commit afd978e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

resolution/module-resolver.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ type ModuleResolver struct {
2020
lithiaSourceGlob string
2121
}
2222

23-
func DefaultModuleResolver() ModuleResolver {
23+
func DefaultModuleResolver(importRoots ...string) ModuleResolver {
2424
return ModuleResolver{
25-
externalImportRoots: defaultImportRoots(),
25+
externalImportRoots: defaultImportRoots(importRoots...),
2626
defaultPackageName: "root",
2727
manifestName: "Potfile",
2828
manifestSearchPaths: []string{".", "..", "../..", "../../..", "../../../.."},
@@ -52,8 +52,8 @@ type PackageManifest struct {
5252
Path string
5353
}
5454

55-
func defaultImportRoots() []string {
56-
roots := []string{}
55+
func defaultImportRoots(importRoots ...string) []string {
56+
roots := importRoots
5757
if path, ok := os.LookupEnv("LITHIA_LOCALS"); ok {
5858
roots = append(roots, path)
5959
}

runtime/interpreter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type Interpreter struct {
1818

1919
func NewInterpreter(referenceFile string, importRoots ...string) *Interpreter {
2020
inter := &Interpreter{
21-
Resolver: resolution.DefaultModuleResolver(),
21+
Resolver: resolution.DefaultModuleResolver(importRoots...),
2222
Parser: parser.NewParser(),
2323
Modules: make(map[ast.ModuleName]*RuntimeModule),
2424
ExternalDefinitions: make(map[ast.ModuleName]ExternalDefinition),

runtime/runtime-stdlib_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
func TestStdlib(t *testing.T) {
1313
pathToStdlib := "../stdlib"
14-
inter := r.NewInterpreter(pathToStdlib)
14+
inter := r.NewInterpreter(pathToStdlib, "../stdlib")
1515
mockOS := &mockExternalOS{
1616
calledExitCode: -1,
1717
env: map[string]string{"LITHIA_TESTS": "1"},

0 commit comments

Comments
 (0)