File tree Expand file tree Collapse file tree 2 files changed +9
-15
lines changed Expand file tree Collapse file tree 2 files changed +9
-15
lines changed Original file line number Diff line number Diff line change @@ -80,8 +80,14 @@ class ContextNode extends Node {
80
80
81
81
analyze ( builder ) {
82
82
83
+ const previousContext = builder . getContext ( ) ;
84
+
85
+ builder . setContext ( { ...builder . context , ...this . value } ) ;
86
+
83
87
this . node . build ( builder ) ;
84
88
89
+ builder . setContext ( previousContext ) ;
90
+
85
91
}
86
92
87
93
setup ( builder ) {
@@ -90,12 +96,10 @@ class ContextNode extends Node {
90
96
91
97
builder . setContext ( { ...builder . context , ...this . value } ) ;
92
98
93
- const node = this . node . build ( builder ) ;
99
+ this . node . build ( builder ) ;
94
100
95
101
builder . setContext ( previousContext ) ;
96
102
97
- return node ;
98
-
99
103
}
100
104
101
105
generate ( builder , output ) {
Original file line number Diff line number Diff line change @@ -636,9 +636,7 @@ class Node extends EventDispatcher {
636
636
//const stackNodesBeforeSetup = builder.stack.nodes.length;
637
637
638
638
properties . initialized = true ;
639
-
640
- const outputNode = this . setup ( builder ) ; // return a node or null
641
- const isNodeOutput = outputNode && outputNode . isNode === true ;
639
+ properties . outputNode = this . setup ( builder ) || properties . outputNode || null ;
642
640
643
641
/*if ( isNodeOutput && builder.stack.nodes.length !== stackNodesBeforeSetup ) {
644
642
@@ -665,17 +663,9 @@ class Node extends EventDispatcher {
665
663
666
664
}
667
665
668
- if ( isNodeOutput ) {
669
-
670
- outputNode . build ( builder ) ;
671
-
672
- }
673
-
674
- properties . outputNode = outputNode ;
675
-
676
666
}
677
667
678
- result = properties . outputNode || null ;
668
+ result = properties . outputNode ;
679
669
680
670
} else if ( buildStage === 'analyze' ) {
681
671
You can’t perform that action at this time.
0 commit comments