Skip to content

Commit 17e770b

Browse files
committed
Suggest fix for #203
1 parent c5a1847 commit 17e770b

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/EolModule.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ public void build(AST cst, IModule module) {
174174

175175
operations.addAll(this.getDeclaredOperations());
176176
for (Import import_ : imports) {
177-
import_.setContext(context);
178177
if (import_.isLoaded() && import_.getModule() instanceof IEolModule) {
179178
operations.addAll(((IEolModule)import_.getModule()).getOperations());
180179
}

plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/dom/Import.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ public void load(URI baseUri) {
7474
}
7575
if (!found) {
7676
try {
77+
if (importedModule instanceof IEolModule) {
78+
((IEolModule) importedModule).setContext(parentModule.getContext());
79+
}
7780
importedModule.parse(uri);
7881
}
7982
catch (Exception e) {

tests/org.eclipse.epsilon.egl.engine.test.acceptance/src/org/eclipse/epsilon/egl/test/acceptance/EglAcceptanceTestSuite.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.eclipse.epsilon.egl.test.acceptance.exceptions.Exceptions;
1717
import org.eclipse.epsilon.egl.test.acceptance.extensibility.Extensibility;
1818
import org.eclipse.epsilon.egl.test.acceptance.formatters.Formatters;
19+
import org.eclipse.epsilon.egl.test.acceptance.imports.CircularImportsTests;
1920
import org.eclipse.epsilon.egl.test.acceptance.imports.ImportCachingTests;
2021
import org.eclipse.epsilon.egl.test.acceptance.merge.Merge;
2122
import org.eclipse.epsilon.egl.test.acceptance.operations.template.TemplateOperations;
@@ -51,7 +52,8 @@
5152
PatchTestSuite.class,
5253
OutdentationTests.class,
5354
ImportCachingTests.class,
54-
ParseProblemTests.class})
55+
ParseProblemTests.class,
56+
CircularImportsTests.class})
5557
public class EglAcceptanceTestSuite {
5658

5759
public static Test suite() {

0 commit comments

Comments
 (0)