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

Make "progress" parameter with last in GenerationState constructor

Browse Source 
This parameter has a default value, so it's more convenient to have it
closer to the end of parameter list.
This commit is contained in:
Alexey Tsvetkov
2015-07-17 13:41:15 +03:00
parent 79f450e174
commit 1e964c6302
8 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+2 -2
View File
@@ -39,7 +39,6 @@ import java.io.File
public class GenerationState jvmOverloads constructor(
public val project: Project,
builderFactory: ClassBuilderFactory,
public val progress: Progress = Progress.DEAF,
public val module: ModuleDescriptor,
bindingContext: BindingContext,
public val files: List<JetFile>,
@@ -53,7 +52,8 @@ public class GenerationState jvmOverloads constructor(
public val moduleId: String? = null,
public val diagnostics: DiagnosticSink = DiagnosticSink.DO_NOTHING,
// TODO: temporary hack, see JetTypeMapperWithOutDirectory state for details
public val outDirectory: File? = null
public val outDirectory: File? = null,
public val progress: Progress = Progress.DEAF
) {
public interface GenerateClassFilter {
public fun shouldAnnotateClass(classOrObject: JetClassOrObject): Boolean
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+1 -3
View File
@@ -40,10 +40,8 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler;
import org.jetbrains.kotlin.cli.jvm.config.JVMConfigurationKeys;
import org.jetbrains.kotlin.codegen.*;
import org.jetbrains.kotlin.codegen.state.GenerationState;
import org.jetbrains.kotlin.codegen.state.Progress;
import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.context.ModuleContext;
import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus;
import org.jetbrains.kotlin.idea.MainFunctionDetector;
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache;
@@ -51,6 +49,7 @@ import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompil
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.parsing.JetScriptDefinition;
import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter;
import org.jetbrains.kotlin.resolve.BindingTrace;
@@ -376,7 +375,6 @@ public class KotlinToJVMBytecodeCompiler {
GenerationState generationState = new GenerationState(
environment.getProject(),
ClassBuilderFactories.BINARIES,
Progress.DEAF,
result.getModuleDescriptor(),
result.getBindingContext(),
sourceFiles,
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java
-2
View File
@@ -45,7 +45,6 @@ import org.jetbrains.kotlin.codegen.KotlinCodegenFacade;
import org.jetbrains.kotlin.codegen.PackageCodegen;
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.name.FqName;
import org.jetbrains.kotlin.psi.JetClassOrObject;
@@ -332,7 +331,6 @@ public class KotlinJavaFileStubProvider<T extends WithFileStubAndExtraDiagnostic
GenerationState state = new GenerationState(
project,
new KotlinLightClassBuilderFactory(stubStack),
Progress.DEAF,
context.getModule(),
context.getBindingContext(),
Lists.newArrayList(files),
compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
+1 -2
View File
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
import org.jetbrains.kotlin.cli.jvm.config.JVMConfigurationKeys;
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
import org.jetbrains.kotlin.codegen.state.GenerationState;
import org.jetbrains.kotlin.codegen.state.Progress;
import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.resolve.AnalyzingUtils;
@@ -60,7 +59,7 @@ public class CodegenTestUtil {
CompilerConfiguration configuration = environment.getConfiguration();
BindingTraceContext forExtraDiagnostics = new BindingTraceContext();
GenerationState state = new GenerationState(
environment.getProject(), ClassBuilderFactories.TEST, Progress.DEAF,
environment.getProject(), ClassBuilderFactories.TEST,
analysisResult.getModuleDescriptor(), analysisResult.getBindingContext(), files.getPsiFiles(),
configuration.get(JVMConfigurationKeys.DISABLE_CALL_ASSERTIONS, false),
configuration.get(JVMConfigurationKeys.DISABLE_PARAM_ASSERTIONS, false),
compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java
+1 -2
View File
@@ -20,7 +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.codegen.state.Progress;
import org.jetbrains.kotlin.diagnostics.DiagnosticSink;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.JetFile;
@@ -60,7 +59,7 @@ public class GenerationUtils {
) {
analysisResult.throwIfError();
GenerationState state = new GenerationState(
project, ClassBuilderFactories.TEST, Progress.DEAF,
project, ClassBuilderFactories.TEST,
analysisResult.getModuleDescriptor(), analysisResult.getBindingContext(),
files, false, false, GenerationState.GenerateClassFilter.GENERATE_ALL,
false, false, Collections.<FqName>emptySet(), null, DiagnosticSink.DO_NOTHING, null
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
-1
View File
@@ -364,7 +364,6 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
val state = GenerationState(
jetFile.project,
ClassBuilderFactories.BINARIES,
Progress.DEAF,
moduleDescriptor,
bindingContext,
files,
idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java
+1 -2
View File
@@ -38,7 +38,6 @@ import org.jetbrains.kotlin.codegen.ClassBuilderFactories;
import org.jetbrains.kotlin.codegen.CompilationErrorHandler;
import org.jetbrains.kotlin.codegen.KotlinCodegenFacade;
import org.jetbrains.kotlin.codegen.state.GenerationState;
import org.jetbrains.kotlin.codegen.state.Progress;
import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.diagnostics.DiagnosticSink;
import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages;
@@ -233,7 +232,7 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
}
};
state = new GenerationState(jetFile.getProject(), ClassBuilderFactories.TEST, Progress.DEAF,
state = new GenerationState(jetFile.getProject(), ClassBuilderFactories.TEST,
resolutionFacade.getModuleDescriptor(), bindingContext,
toProcess, !enableAssertions, !enableAssertions,
generateClassFilter,
plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/StubProducerExtension.kt
-2
View File
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.analyzer.AnalysisResult
import org.jetbrains.kotlin.cli.common.output.outputUtils.writeAllTo
import org.jetbrains.kotlin.codegen.*
import org.jetbrains.kotlin.codegen.state.GenerationState
import org.jetbrains.kotlin.codegen.state.Progress
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.resolve.BindingContext
@@ -44,7 +43,6 @@ public class StubProducerExtension(val stubsOutputDir: File) : AnalysisCompleted
val generationState = GenerationState(
project,
StubClassBuilderFactory(),
Progress.DEAF,
module,
bindingContext,
files.toArrayList(),