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

Forbid nulls in getPackageNames() collection

Browse Source 
#KT-4666 Fixed
This commit is contained in:
Alexey Sedunov
2014-03-07 14:15:18 +04:00
parent 8b0e8ed398
commit 3cd1af3ba1
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPackageDirective.java
+11 -2
View File
@@ -50,10 +50,19 @@ public class JetPackageDirective extends JetReferenceExpression {
List<JetSimpleNameExpression> packageNames = ContainerUtil.newArrayList();
while (nameExpression instanceof JetQualifiedExpression) {
JetQualifiedExpression qualifiedExpression = (JetQualifiedExpression) nameExpression;
packageNames.add((JetSimpleNameExpression) qualifiedExpression.getSelectorExpression());
JetExpression selector = qualifiedExpression.getSelectorExpression();
if (selector instanceof JetSimpleNameExpression) {
packageNames.add((JetSimpleNameExpression) selector);
}
nameExpression = qualifiedExpression.getReceiverExpression();
}
packageNames.add((JetSimpleNameExpression) nameExpression);
if (nameExpression instanceof JetSimpleNameExpression) {
packageNames.add((JetSimpleNameExpression) nameExpression);
}
Collections.reverse(packageNames);
return packageNames;