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/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java
+1 -1
View File
@@ -61,7 +61,7 @@ public abstract class AbstractLazyResolveDescriptorRendererTest extends KotlinTe
psiFile.accept(new JetVisitorVoid() {
@Override
public void visitJetFile(@NotNull JetFile file) {
FqName fqName = file.getNamespaceHeader().getFqName();
FqName fqName = file.getPackageDirective().getFqName();
if (!fqName.isRoot()) {
PackageViewDescriptor packageDescriptor = lazyModule.getPackage(fqName);
descriptors.add(packageDescriptor);
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java
+4 -4
View File
@@ -31,7 +31,7 @@ import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetNamespaceHeader;
import org.jetbrains.jet.lang.psi.JetPackageDirective;
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import org.jetbrains.jet.lang.resolve.BindingTrace;
@@ -93,9 +93,9 @@ public class LazyResolveTestUtil {
public static Set<Name> getTopLevelPackagesFromFileList(@NotNull List<JetFile> files) {
Set<Name> shortNames = Sets.newLinkedHashSet();
for (JetFile file : files) {
JetNamespaceHeader header = file.getNamespaceHeader();
if (header != null) {
List<JetSimpleNameExpression> names = header.getNamespaceNames();
JetPackageDirective directive = file.getPackageDirective();
if (directive != null) {
List<JetSimpleNameExpression> names = directive.getPackageNames();
Name name = names.isEmpty() ? SpecialNames.ROOT_PACKAGE : names.get(0).getReferencedNameAsName();
shortNames.add(name);
}
compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class DescriptorRendererTest extends JetLiteFixture {
final BindingContext bindingContext = analyzeExhaust.getBindingContext();
final List<DeclarationDescriptor> descriptors = new ArrayList<DeclarationDescriptor>();
FqName fqName = psiFile.getNamespaceHeader().getFqName();
FqName fqName = psiFile.getPackageDirective().getFqName();
if (!fqName.isRoot()) {
PackageViewDescriptor packageDescriptor = analyzeExhaust.getModuleDescriptor().getPackage(fqName);
descriptors.add(packageDescriptor);
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();