Skip to content

Commit d724988

Browse files
committed
Fixed exceptions when top-level package name is null.
1 parent 4a1984a commit d724988

4 files changed

Lines changed: 4 additions & 2 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,9 @@ class AlfScopeProvider extends AbstractAlfScopeProvider {
235235
pack.imp(visitor, newHashSet, true)
236236

237237
val outerscope = if ( /* Root package */ pack.eContainer === null) {
238-
pack.accept(QualifiedName.create().append(pack.name), visitor, false, true, newHashSet)
238+
if (pack.name !== null) {
239+
pack.accept(QualifiedName.create().append(pack.name), visitor, false, true, newHashSet)
240+
}
239241
globalScope.getScope(pack.eResource, reference, Predicates.alwaysTrue)
240242
} else {
241243
scope_Package(pack.parentPackage, reference /*, E */ )
@@ -252,7 +254,7 @@ class AlfScopeProvider extends AbstractAlfScopeProvider {
252254
elements.entrySet.forEach[ entry |
253255
var qns = entry.value
254256
qns.forEach[qn|
255-
if ( !qn.startsWith(QualifiedName.create(pack.name))) {
257+
if ( pack.name !== null && !qn.startsWith(QualifiedName.create(pack.name))) {
256258
newElements.add(newArrayList(entry.key, QualifiedName.create().append(pack.name).append(qn)))
257259
}
258260
]
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)