Carry resolved filesystem facts through loads
This commit is contained in:
@@ -156,7 +156,12 @@ func TestAcquiredContextsUseSelectedFileWhenSourceRecordsAreReordered(t *testing
|
||||
{ID: "source-2", Path: canonicalTestPath(t, importedPath), Kind: SourceKindFile},
|
||||
{ID: "source-1", Path: canonicalTestPath(t, mainPath), Kind: SourceKindFile},
|
||||
}
|
||||
contexts, diagnostic := contextsForAcquiredSources(File(mainPath), nil, nil, sources)
|
||||
mainInfo := &SourceInfo{Path: canonicalTestPath(t, mainPath)}
|
||||
resolved, diagnostic := resolveFilesystemContext(File(mainPath), nil, parsedSource{source: mainInfo}, nil)
|
||||
if diagnostic != nil {
|
||||
t.Fatalf("resolve main context: %#v", diagnostic)
|
||||
}
|
||||
contexts, diagnostic := contextsForResolvedSources(&resolved, sources)
|
||||
if diagnostic != nil {
|
||||
t.Fatalf("source contexts: %#v", diagnostic)
|
||||
}
|
||||
@@ -1443,7 +1448,8 @@ func testAcquireInput(request inputAcquisitionRequest, policy acquisitionPolicy,
|
||||
}
|
||||
|
||||
func testAcquireImport(request importAcquisitionRequest, policy acquisitionPolicy, state *acquisitionState, tier *tierAcquisitionState) (*composedDocument, []SourceInfo, []Diagnostic) {
|
||||
return acquireImportedInput(request, &policy, state, tier)
|
||||
composition, sources, _, diagnostics := acquireImportedInput(request, &policy, state, tier)
|
||||
return composition, sources, diagnostics
|
||||
}
|
||||
|
||||
func testAcquireImportWithLimits(request importAcquisitionRequest, limits importLimits) (*composedDocument, []SourceInfo, []Diagnostic) {
|
||||
|
||||
Reference in New Issue
Block a user