Move property declaration to constructor

compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt

@@ -48,7 +48,7 @@ public class GenerationState(
         public val generateDeclaredClassFilter: GenerationState.GenerateClassFilter,
         private val disableInline: Boolean,
         disableOptimization: Boolean,
-        packagesWithObsoleteParts: Collection<FqName>?,
+        public val packagesWithObsoleteParts: Collection<FqName> = emptySet(),
         // for PackageCodegen in incremental compilation mode
         public val moduleId: String?,
         public val diagnostics: DiagnosticSink,
@@ -87,7 +87,6 @@ public class GenerationState(
     public var earlierScriptsForReplInterpreter: List<ScriptDescriptor>? = null
     public val reflectionTypes: ReflectionTypes
     public val jvmRuntimeTypes: JvmRuntimeTypes
-    public val packagesWithObsoleteParts: Collection<FqName>
     private val interceptedBuilderFactory: ClassBuilderFactory
 
     public constructor(
@@ -96,12 +95,11 @@ public class GenerationState(
             module: ModuleDescriptor,
             bindingContext: BindingContext,
             files: List<JetFile>) : this(project, builderFactory, Progress.DEAF, module, bindingContext, files, true, true, GenerateClassFilter.GENERATE_ALL,
-                                         false, false, null, null, DiagnosticSink.DO_NOTHING, null) {
+                                         false, false, emptySet(), null, DiagnosticSink.DO_NOTHING, null) {
     }
 
     init {
         var builderFactory = builderFactory
-        this.packagesWithObsoleteParts = packagesWithObsoleteParts ?: emptySet<FqName>()
         this.classBuilderMode = builderFactory.getClassBuilderMode()
 
         this.bindingTrace = DelegatingBindingTrace(bindingContext, "trace in GenerationState")

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java

@@ -64,10 +64,7 @@ import org.jetbrains.kotlin.utils.KotlinPaths;
 import java.io.File;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Collection;
+import java.util.*;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.*;
@@ -366,7 +363,7 @@ public class KotlinToJVMBytecodeCompiler {
 
         Collection<FqName> packagesWithObsoleteParts;
         if (moduleId == null || incrementalCompilationComponents == null) {
-            packagesWithObsoleteParts = null;
+            packagesWithObsoleteParts = Collections.emptySet();
         }
         else {
             IncrementalCache incrementalCache = incrementalCompilationComponents.getIncrementalCache(moduleId);

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java

@@ -340,7 +340,7 @@ public class KotlinJavaFileStubProvider<T extends WithFileStubAndExtraDiagnostic
                     /*generateClassFilter=*/stubGenerationStrategy.getGenerateClassFilter(),
                     /*disableInline=*/false,
                     /*disableOptimization=*/false,
-                    null,
+                    Collections.<FqName>emptySet(),
                     null,
                     forExtraDiagnostics,
                     null

compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java

@@ -28,6 +28,7 @@ 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;
 import org.jetbrains.kotlin.resolve.BindingTraceContext;
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
@@ -66,7 +67,7 @@ public class CodegenTestUtil {
                 GenerationState.GenerateClassFilter.GENERATE_ALL,
                 configuration.get(JVMConfigurationKeys.DISABLE_INLINE, false),
                 configuration.get(JVMConfigurationKeys.DISABLE_OPTIMIZATION, false),
-                null,
+                Collections.<FqName>emptySet(),
                 null,
                 forExtraDiagnostics,
                 null

compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java

@@ -22,6 +22,7 @@ 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;
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
 
@@ -62,7 +63,7 @@ public class GenerationUtils {
                 project, ClassBuilderFactories.TEST, Progress.DEAF,
                 analysisResult.getModuleDescriptor(), analysisResult.getBindingContext(),
                 files, false, false, GenerationState.GenerateClassFilter.GENERATE_ALL,
-                false, false, null, null, DiagnosticSink.DO_NOTHING, null
+                false, false, Collections.<FqName>emptySet(), null, DiagnosticSink.DO_NOTHING, null
         );
         KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION);
         return state;

idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt

@@ -82,8 +82,7 @@ import org.jetbrains.kotlin.types.Flexibility
 import org.jetbrains.org.objectweb.asm.*
 import org.jetbrains.org.objectweb.asm.Opcodes.ASM5
 import org.jetbrains.org.objectweb.asm.tree.MethodNode
-import java.util.Collections
+import java.util.*
-import java.util.HashMap
 
 private val RECEIVER_NAME = "\$receiver"
 private val THIS_NAME = "this"
@@ -372,7 +371,7 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
                         true, true,
                         generateClassFilter,
                         false, false,
-                        null, null,
+                        emptySet(), null,
                         DiagnosticSink.DO_NOTHING,
                         null)
 

idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java

@@ -39,16 +39,16 @@ 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.descriptors.ModuleDescriptor;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.diagnostics.DiagnosticSink;
 import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages;
-import org.jetbrains.kotlin.idea.resolve.ResolutionFacade;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
+import org.jetbrains.kotlin.idea.resolve.ResolutionFacade;
 import org.jetbrains.kotlin.idea.util.DebuggerUtils;
 import org.jetbrains.kotlin.idea.util.InfinitePeriodicalTask;
 import org.jetbrains.kotlin.idea.util.LongRunningReadTask;
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil;
+import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.JetClassOrObject;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetScript;
@@ -237,7 +237,7 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
                                         resolutionFacade.getModuleDescriptor(), bindingContext,
                                         toProcess, !enableAssertions, !enableAssertions,
                                         generateClassFilter,
-                                        !enableInline, !enableOptimization, null, null,
+                                        !enableInline, !enableOptimization, Collections.<FqName>emptySet(), null,
                                         sink, null);
             KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION);
         }

plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/StubProducerExtension.kt

@@ -18,8 +18,6 @@ package org.jetbrains.kotlin.annotation
 
 import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.analyzer.AnalysisResult
-import org.jetbrains.kotlin.cli.common.CLICompiler
-import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.common.output.outputUtils.writeAllTo
 import org.jetbrains.kotlin.codegen.*
 import org.jetbrains.kotlin.codegen.state.GenerationState
@@ -55,7 +53,7 @@ public class StubProducerExtension(val stubsOutputDir: File) : AnalysisCompleted
                 GenerationState.GenerateClassFilter.GENERATE_ALL,
                 /*disableInline =*/ false,
                 /*disableOptimization =*/ false,
-                /*packagesWithObsoleteParts =*/ null,
+                /*packagesWithObsoleteParts =*/ emptySet(),
                 /*moduleId =*/ null,
                 forExtraDiagnostics,
                 /*outDirectory =*/ null)