J2K KotlinLightClassGeneration: rewrite

Author: zarechenskiy

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/asJava/KotlinLightClassGeneration.kt

@@ -1,54 +1,36 @@
-package org.jetbrains.kotlin.core.asJava;
+package org.jetbrains.kotlin.core.asJava
 
-import java.util.List;
-import java.util.Set;
+import org.eclipse.core.resources.IFile
+import org.eclipse.core.runtime.CoreException
+import org.eclipse.jdt.core.IJavaProject
+import org.jetbrains.kotlin.analyzer.AnalysisResult
+import org.jetbrains.kotlin.codegen.CompilationErrorHandler
+import org.jetbrains.kotlin.codegen.KotlinCodegenFacade
+import org.jetbrains.kotlin.codegen.state.GenerationState
+import org.jetbrains.kotlin.core.filesystem.KotlinLightClassManager
+import org.jetbrains.kotlin.core.model.KotlinEnvironment
+import org.jetbrains.kotlin.core.model.KotlinJavaManager
+import org.jetbrains.kotlin.psi.KtFile
+import com.intellij.openapi.project.Project
 
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.analyzer.AnalysisResult;
-import org.jetbrains.kotlin.codegen.CompilationErrorHandler;
-import org.jetbrains.kotlin.codegen.KotlinCodegenFacade;
-import org.jetbrains.kotlin.codegen.state.GenerationState;
-import org.jetbrains.kotlin.core.filesystem.KotlinLightClassManager;
-import org.jetbrains.kotlin.core.model.KotlinEnvironment;
-import org.jetbrains.kotlin.core.model.KotlinJavaManager;
-import org.jetbrains.kotlin.psi.KtFile;
-
-import com.intellij.openapi.project.Project;
-
-public class KotlinLightClassGeneration {
-    
-    public static void updateLightClasses(
-            @NotNull IJavaProject javaProject,
-            @NotNull Set<IFile> affectedFiles) throws CoreException {
-        if (!KotlinJavaManager.INSTANCE.hasLinkedKotlinBinFolder(javaProject)) {
-            return;
-        }
+object KotlinLightClassGeneration {
+    fun updateLightClasses(javaProject: IJavaProject, affectedFiles: Set<IFile>) {
+        if (!KotlinJavaManager.hasLinkedKotlinBinFolder(javaProject)) return
 
-        KotlinLightClassManager.getInstance(javaProject).computeLightClassesSources();
-        KotlinLightClassManager.getInstance(javaProject).updateLightClasses(affectedFiles);
+        KotlinLightClassManager.getInstance(javaProject).computeLightClassesSources()
+        KotlinLightClassManager.getInstance(javaProject).updateLightClasses(affectedFiles)
     }
 
-    public static GenerationState buildLightClasses(@NotNull AnalysisResult analysisResult, @NotNull IJavaProject javaProject, 
-            @NotNull List<KtFile> jetFiles) {
-        Project project = KotlinEnvironment.getEnvironment(javaProject).getProject();
-        
-        GenerationState state = new GenerationState(
-                project, 
-                new LightClassBuilderFactory(), 
-                analysisResult.getModuleDescriptor(),
-                analysisResult.getBindingContext(), 
-                jetFiles);
+    fun buildLightClasses(analysisResult: AnalysisResult, javaProject: IJavaProject, jetFiles: List<KtFile>) : GenerationState {
+        val state = GenerationState(
+                KotlinEnvironment.getEnvironment(javaProject).project,
+                LightClassBuilderFactory(),
+                analysisResult.moduleDescriptor,
+                analysisResult.bindingContext,
+                jetFiles)
 
-        KotlinCodegenFacade.compileCorrectFiles(state, new CompilationErrorHandler() {
-            @Override
-            public void reportException(Throwable exception, String fileUrl) {
-                // skip
-            }
-        });
+        KotlinCodegenFacade.compileCorrectFiles(state) { exception, fileUrl -> Unit }
 
-        return state;
+        return state
     }
-}
+}

kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/builder/KotlinBuilder.kt

@@ -28,7 +28,6 @@ import org.eclipse.debug.core.model.LaunchConfigurationDelegate
 import org.eclipse.jdt.core.IJavaProject
 import org.eclipse.jdt.core.JavaCore
 import org.jetbrains.kotlin.analyzer.AnalysisResult
-import org.jetbrains.kotlin.core.asJava.KotlinLightClassGeneration
 import org.jetbrains.kotlin.core.builder.KotlinPsiManager
 import org.jetbrains.kotlin.core.compiler.KotlinCompiler.KotlinCompilerResult
 import org.jetbrains.kotlin.core.compiler.KotlinCompilerUtils
@@ -47,6 +46,7 @@ import org.eclipse.core.runtime.Status
 import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus
 import org.jetbrains.kotlin.progress.CompilationCanceledStatus
 import org.jetbrains.kotlin.progress.CompilationCanceledException
+import org.jetbrains.kotlin.core.asJava.KotlinLightClassGeneration
 
 class KotlinBuilder : IncrementalProjectBuilder() {
     override fun build(kind: Int, args: Map<String, String>?, monitor: IProgressMonitor?): Array<IProject>? {