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

Extend logging for EA-35750

Browse Source
This commit is contained in:
Nikolay Krasko
2012-09-17 17:55:39 +04:00
parent db830c88b4
commit 01141cfb36
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
+3 -1
View File
@@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.lang.types.lang.JetStandardLibrary; import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
import org.jetbrains.jet.resolve.DescriptorRenderer;
import javax.inject.Inject; import javax.inject.Inject;
import java.util.*; import java.util.*;
@@ -302,7 +303,8 @@ public class DeclarationResolver {
if (descriptors.size() > 1) { if (descriptors.size() > 1) {
for (DeclarationDescriptor declarationDescriptor : descriptors) { for (DeclarationDescriptor declarationDescriptor : descriptors) {
for (PsiElement declaration : getDeclarationsByDescriptor(declarationDescriptor)) { for (PsiElement declaration : getDeclarationsByDescriptor(declarationDescriptor)) {
assert declaration != null; assert declaration != null : "Null declaration for descriptor: " + declarationDescriptor + " " +
(declarationDescriptor != null ? DescriptorRenderer.TEXT.render(declarationDescriptor) : "");
trace.report(REDECLARATION.on(declaration, declarationDescriptor.getName().getName())); trace.report(REDECLARATION.on(declaration, declarationDescriptor.getName().getName()));
} }
} }