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

Minor: Remove direct usages of ScriptNameUtil

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-11-20 20:41:51 +03:00
parent 7956ebe46c
commit 0d10f0fcf9
6 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+5 -3
View File
@@ -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) {