handle other scopes in ambiguous definitions
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/55ee9687 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/55ee9687 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/55ee9687 Branch: refs/heads/dual Commit: 55ee96879f92c27598ef74a6a329d7af8bddbd75 Parents: dd69be2 Author: Alex Harui <[email protected]> Authored: Sat Jan 28 22:28:54 2017 -0800 Committer: Alex Harui <[email protected]> Committed: Sat Jan 28 22:28:54 2017 -0800 ---------------------------------------------------------------------- .../apache/flex/compiler/internal/projects/FlexProject.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/55ee9687/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java index 602de21..9721d2a 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java @@ -2129,12 +2129,13 @@ public class FlexProject extends ASProject implements IFlexProject thisPackage = scopeDef.getPackageName(); else { - if (scope instanceof PackageScope) - thisPackage = ((PackageScope)scope).getDefinition().getBaseName(); - else + while (!(scope instanceof PackageScope)) { - return null; + scope = scope.getContainingScope(); } + if (!(scope instanceof PackageScope)) + return null; + thisPackage = ((PackageScope)scope).getDefinition().getBaseName(); } String package1 = def1.getPackageName(); String package2 = def2.getPackageName();
