mirror of
https://github.com/anomalyco/opencode.git
synced 2026-07-10 04:58:28 +00:00
fix(core): rewrite replacements while hoisting layers (#35175)
This commit is contained in:
parent
2152624f37
commit
33ed95f09c
2 changed files with 5 additions and 1 deletions
|
|
@ -230,7 +230,7 @@ export function hoist<A, E, T extends Tag, const Items extends Replacements = re
|
|||
if (existing && existing !== node) {
|
||||
throw new Error(`Tag ${tag} has conflicting implementations for ${node.name}`)
|
||||
}
|
||||
hoisted.set(node.name, node)
|
||||
hoisted.set(node.name, rewriteReplacementDependencies(node, replacementMap))
|
||||
return group([])
|
||||
}
|
||||
if (node.kind === "unbound") {
|
||||
|
|
|
|||
|
|
@ -89,6 +89,10 @@ export function buildLocationServiceMap(
|
|||
LayerMap.make(
|
||||
(ref: Location.Ref) => {
|
||||
const allReplacements = replacements.concat([[Location.node, Location.boundNode(ref)]])
|
||||
// Apply replacements during hoist, not afterward: replacements can
|
||||
// introduce new tagged dependencies (Location.boundNode depends on
|
||||
// Project), and the hoist walk is the only pass that can still slice
|
||||
// those back out.
|
||||
const location = LayerNode.hoist(locationServices, Node.tags.values.global, allReplacements)
|
||||
|
||||
return LayerNode.compile(location.node).pipe(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue