Clean up GenerationState constructor usages
This commit is contained in:
@@ -20,8 +20,6 @@ import com.intellij.openapi.project.Project;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.kotlin.analyzer.AnalysisResult;
|
import org.jetbrains.kotlin.analyzer.AnalysisResult;
|
||||||
import org.jetbrains.kotlin.codegen.state.GenerationState;
|
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.psi.JetFile;
|
||||||
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
|
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
|
||||||
|
|
||||||
@@ -61,8 +59,9 @@ public class GenerationUtils {
|
|||||||
GenerationState state = new GenerationState(
|
GenerationState state = new GenerationState(
|
||||||
project, ClassBuilderFactories.TEST,
|
project, ClassBuilderFactories.TEST,
|
||||||
analysisResult.getModuleDescriptor(), analysisResult.getBindingContext(),
|
analysisResult.getModuleDescriptor(), analysisResult.getBindingContext(),
|
||||||
files, false, false, GenerationState.GenerateClassFilter.GENERATE_ALL,
|
files,
|
||||||
false, false, Collections.<FqName>emptySet(), null, DiagnosticSink.DO_NOTHING, null
|
/* disableCallAssertions = */ false,
|
||||||
|
/* disableParamAssertions = */ false
|
||||||
);
|
);
|
||||||
KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION);
|
KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION);
|
||||||
return state;
|
return state;
|
||||||
|
|||||||
@@ -50,10 +50,8 @@ import org.jetbrains.eval4j.jdi.makeInitialFrame
|
|||||||
import org.jetbrains.kotlin.codegen.*
|
import org.jetbrains.kotlin.codegen.*
|
||||||
import org.jetbrains.kotlin.codegen.binding.CodegenBinding
|
import org.jetbrains.kotlin.codegen.binding.CodegenBinding
|
||||||
import org.jetbrains.kotlin.codegen.state.GenerationState
|
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.ClassDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
|
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
|
||||||
import org.jetbrains.kotlin.diagnostics.DiagnosticSink
|
|
||||||
import org.jetbrains.kotlin.diagnostics.Severity
|
import org.jetbrains.kotlin.diagnostics.Severity
|
||||||
import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
|
import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
|
||||||
import org.jetbrains.kotlin.idea.JetLanguage
|
import org.jetbrains.kotlin.idea.JetLanguage
|
||||||
@@ -367,12 +365,7 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
|
|||||||
moduleDescriptor,
|
moduleDescriptor,
|
||||||
bindingContext,
|
bindingContext,
|
||||||
files,
|
files,
|
||||||
true, true,
|
generateDeclaredClassFilter = generateClassFilter)
|
||||||
generateClassFilter,
|
|
||||||
false, false,
|
|
||||||
emptySet(), null,
|
|
||||||
DiagnosticSink.DO_NOTHING,
|
|
||||||
null)
|
|
||||||
|
|
||||||
val frameVisitor = FrameVisitor(context)
|
val frameVisitor = FrameVisitor(context)
|
||||||
|
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
|
|||||||
toProcess, !enableAssertions, !enableAssertions,
|
toProcess, !enableAssertions, !enableAssertions,
|
||||||
generateClassFilter,
|
generateClassFilter,
|
||||||
!enableInline, !enableOptimization, Collections.<FqName>emptySet(), null,
|
!enableInline, !enableOptimization, Collections.<FqName>emptySet(), null,
|
||||||
sink, null);
|
sink);
|
||||||
KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION);
|
KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION);
|
||||||
}
|
}
|
||||||
catch (ProcessCanceledException e) {
|
catch (ProcessCanceledException e) {
|
||||||
|
|||||||
+3
-9
@@ -46,15 +46,9 @@ public class StubProducerExtension(val stubsOutputDir: File) : AnalysisCompleted
|
|||||||
module,
|
module,
|
||||||
bindingContext,
|
bindingContext,
|
||||||
files.toArrayList(),
|
files.toArrayList(),
|
||||||
/*disableCallAssertions =*/ false,
|
disableCallAssertions = false,
|
||||||
/*disableParamAssertions =*/ false,
|
disableParamAssertions = false,
|
||||||
GenerationState.GenerateClassFilter.GENERATE_ALL,
|
diagnostics = forExtraDiagnostics)
|
||||||
/*disableInline =*/ false,
|
|
||||||
/*disableOptimization =*/ false,
|
|
||||||
/*packagesWithObsoleteParts =*/ emptySet(),
|
|
||||||
/*moduleId =*/ null,
|
|
||||||
forExtraDiagnostics,
|
|
||||||
/*outDirectory =*/ null)
|
|
||||||
|
|
||||||
KotlinCodegenFacade.compileCorrectFiles(generationState, CompilationErrorHandler.THROW_EXCEPTION)
|
KotlinCodegenFacade.compileCorrectFiles(generationState, CompilationErrorHandler.THROW_EXCEPTION)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user