From 0a11525dd5eed5c38602f696661e32c4fb6b5a79 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Mon, 31 Aug 2015 20:53:19 +0300
Subject: [PATCH] Clean up GenerationState constructor usages

---
 .../jetbrains/kotlin/codegen/GenerationUtils.java    |  7 +++----
 .../debugger/evaluate/KotlinEvaluationBuilder.kt     |  9 +--------
 .../idea/internal/KotlinBytecodeToolWindow.java      |  2 +-
 .../kotlin/annotation/StubProducerExtension.kt       | 12 +++---------
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java
index 97c14cfcf1d..3a7ccebb0eb 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java
@@ -20,8 +20,6 @@ import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.analyzer.AnalysisResult;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
-import org.jetbrains.kotlin.diagnostics.DiagnosticSink;
-import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
 
@@ -61,8 +59,9 @@ public class GenerationUtils {
         GenerationState state = new GenerationState(
                 project, ClassBuilderFactories.TEST,
                 analysisResult.getModuleDescriptor(), analysisResult.getBindingContext(),
-                files, false, false, GenerationState.GenerateClassFilter.GENERATE_ALL,
-                false, false, Collections.<FqName>emptySet(), null, DiagnosticSink.DO_NOTHING, null
+                files,
+                /* disableCallAssertions = */ false,
+                /* disableParamAssertions = */ false
         );
         KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION);
         return state;
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
index 4577b633c23..784ed892989 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
@@ -50,10 +50,8 @@ import org.jetbrains.eval4j.jdi.makeInitialFrame
 import org.jetbrains.kotlin.codegen.*
 import org.jetbrains.kotlin.codegen.binding.CodegenBinding
 import org.jetbrains.kotlin.codegen.state.GenerationState
-import org.jetbrains.kotlin.codegen.state.Progress
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.diagnostics.DiagnosticSink
 import org.jetbrains.kotlin.diagnostics.Severity
 import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
 import org.jetbrains.kotlin.idea.JetLanguage
@@ -367,12 +365,7 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
                         moduleDescriptor,
                         bindingContext,
                         files,
-                        true, true,
-                        generateClassFilter,
-                        false, false,
-                        emptySet(), null,
-                        DiagnosticSink.DO_NOTHING,
-                        null)
+                        generateDeclaredClassFilter = generateClassFilter)
 
                 val frameVisitor = FrameVisitor(context)
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java
index 00425bd73b3..5a0f16df014 100644
--- a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java
+++ b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java
@@ -237,7 +237,7 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
                                         toProcess, !enableAssertions, !enableAssertions,
                                         generateClassFilter,
                                         !enableInline, !enableOptimization, Collections.<FqName>emptySet(), null,
-                                        sink, null);
+                                        sink);
             KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION);
         }
         catch (ProcessCanceledException e) {
diff --git a/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/StubProducerExtension.kt b/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/StubProducerExtension.kt
index f2b78eceb2d..6f0a9f8c43c 100644
--- a/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/StubProducerExtension.kt
+++ b/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/StubProducerExtension.kt
@@ -46,15 +46,9 @@ public class StubProducerExtension(val stubsOutputDir: File) : AnalysisCompleted
                 module,
                 bindingContext,
                 files.toArrayList(),
-                /*disableCallAssertions =*/ false,
-                /*disableParamAssertions =*/ false,
-                GenerationState.GenerateClassFilter.GENERATE_ALL,
-                /*disableInline =*/ false,
-                /*disableOptimization =*/ false,
-                /*packagesWithObsoleteParts =*/ emptySet(),
-                /*moduleId =*/ null,
-                forExtraDiagnostics,
-                /*outDirectory =*/ null)
+                disableCallAssertions = false,
+                disableParamAssertions = false,
+                diagnostics = forExtraDiagnostics)
 
         KotlinCodegenFacade.compileCorrectFiles(generationState, CompilationErrorHandler.THROW_EXCEPTION)