From 0d10f0fcf94b7aa0d9b21f8989781053974ca6e7 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 20 Nov 2015 20:41:51 +0300 Subject: [PATCH] Minor: Remove direct usages of ScriptNameUtil --- .../cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java | 8 +++++--- .../kotlin/resolve/lazy/data/JetScriptInfo.kt | 5 +---- .../AbstractPsiBasedDeclarationProvider.kt | 10 +++++----- .../lazy/descriptors/AbstractLazyMemberScope.kt | 3 +-- .../kotlin/codegen/AbstractScriptCodegenTest.java | 3 +-- idea/src/META-INF/plugin.xml | 4 ++-- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index 73514554888..a31b99ceafe 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -56,13 +56,13 @@ import org.jetbrains.kotlin.modules.TargetIdKt; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus; import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.resolve.*; +import org.jetbrains.kotlin.psi.KtScript; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.kotlin.script.AnalyzerScriptParameter; import org.jetbrains.kotlin.script.KotlinScriptDefinition; import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider; -import org.jetbrains.kotlin.script.ScriptNameUtil; import org.jetbrains.kotlin.util.PerformanceCounter; import org.jetbrains.kotlin.utils.KotlinPaths; @@ -296,7 +296,9 @@ public class KotlinToJVMBytecodeCompiler { new URLClassLoader(classPaths.toArray(new URL[classPaths.size()]), null) ); - FqName nameForScript = ScriptNameUtil.classNameForScript(environment.getSourceFiles().get(0).getScript()); + KtScript script = environment.getSourceFiles().get(0).getScript(); + assert script != null : "Script must be parsed"; + FqName nameForScript = script.getFqName(); return classLoader.loadClass(nameForScript.asString()); } catch (Exception e) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt index 58ed5f12819..6c6a6c1dc39 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt @@ -17,18 +17,15 @@ package org.jetbrains.kotlin.resolve.lazy.data import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtAnnotationEntry import org.jetbrains.kotlin.psi.KtObjectDeclaration import org.jetbrains.kotlin.psi.KtParameter import org.jetbrains.kotlin.psi.KtScript -import org.jetbrains.kotlin.script.ScriptNameUtil public class JetScriptInfo( val script: KtScript ) : JetClassLikeInfo { - public val fqName: FqName = ScriptNameUtil.classNameForScript(script) - override fun getContainingPackageFqName() = fqName.parent() + override fun getContainingPackageFqName() = script.fqName.parent() override fun getModifierList() = null override fun getCompanionObjects() = listOf() override fun getScopeAnchor() = script diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt index 96d1a78a27d..20be6b3aa57 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt @@ -17,16 +17,16 @@ package org.jetbrains.kotlin.resolve.lazy.declarations import com.google.common.collect.ArrayListMultimap +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils +import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils.safeNameForLazyResolve import org.jetbrains.kotlin.resolve.lazy.data.JetClassInfoUtil import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo import org.jetbrains.kotlin.resolve.lazy.data.JetScriptInfo -import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils.safeNameForLazyResolve -import java.util.ArrayList import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.storage.StorageManager +import java.util.* public abstract class AbstractPsiBasedDeclarationProvider(storageManager: StorageManager) : DeclarationProvider { @@ -52,7 +52,7 @@ public abstract class AbstractPsiBasedDeclarationProvider(storageManager: Storag } else if (declaration is KtScript) { val scriptInfo = JetScriptInfo(declaration) - classesAndObjects.put(scriptInfo.fqName.shortName(), scriptInfo) + classesAndObjects.put(scriptInfo.script.nameAsSafeName, scriptInfo) } else if (declaration is KtParameter || declaration is KtTypedef || declaration is KtMultiDeclaration) { // Do nothing, just put it into allDeclarations is enough diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index 9dc25b43576..a3937e41353 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -33,7 +33,6 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProvider import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl -import org.jetbrains.kotlin.script.ScriptNameUtil import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.utils.Printer @@ -155,7 +154,7 @@ protected constructor( } } else if (declaration is KtScript) { - val name = ScriptNameUtil.classNameForScript(declaration).shortName() + val name = declaration.nameAsSafeName if (nameFilter(name)) { result.addAll(classDescriptors(name)) } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java index 2f7deb8da62..2a6c39add68 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.codegen; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.script.ScriptNameUtil; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; @@ -37,7 +36,7 @@ public abstract class AbstractScriptCodegenTest extends CodegenTestCase { loadFileByFullPath(filename); try { - FqName fqName = ScriptNameUtil.classNameForScript(myFiles.getPsiFile().getScript()); + FqName fqName = myFiles.getPsiFile().getScript().getFqName(); Class scriptClass = generateClass(fqName.asString()); Constructor constructor = getTheOnlyConstructor(scriptClass); diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 5881a44746a..30629652201 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -227,8 +227,8 @@ - +