Skip to content

Commit 4a1984a

Browse files
committed
Fixed import bug.
1 parent fc94b31 commit 4a1984a

5 files changed

Lines changed: 23 additions & 3 deletions

File tree

org.omg.sysml.tests/src/org/omg/sysml/tests/SimpleImportTestsFromOtherFile.xtend

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class SimpleImportTestsFromOtherFile {
5252
@Inject extension Dependency
5353

5454
@Test
55-
def void testImort() {
55+
def void testImport1() {
5656
val rs = getDependencyOuterPackage
5757
val result = parseHelper.parse('''
5858
package test {
@@ -70,7 +70,7 @@ class SimpleImportTestsFromOtherFile {
7070
}
7171

7272
@Test
73-
def void testImort2() {
73+
def void testImport2() {
7474
val rs = getDependencyOuterPackage
7575
val result = parseHelper.parse('''
7676
package test {
@@ -88,4 +88,23 @@ class SimpleImportTestsFromOtherFile {
8888
Assert.assertTrue(result.eResource.errors.empty)
8989
}
9090

91+
@Test
92+
def void testImport3() {
93+
val rs = getDependencyOuterPackage
94+
val result = parseHelper.parse('''
95+
package test {
96+
import OuterPackage::*;
97+
class Try specializes B{
98+
feature try : b redefines B::b;
99+
}
100+
}
101+
102+
''', rs)
103+
104+
EcoreUtil2.resolveAll(result)
105+
Assert.assertNotNull(result)
106+
result.assertNoErrors
107+
Assert.assertTrue(result.eResource.errors.empty)
108+
}
109+
91110
}

org.omg.sysml/src/org/omg/sysml/scoping/AlfScopeProvider.xtend

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,9 @@ class AlfScopeProvider extends AbstractAlfScopeProvider {
208208
val elements = <Element, HashSet<QualifiedName>>newHashMap()
209209
val visited = newHashSet
210210
val visitor = [ QualifiedName qn, Element el |
211-
var added = false;
211+
var added = true;
212212
if (reference.EReferenceType.isInstance(el)) {
213+
added = false;
213214
val qns = elements.get(el);
214215
if ( qns === null ) {
215216
if ( !visited.contains(qn)){
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)