From 0a576995c7acb29ac1c6f318d57ee955f2f63238 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 28 Mar 2014 21:16:04 +0400 Subject: [PATCH] Use getDebugText() in LazyImportScope --- .../jetbrains/jet/lang/resolve/lazy/LazyImportScope.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java index 41a34ae2d0e..821590bfdca 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java @@ -28,7 +28,11 @@ import org.jetbrains.jet.lang.psi.JetCodeFragment; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetImportDirective; import org.jetbrains.jet.lang.psi.JetImportList; -import org.jetbrains.jet.lang.resolve.*; +import org.jetbrains.jet.lang.psi.debugText.DebugTextPackage; +import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.jet.lang.resolve.Importer; +import org.jetbrains.jet.lang.resolve.ImportsResolver; +import org.jetbrains.jet.lang.resolve.JetModuleUtil; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.*; import org.jetbrains.jet.storage.MemoizedFunctionToNotNull; @@ -87,7 +91,7 @@ public class LazyImportScope implements JetScope, LazyEntity { WritableScope directiveImportScope = new WritableScopeImpl( JetScope.EMPTY, packageDescriptor, RedeclarationHandler.DO_NOTHING, - "Scope for import '" + directive.getText() + "' resolve in " + toString()); + "Scope for import '" + DebugTextPackage.getDebugText(directive) + "' resolve in " + toString()); directiveImportScope.changeLockLevel(WritableScope.LockLevel.BOTH); Importer.StandardImporter importer = new Importer.StandardImporter(directiveImportScope);