azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JetNamespaceHeader → JetPackageDirective.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-01-10 18:20:42 +04:00
parent 25c65173f2
commit 791b5bb84c
188 changed files with 256 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java
+5 -5
View File
@@ -178,8 +178,8 @@ public abstract class ExpectedResolveData {
else {
ancestorOfType = getAncestorOfType(JetDeclaration.class, element);
if (ancestorOfType == null) {
JetNamespaceHeader header = getAncestorOfType(JetNamespaceHeader.class, element);
assert header != null : "Not a declaration: " + name;
JetPackageDirective directive = getAncestorOfType(JetPackageDirective.class, element);
assert directive != null : "Not a declaration: " + name;
ancestorOfType = element;
}
}
@@ -262,10 +262,10 @@ public abstract class ExpectedResolveData {
assert expected != null : "No declaration for " + name;
if (referenceTarget instanceof PackageViewDescriptor) {
JetNamespaceHeader expectedHeader = PsiTreeUtil.getParentOfType(expected, JetNamespaceHeader.class);
JetPackageDirective expectedDirective = PsiTreeUtil.getParentOfType(expected, JetPackageDirective.class);
FqName expectedFqName;
if (expectedHeader != null) {
expectedFqName = expectedHeader.getFqName();
if (expectedDirective != null) {
expectedFqName = expectedDirective.getFqName();
}
else if (expected instanceof PsiQualifiedNamedElement) {
String qualifiedName = ((PsiQualifiedNamedElement) expected).getQualifiedName();