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

Use getDebugText() in LazyImportScope

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-03-28 21:16:04 +04:00
parent 15574a2026
commit 0a576995c7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java
+6 -2
View File
@@ -28,7 +28,11 @@ import org.jetbrains.jet.lang.psi.JetCodeFragment;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetImportDirective; import org.jetbrains.jet.lang.psi.JetImportDirective;
import org.jetbrains.jet.lang.psi.JetImportList; 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.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.*; import org.jetbrains.jet.lang.resolve.scopes.*;
import org.jetbrains.jet.storage.MemoizedFunctionToNotNull; import org.jetbrains.jet.storage.MemoizedFunctionToNotNull;
@@ -87,7 +91,7 @@ public class LazyImportScope implements JetScope, LazyEntity {
WritableScope directiveImportScope = new WritableScopeImpl( WritableScope directiveImportScope = new WritableScopeImpl(
JetScope.EMPTY, packageDescriptor, RedeclarationHandler.DO_NOTHING, 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); directiveImportScope.changeLockLevel(WritableScope.LockLevel.BOTH);
Importer.StandardImporter importer = new Importer.StandardImporter(directiveImportScope); Importer.StandardImporter importer = new Importer.StandardImporter(directiveImportScope);