From f80619e4e9edda1b481c17b651e1940167b48dc1 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 4 Jun 2014 17:49:32 +0400 Subject: [PATCH] Ability to generate light classes for scripts --- .../jetbrains/jet/codegen/KotlinCodegenFacade.java | 13 +++++++++---- .../jet/asJava/KotlinJavaFileStubProvider.java | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java b/compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java index d21e68470be..00f6d17d3a1 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java @@ -33,10 +33,8 @@ import java.util.Set; import static org.jetbrains.jet.codegen.binding.CodegenBinding.registerClassNameForScript; public class KotlinCodegenFacade { - public static void compileCorrectFiles( - @NotNull GenerationState state, - @NotNull CompilationErrorHandler errorHandler - ) { + + public static void prepareForCompilation(@NotNull GenerationState state) { for (JetFile file : state.getFiles()) { if (file.isScript()) { // SCRIPT: register class name for scripting from this file, move outside of this function @@ -50,6 +48,13 @@ public class KotlinCodegenFacade { } state.beforeCompile(); + } + + public static void compileCorrectFiles( + @NotNull GenerationState state, + @NotNull CompilationErrorHandler errorHandler + ) { + prepareForCompilation(state); MultiMap packageFqNameToFiles = new MultiMap(); for (JetFile file : state.getFiles()) { diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java index e3ce17134f7..d8c2ebbbb57 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java @@ -42,6 +42,7 @@ import com.intellij.util.containers.Stack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.codegen.CompilationErrorHandler; +import org.jetbrains.jet.codegen.KotlinCodegenFacade; import org.jetbrains.jet.codegen.PackageCodegen; import org.jetbrains.jet.codegen.binding.CodegenBinding; import org.jetbrains.jet.codegen.state.GenerationState; @@ -293,7 +294,7 @@ public class KotlinJavaFileStubProvider