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

Variable renames

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-01-14 21:18:13 +03:00
parent b888ea601c
commit 0c74f1679b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/ImportsResolver.java
+7 -7
View File
@@ -170,12 +170,12 @@ public class ImportsResolver {
public static void reportUselessImport( public static void reportUselessImport(
@NotNull JetImportDirective importDirective, @NotNull JetImportDirective importDirective,
@NotNull JetScope fileScope, @NotNull JetScope fileScope,
@Nullable Collection<? extends DeclarationDescriptor> resolvedDirectives, @Nullable Collection<? extends DeclarationDescriptor> resolvedTo,
@NotNull BindingTrace trace @NotNull BindingTrace trace
) { ) {
JetExpression importedReference = importDirective.getImportedReference(); JetExpression importedReference = importDirective.getImportedReference();
if (importedReference == null || resolvedDirectives == null) { if (importedReference == null || resolvedTo == null) {
return; return;
} }
Name aliasName = JetPsiUtil.getAliasName(importDirective); Name aliasName = JetPsiUtil.getAliasName(importDirective);
@@ -184,18 +184,18 @@ public class ImportsResolver {
} }
boolean uselessHiddenImport = true; boolean uselessHiddenImport = true;
for (DeclarationDescriptor wasResolved : resolvedDirectives) { for (DeclarationDescriptor target : resolvedTo) {
DeclarationDescriptor isResolved = null; DeclarationDescriptor isResolved = null;
if (wasResolved instanceof ClassDescriptor) { if (target instanceof ClassDescriptor) {
isResolved = fileScope.getClassifier(aliasName); isResolved = fileScope.getClassifier(aliasName);
} }
else if (wasResolved instanceof VariableDescriptor) { else if (target instanceof VariableDescriptor) {
isResolved = fileScope.getLocalVariable(aliasName); isResolved = fileScope.getLocalVariable(aliasName);
} }
else if (wasResolved instanceof PackageViewDescriptor) { else if (target instanceof PackageViewDescriptor) {
isResolved = fileScope.getPackage(aliasName); isResolved = fileScope.getPackage(aliasName);
} }
if (isResolved == null || isResolved.equals(wasResolved)) { if (isResolved == null || isResolved.equals(target)) {
uselessHiddenImport = false; uselessHiddenImport = false;
} }
} }