From c5a81691fb96a4b461846ca7e97a3976695751e6 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Thu, 27 Jul 2017 14:38:01 +0300
Subject: [PATCH] Partial code cleanup: can be private and some others applied

---
 .../kotlin/ant/KotlinCompilerAdapter.kt       |  4 +-
 .../kotlin/codegen/DefaultCallArgs.kt         |  4 +-
 .../kotlin/codegen/InlineCycleReporter.kt     |  4 +-
 .../JvmStaticInCompanionObjectGenerator.kt    |  6 +-
 .../codegen/PropertyReferenceCodegen.kt       |  6 +-
 .../jetbrains/kotlin/codegen/StackValue.kt    |  2 +-
 .../context/DefaultImplsClassContext.kt       |  6 +-
 .../codegen/context/InlineLambdaContext.kt    |  4 +-
 .../inline/CoveringTryCatchNodeProcessor.kt   |  2 +-
 .../codegen/inline/DeferredMethodVisitor.kt   |  2 +-
 .../codegen/inline/InlinedLambdaRemapper.kt   |  2 +-
 .../kotlin/codegen/inline/LambdaInfo.kt       |  2 +-
 .../codegen/inline/ObjectTransformer.kt       |  2 +-
 .../codegen/inline/ReifiedTypeInliner.kt      |  6 +-
 .../jetbrains/kotlin/codegen/inline/SMAP.kt   |  8 +-
 .../codegen/inline/TransformationInfo.kt      |  2 +-
 .../kotlin/codegen/inline/TypeRemapper.kt     |  2 +-
 .../DeadCodeEliminationMethodTransformer.kt   |  2 +-
 .../optimization/boxing/BoxedBasicValue.kt    |  4 +-
 .../optimization/common/MethodAnalyzer.kt     |  2 +-
 .../fixStack/StackTransformationUtils.kt      |  2 +-
 .../transformer/CompositeMethodTransformer.kt |  2 +-
 .../cli/common/repl/AggregatedReplState.kt    |  7 +-
 .../repl/GenericReplCompilingEvaluator.kt     |  2 +-
 .../cli/common/repl/GenericReplEvaluator.kt   |  9 ++-
 .../jetbrains/kotlin/container/Container.kt   |  2 +-
 .../org/jetbrains/kotlin/container/Resolve.kt |  2 +-
 .../org/jetbrains/kotlin/container/Storage.kt |  2 +-
 .../impl/classFiles/BinaryJavaClass.kt        |  2 +-
 .../IncrementalPackageFragmentProvider.kt     |  2 +-
 .../checkers/JvmSimpleNameBacktickChecker.kt  |  2 +-
 ...inScriptDefinitionFromAnnotatedTemplate.kt |  2 +-
 .../kotlin/analyzer/AnalyzerFacade.kt         |  4 +-
 .../jumps/NondeterministicJumpInstruction.kt  |  2 +-
 .../jumps/ThrowExceptionInstruction.kt        |  2 +-
 .../jetbrains/kotlin/kdoc/psi/impl/KDocTag.kt |  2 +-
 .../org/jetbrains/kotlin/psi/userDataUtil.kt  |  6 +-
 .../kotlin/resolve/AnnotationChecker.kt       |  2 +-
 .../kotlin/resolve/ModifiersChecker.kt        |  4 +-
 .../resolve/calls/CallExpressionResolver.kt   |  2 +-
 .../resolve/calls/GenericCandidateResolver.kt |  2 +-
 .../calls/checkers/UnderscoreUsageChecker.kt  |  2 +-
 .../calls/smartcasts/SmartCastManager.kt      |  9 +--
 .../evaluate/ConstantExpressionEvaluator.kt   |  2 +-
 .../resolve/inline/InlineAnalyzerExtension.kt |  2 +-
 ...ombinedPackageMemberDeclarationProvider.kt |  4 +-
 .../descriptors/AbstractLazyMemberScope.kt    |  2 +-
 .../IncrementalJvmCompilerRunner.kt           |  2 +-
 .../backend/jvm/codegen/ClassCodegen.kt       | 12 ++-
 .../backend/jvm/codegen/FunctionCodegen.kt    |  2 +-
 .../jvm/descriptors/KnownDescriptors.kt       |  2 +-
 .../descriptors/SpecialDescriptorsFactory.kt  |  4 +-
 .../backend/jvm/lower/BridgeLowering.kt       |  2 +-
 .../jvm/lower/SyntheticAccessorLowering.kt    |  2 +-
 .../ir2cfg/generators/FunctionGenerator.kt    |  2 +-
 .../kotlin/psi2ir/PsiSourceManager.kt         |  4 +-
 .../psi2ir/generators/FunctionGenerator.kt    |  2 +-
 .../kotlin/ir/util/DeepCopySymbolsRemapper.kt |  2 +-
 .../jetbrains/kotlin/ir/util/DumpIrTree.kt    |  8 +-
 .../lazy/descriptors/DeclaredMemberIndex.kt   |  5 +-
 .../kotlin/descriptors/EffectiveVisibility.kt |  2 +-
 .../kotlin/renderer/ClassifierNamePolicy.kt   |  7 +-
 .../idea/caches/KotlinShortNamesCache.kt      |  4 +-
 .../resolve/IDELightClassGenerationSupport.kt |  2 +-
 .../idea/caches/resolve/ScriptModuleInfos.kt  |  7 +-
 .../classFile/KotlinClsStubBuilder.kt         |  2 +-
 .../inspections/IntentionBasedInspection.kt   |  2 +-
 .../SyntheticPropertyAccessorReference.kt     |  2 +-
 .../idea/search/PsiBasedClassResolver.kt      |  2 +-
 .../inspection/IllegalIdentifierInspection.kt |  4 +-
 .../idea/completion/KeywordCompletion.kt      | 16 ++--
 .../idea/completion/OperatorNameCompletion.kt |  2 +-
 .../completion/ReferenceVariantsCollector.kt  |  4 +-
 .../completion/ToFromOriginalFileMapper.kt    | 20 ++---
 .../kotlin/idea/completion/smart/Utils.kt     |  5 +-
 .../KotlinJsr223JvmScriptEngine4Idea.kt       |  2 +-
 .../idea/KotlinQuickDocumentationProvider.kt  |  2 +-
 .../SearchNotPropertyCandidatesAction.kt      |  2 +-
 .../copy/PlainTextPasteImportResolver.kt      |  6 +-
 .../debugger/DebuggerClassNameProvider.kt     |  2 +-
 .../debugger/InlineCallableUsagesSearcher.kt  |  5 +-
 .../breakpoints/KotlinFieldBreakpoint.kt      |  2 +-
 .../DelegatedPropertyFieldDescriptor.kt       |  2 +-
 ...otlinClassWithDelegatedPropertyRenderer.kt |  2 +-
 .../KotlinMultilineStringEnterHandler.kt      |  8 +-
 .../KotlinMissingForOrWhileBodyFixer.kt       |  2 +-
 .../fixers/KotlinMissingWhenBodyFixer.kt      |  2 +-
 .../idea/facet/KotlinFacetEditorGeneralTab.kt | 10 +--
 .../findUsages/KotlinUsageTypeProvider.kt     | 75 +++++++++----------
 .../idea/injection/KotlinLanguageInjector.kt  |  3 +-
 .../ConvertLambdaToReferenceIntention.kt      |  2 +-
 ...tPrimaryConstructorToSecondaryIntention.kt |  2 +-
 .../ConvertReferenceToLambdaIntention.kt      |  2 +-
 .../MovePropertyToClassBodyIntention.kt       | 12 +--
 .../MovePropertyToConstructorIntention.kt     |  2 +-
 .../UsePropertyAccessSyntaxIntention.kt       |  2 +-
 .../BranchedFoldingUtils.kt                   |  4 +-
 .../loopToCallChain/sequence/Condition.kt     |  2 +-
 .../internal/KotlinDecompilerServiceImpl.kt   |  4 +-
 .../kotlin/idea/kdoc/KDocRenderer.kt          |  8 +-
 .../kotlin/idea/quickfix/AddLoopLabelFix.kt   |  5 +-
 .../AddReifiedToTypeParameterOfFunctionFix.kt |  2 +-
 .../AddTypeAnnotationToValueParameterFix.kt   |  2 +-
 .../idea/quickfix/ChangeVisibilityFix.kt      |  4 +-
 .../CreateCallableFromUsageFix.kt             |  2 +-
 .../CreateCallableMemberFromUsageFactory.kt   |  2 +-
 .../createClass/CreateClassFromUsageFix.kt    |  5 +-
 .../CreateTypeAliasFromUsageFix.kt            |  2 +-
 .../ReplaceProtectedToPublishedApiCallFix.kt  |  2 +-
 .../changeSignature/KotlinChangeSignature.kt  | 14 ++--
 .../ui/KotlinChangePropertySignatureDialog.kt |  4 +-
 .../ui/KotlinChangeSignatureDialog.kt         |  2 +-
 .../usages/KotlinFunctionCallUsage.kt         |  2 +-
 .../KotlinExtractSuperHandlerBase.kt          |  2 +-
 .../ExtractKotlinFunctionHandler.kt           |  2 +-
 .../KotlinIntroduceParameterHandler.kt        |  2 +-
 .../IntroduceTypeAliasHandler.kt              |  2 +-
 .../KotlinIntroduceVariableHandler.kt         |  2 +-
 .../move/AutocreatingPsiDirectoryWrapper.kt   |  4 +-
 ...KotlinAwareMoveFilesOrDirectoriesDialog.kt |  2 +-
 .../kotlin/idea/refactoring/move/moveUtils.kt |  4 +-
 .../refactoring/pullUp/KotlinPullUpData.kt    |  2 +-
 .../pushDown/KotlinPushDownDialog.kt          |  2 +-
 .../rename/RenameKotlinPropertyProcessor.kt   |  2 +-
 .../kotlin/j2k/JavaToKotlinTranslator.kt      |  2 +-
 .../AnnotationCollectorExtension.kt           |  2 +-
 126 files changed, 270 insertions(+), 258 deletions(-)

diff --git a/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.kt b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.kt
index aa6b3e0faeb..89bc532d71b 100644
--- a/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.kt
+++ b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.kt
@@ -39,9 +39,7 @@ class KotlinCompilerAdapter : Javac13() {
         return argument
     }
 
-    override fun getSupportedFileExtensions(): Array<String> {
-        return super.getSupportedFileExtensions() + KOTLIN_EXTENSIONS
-    }
+    override fun getSupportedFileExtensions(): Array<String> = super.getSupportedFileExtensions() + KOTLIN_EXTENSIONS
 
     @Throws(BuildException::class)
     override fun execute(): Boolean {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultCallArgs.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultCallArgs.kt
index 26b5add025b..1d2ac95b713 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultCallArgs.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultCallArgs.kt
@@ -22,7 +22,7 @@ import java.util.*
 
 class DefaultCallArgs(val size: Int) {
 
-    val bits: BitSet = BitSet(size)
+    private val bits: BitSet = BitSet(size)
 
     fun mark(index: Int) {
         assert (index < size) {
@@ -39,7 +39,7 @@ class DefaultCallArgs(val size: Int) {
         val masks = ArrayList<Int>(1)
 
         var mask = 0
-        for (i in 0..size - 1) {
+        for (i in 0 until size) {
             if (i != 0 && i % Integer.SIZE == 0) {
                 masks.add(mask)
                 mask = 0
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/InlineCycleReporter.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/InlineCycleReporter.kt
index f11f31755f2..f061dce31d1 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/InlineCycleReporter.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/InlineCycleReporter.kt
@@ -23,9 +23,9 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticSink
 import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 
-class InlineCycleReporter(val diagnostics: DiagnosticSink) {
+class InlineCycleReporter(private val diagnostics: DiagnosticSink) {
 
-    val processingFunctions = linkedMapOf<PsiElement, CallableDescriptor>()
+    private val processingFunctions = linkedMapOf<PsiElement, CallableDescriptor>()
 
     fun enterIntoInlining(call: ResolvedCall<*>?): Boolean {
         //null call for default method inlining
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmStaticInCompanionObjectGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmStaticInCompanionObjectGenerator.kt
index 3cd59428508..fb6f3fbc2f5 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmStaticInCompanionObjectGenerator.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmStaticInCompanionObjectGenerator.kt
@@ -25,9 +25,9 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.Synthetic
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature
 
 class JvmStaticInCompanionObjectGenerator(
-        val descriptor: FunctionDescriptor,
-        val declarationOrigin: JvmDeclarationOrigin,
-        val state: GenerationState,
+        private val descriptor: FunctionDescriptor,
+        private val declarationOrigin: JvmDeclarationOrigin,
+        private val state: GenerationState,
         parentBodyCodegen: ImplementationBodyCodegen
 ) : Function2<ImplementationBodyCodegen, ClassBuilder, Unit> {
     private val typeMapper = state.typeMapper
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyReferenceCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyReferenceCodegen.kt
index fd186b74c0c..f270b7e14d1 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyReferenceCodegen.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyReferenceCodegen.kt
@@ -62,7 +62,7 @@ class PropertyReferenceCodegen(
 
     private val isLocalDelegatedProperty = target is LocalVariableDescriptor
 
-    val getFunction =
+    private val getFunction =
             if (isLocalDelegatedProperty)
                 (localVariableDescriptorForReference as VariableDescriptorWithAccessors).getter!!
             else
@@ -250,13 +250,13 @@ class PropertyReferenceCodegen(
 
     class PropertyReferenceGenerationStrategy(
             val isGetter: Boolean,
-            val originalFunctionDesc: FunctionDescriptor,
+            private val originalFunctionDesc: FunctionDescriptor,
             val target: VariableDescriptor,
             val asmType: Type,
             val receiverType: Type?,
             val expression: KtElement,
             state: GenerationState,
-            val isInliningStrategy: Boolean
+            private val isInliningStrategy: Boolean
     ) :
             FunctionGenerationStrategy.CodegenBased(state) {
         override fun doGenerateBody(codegen: ExpressionCodegen, signature: JvmMethodSignature) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.kt
index df4b15e872b..799b30efd49 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.kt
@@ -21,7 +21,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 
 class CoercionValue(
         val value: StackValue,
-        val castType: Type
+        private val castType: Type
 ) : StackValue(castType, value.canHaveSideEffects()) {
 
     override fun putSelector(type: Type, v: InstructionAdapter) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/DefaultImplsClassContext.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/DefaultImplsClassContext.kt
index a395941ca14..69cc02e57ef 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/DefaultImplsClassContext.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/DefaultImplsClassContext.kt
@@ -28,12 +28,10 @@ class DefaultImplsClassContext(
         contextKind: OwnerKind,
         parentContext: CodegenContext<*>?,
         localLookup: ((DeclarationDescriptor) -> Boolean)?,
-        val interfaceContext: ClassContext
+        private val interfaceContext: ClassContext
 ) : ClassContext(typeMapper, contextDescriptor, contextKind, parentContext, localLookup) {
 
-    override fun getCompanionObjectContext(): CodegenContext<*>? {
-        return interfaceContext.companionObjectContext
-    }
+    override fun getCompanionObjectContext(): CodegenContext<*>? = interfaceContext.companionObjectContext
 
     override fun getAccessors(): Collection<AccessorForCallableDescriptor<*>> {
         val accessors = super.getAccessors()
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/InlineLambdaContext.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/InlineLambdaContext.kt
index 934c636795b..b1bcb3a6168 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/InlineLambdaContext.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/InlineLambdaContext.kt
@@ -25,8 +25,8 @@ class InlineLambdaContext(
         contextKind: OwnerKind,
         parentContext: CodegenContext<*>,
         closure: MutableClosure?,
-        val isCrossInline: Boolean,
-        val isPropertyReference: Boolean
+        private val isCrossInline: Boolean,
+        private val isPropertyReference: Boolean
 ) : MethodContext(functionDescriptor, contextKind, parentContext, closure, false) {
 
     override fun getFirstCrossInlineOrNonInlineContext(): CodegenContext<*> {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt
index 7bcc88e3793..3b8c35147b2 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt
@@ -141,7 +141,7 @@ class IntervalMetaInfo<T : SplittableInterval<T>> {
         return splitPair
     }
 
-    fun getInterval(curIns: LabelNode, isOpen: Boolean) =
+    private fun getInterval(curIns: LabelNode, isOpen: Boolean) =
             if (isOpen) intervalStarts.get(curIns) else intervalEnds.get(curIns)
 }
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/DeferredMethodVisitor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/DeferredMethodVisitor.kt
index 3c34356cfd8..6ff841d43c2 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/DeferredMethodVisitor.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/DeferredMethodVisitor.kt
@@ -21,7 +21,7 @@ import org.jetbrains.org.objectweb.asm.tree.MethodNode
 
 class DeferredMethodVisitor(
         val intermediate: MethodNode,
-        val resultNode: () -> MethodVisitor
+        private val resultNode: () -> MethodVisitor
 ) : MethodVisitor(API, intermediate) {
 
     override fun visitEnd() {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlinedLambdaRemapper.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlinedLambdaRemapper.kt
index e130e176602..a8bfcd099e0 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlinedLambdaRemapper.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlinedLambdaRemapper.kt
@@ -24,7 +24,7 @@ class InlinedLambdaRemapper(
         originalLambdaInternalName: String,
         parent: FieldRemapper,
         methodParams: Parameters,
-        val isDefaultBoundCallableReference: Boolean
+        private val isDefaultBoundCallableReference: Boolean
 ) : FieldRemapper(originalLambdaInternalName, parent, methodParams) {
 
     public override fun canProcess(fieldOwner: String, fieldName: String, isFolding: Boolean) =
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.kt
index 0995b1a3d38..2f231263413 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.kt
@@ -84,7 +84,7 @@ abstract class LambdaInfo(@JvmField val isCrossInline: Boolean) : LabelOwner {
 
 class DefaultLambda(
         override val lambdaClassType: Type,
-        val capturedArgs: Array<Type>,
+        private val capturedArgs: Array<Type>,
         val parameterDescriptor: ValueParameterDescriptor,
         val offset: Int,
         val needReification: Boolean
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ObjectTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ObjectTransformer.kt
index 04dbc390942..b6ae7a4c404 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ObjectTransformer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ObjectTransformer.kt
@@ -53,7 +53,7 @@ abstract class ObjectTransformer<out T : TransformationInfo>(@JvmField val trans
 
 class WhenMappingTransformer(
         whenObjectRegenerationInfo: WhenMappingTransformationInfo,
-        val inliningContext: InliningContext
+        private val inliningContext: InliningContext
 ) : ObjectTransformer<WhenMappingTransformationInfo>(whenObjectRegenerationInfo, inliningContext.state) {
 
     override fun doTransform(parentRemapper: FieldRemapper): InlineResult {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt
index 7d97370fd22..d8a6c811ba3 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt
@@ -16,13 +16,11 @@
 
 package org.jetbrains.kotlin.codegen.inline
 
-import org.jetbrains.kotlin.codegen.AsmUtil
 import org.jetbrains.kotlin.codegen.context.MethodContext
 import org.jetbrains.kotlin.codegen.generateAsCast
 import org.jetbrains.kotlin.codegen.generateIsCheck
 import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods
 import org.jetbrains.kotlin.codegen.optimization.common.intConstant
-import org.jetbrains.kotlin.codegen.optimization.removeNodeGetNext
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.Variance
@@ -34,7 +32,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 import org.jetbrains.org.objectweb.asm.tree.*
 
 class ReificationArgument(
-        val parameterName: String, val nullable: Boolean, val arrayDepth: Int
+        val parameterName: String, val nullable: Boolean, private val arrayDepth: Int
 ) {
     fun asString() = "[".repeat(arrayDepth) + parameterName + (if (nullable) "?" else "")
     fun combine(replacement: ReificationArgument) =
@@ -302,7 +300,7 @@ class TypeParameterMapping(
 )
 
 class ReifiedTypeParametersUsages {
-    val usedTypeParameters: MutableSet<String> = hashSetOf()
+    private val usedTypeParameters: MutableSet<String> = hashSetOf()
 
     fun wereUsedReifiedParameters(): Boolean = usedTypeParameters.isNotEmpty()
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
index a27338ac41d..4f702d661c7 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
@@ -28,7 +28,7 @@ val KOTLIN_DEBUG_STRATA_NAME = "KotlinDebug"
 class SMAPBuilder(
         val source: String,
         val path: String,
-        val fileMappings: List<FileMapping>
+        private val fileMappings: List<FileMapping>
 ) {
     private val header = "SMAP\n$source\nKotlin"
 
@@ -91,9 +91,9 @@ open class NestedSourceMapper(
         override val parent: SourceMapper, val ranges: List<RangeMapping>, sourceInfo: SourceInfo
 ) : DefaultSourceMapper(sourceInfo) {
 
-    val visitedLines = TIntIntHashMap()
+    private val visitedLines = TIntIntHashMap()
 
-    var lastVisitedRange: RangeMapping? = null
+    private var lastVisitedRange: RangeMapping? = null
 
     override fun mapLineNumber(lineNumber: Int): Int {
         val mappedLineNumber = visitedLines.get(lineNumber)
@@ -115,7 +115,7 @@ open class NestedSourceMapper(
         }
     }
 
-    fun findMappingIfExists(lineNumber: Int): RangeMapping? {
+    private fun findMappingIfExists(lineNumber: Int): RangeMapping? {
         val index = ranges.binarySearch(RangeMapping(lineNumber, lineNumber, 1), Comparator {
             value, key ->
             if (key.dest in value) 0 else RangeMapping.Comparator.compare(value, key)
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TransformationInfo.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TransformationInfo.kt
index 740faddd7af..8e7775c39c3 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TransformationInfo.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TransformationInfo.kt
@@ -40,7 +40,7 @@ interface TransformationInfo {
 class WhenMappingTransformationInfo(
         override val oldClassName: String,
         parentNameGenerator: NameGenerator,
-        val alreadyRegenerated: Boolean,
+        private val alreadyRegenerated: Boolean,
         val fieldNode: FieldInsnNode
 ) : TransformationInfo {
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TypeRemapper.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TypeRemapper.kt
index 9aae494805f..cf6fe1366e2 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TypeRemapper.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TypeRemapper.kt
@@ -24,7 +24,7 @@ class TypeParameter(val oldName: String, val newName: String?, val isReified: Bo
 class TypeRemapper private constructor(
         private val typeMapping: MutableMap<String, String>,
         val parent: TypeRemapper? = null,
-        val isRootInlineLambda: Boolean = false
+        private val isRootInlineLambda: Boolean = false
 ) {
     private val additionalMappings = hashMapOf<String, String>()
     private val typeParametersMapping = hashMapOf<String, TypeParameter>()
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/DeadCodeEliminationMethodTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/DeadCodeEliminationMethodTransformer.kt
index 8b2c5660305..aae00a45028 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/DeadCodeEliminationMethodTransformer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/DeadCodeEliminationMethodTransformer.kt
@@ -88,7 +88,7 @@ class DeadCodeEliminationMethodTransformer : MethodTransformer() {
         return true
     }
 
-    class Result(val removedNodes: Set<AbstractInsnNode>) {
+    class Result(private val removedNodes: Set<AbstractInsnNode>) {
         fun hasRemovedAnything() = removedNodes.isNotEmpty()
         fun isRemoved(node: AbstractInsnNode) = removedNodes.contains(node)
         fun isAlive(node: AbstractInsnNode) = !isRemoved(node)
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxedBasicValue.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxedBasicValue.kt
index 7908d4cf5c1..aaea372fc95 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxedBasicValue.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxedBasicValue.kt
@@ -45,7 +45,7 @@ class CleanBoxedValue(
 }
 
 
-class TaintedBoxedValue(val boxedBasicValue: CleanBoxedValue) : BoxedBasicValue(boxedBasicValue.type) {
+class TaintedBoxedValue(private val boxedBasicValue: CleanBoxedValue) : BoxedBasicValue(boxedBasicValue.type) {
     override val descriptor get() = boxedBasicValue.descriptor
 
     override fun taint(): BoxedBasicValue = this
@@ -53,7 +53,7 @@ class TaintedBoxedValue(val boxedBasicValue: CleanBoxedValue) : BoxedBasicValue(
 
 
 class BoxedValueDescriptor(
-        val boxedType: Type,
+        private val boxedType: Type,
         val boxingInsn: AbstractInsnNode,
         val progressionIterator: ProgressionIteratorBasicValue?
 ) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt
index c4903835bc1..53aeb4b86df 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt
@@ -67,7 +67,7 @@ open class MethodAnalyzer<V : Value>(
         protected val interpreter: Interpreter<V>
 ) {
     val instructions: InsnList = method.instructions
-    val nInsns: Int = instructions.size()
+    private val nInsns: Int = instructions.size()
 
     val frames: Array<Frame<V>?> = arrayOfNulls(nInsns)
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/StackTransformationUtils.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/StackTransformationUtils.kt
index 001fdd93c8e..85a33442d69 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/StackTransformationUtils.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/StackTransformationUtils.kt
@@ -57,7 +57,7 @@ class SavedStackDescriptor(
         val savedValues: List<BasicValue>,
         val firstLocalVarIndex: Int
 ) {
-    val savedValuesSize = savedValues.fold(0, { size, value -> size + value.size })
+    private val savedValuesSize = savedValues.fold(0, { size, value -> size + value.size })
     val firstUnusedLocalVarIndex = firstLocalVarIndex + savedValuesSize
 
     override fun toString(): String =
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/transformer/CompositeMethodTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/transformer/CompositeMethodTransformer.kt
index 153d5137433..5726321e506 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/transformer/CompositeMethodTransformer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/transformer/CompositeMethodTransformer.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.optimization.transformer
 
 import org.jetbrains.org.objectweb.asm.tree.MethodNode
 
-open class CompositeMethodTransformer(vararg val transformers: MethodTransformer) : MethodTransformer() {
+open class CompositeMethodTransformer(private vararg val transformers: MethodTransformer) : MethodTransformer() {
     override fun transform(internalClassName: String, methodNode: MethodNode) {
         transformers.forEach { it.transform(internalClassName, methodNode) }
     }
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/AggregatedReplState.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/AggregatedReplState.kt
index dc7747dc686..1d82dd8d0ae 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/AggregatedReplState.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/AggregatedReplState.kt
@@ -20,8 +20,11 @@ import java.util.concurrent.locks.ReentrantReadWriteLock
 import kotlin.concurrent.read
 import kotlin.concurrent.write
 
-open class AggregatedReplStateHistory<T1, T2>(val history1: IReplStageHistory<T1>, val history2: IReplStageHistory<T2>, override val lock: ReentrantReadWriteLock = ReentrantReadWriteLock())
-    : IReplStageHistory<Pair<T1, T2>>, AbstractList<ReplHistoryRecord<Pair<T1, T2>>>()
+open class AggregatedReplStateHistory<T1, T2>(
+        private val history1: IReplStageHistory<T1>,
+        private val history2: IReplStageHistory<T2>,
+        override val lock: ReentrantReadWriteLock = ReentrantReadWriteLock()
+) : IReplStageHistory<Pair<T1, T2>>, AbstractList<ReplHistoryRecord<Pair<T1, T2>>>()
 {
     override val size: Int
         get() = minOf(history1.size, history2.size)
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplCompilingEvaluator.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplCompilingEvaluator.kt
index 6da1650ecb6..031e097e3cd 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplCompilingEvaluator.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplCompilingEvaluator.kt
@@ -26,7 +26,7 @@ class GenericReplCompilingEvaluator(val compiler: ReplCompiler,
                                     private val fallbackScriptArgs: ScriptArgsWithTypes? = null,
                                     repeatingMode: ReplRepeatingMode = ReplRepeatingMode.REPEAT_ONLY_MOST_RECENT
 ) : ReplFullEvaluator {
-    val evaluator = GenericReplEvaluator(baseClasspath, baseClassloader, fallbackScriptArgs, repeatingMode)
+    private val evaluator = GenericReplEvaluator(baseClasspath, baseClassloader, fallbackScriptArgs, repeatingMode)
 
     override fun createState(lock: ReentrantReadWriteLock): IReplStageState<*> = AggregatedReplStageState(compiler.createState(lock), evaluator.createState(lock), lock)
 
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplEvaluator.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplEvaluator.kt
index bf4642f3f5d..529c2b6370f 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplEvaluator.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplEvaluator.kt
@@ -22,10 +22,11 @@ import java.lang.reflect.InvocationTargetException
 import java.util.concurrent.locks.ReentrantReadWriteLock
 import kotlin.concurrent.write
 
-open class GenericReplEvaluator(val baseClasspath: Iterable<File>,
-                                val baseClassloader: ClassLoader? = Thread.currentThread().contextClassLoader,
-                                protected val fallbackScriptArgs: ScriptArgsWithTypes? = null,
-                                protected val repeatingMode: ReplRepeatingMode = ReplRepeatingMode.REPEAT_ONLY_MOST_RECENT
+open class GenericReplEvaluator(
+        val baseClasspath: Iterable<File>,
+        val baseClassloader: ClassLoader? = Thread.currentThread().contextClassLoader,
+        protected val fallbackScriptArgs: ScriptArgsWithTypes? = null,
+        protected val repeatingMode: ReplRepeatingMode = ReplRepeatingMode.REPEAT_ONLY_MOST_RECENT
 ) : ReplEvaluator {
 
     override fun createState(lock: ReentrantReadWriteLock): IReplStageState<*> = GenericReplEvaluatorState(baseClasspath, baseClassloader, lock)
diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Container.kt b/compiler/container/src/org/jetbrains/kotlin/container/Container.kt
index 7a64e3fccc9..f71176e272b 100644
--- a/compiler/container/src/org/jetbrains/kotlin/container/Container.kt
+++ b/compiler/container/src/org/jetbrains/kotlin/container/Container.kt
@@ -43,7 +43,7 @@ class StorageComponentContainer(id: String, parent: StorageComponentContainer? =
         val parentContext = parent?.let { ComponentResolveContext(it, DynamicComponentDescriptor) }
         ComponentResolveContext(this, DynamicComponentDescriptor, parentContext)
     }
-    val componentStorage: ComponentStorage = ComponentStorage(id, parent?.componentStorage)
+    private val componentStorage: ComponentStorage = ComponentStorage(id, parent?.componentStorage)
 
     override fun createResolveContext(requestingDescriptor: ValueDescriptor): ValueResolveContext {
         if (requestingDescriptor == DynamicComponentDescriptor) // cache unknown component descriptor
diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Resolve.kt b/compiler/container/src/org/jetbrains/kotlin/container/Resolve.kt
index 50e4bfe8c7c..133c7c032c9 100644
--- a/compiler/container/src/org/jetbrains/kotlin/container/Resolve.kt
+++ b/compiler/container/src/org/jetbrains/kotlin/container/Resolve.kt
@@ -42,7 +42,7 @@ class ComponentResolveContext(
 
 class ConstructorBinding(val constructor: Constructor<*>, val argumentDescriptors: List<ValueDescriptor>)
 
-class MethodBinding(val method: Method, val argumentDescriptors: List<ValueDescriptor>) {
+class MethodBinding(val method: Method, private val argumentDescriptors: List<ValueDescriptor>) {
     fun invoke(instance: Any) {
         val arguments = computeArguments(argumentDescriptors).toTypedArray()
         method.invoke(instance, *arguments)
diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt b/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt
index 7f88e8bcfbd..486b00a33aa 100644
--- a/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt
+++ b/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt
@@ -35,7 +35,7 @@ enum class ComponentStorageState {
 
 internal class InvalidCardinalityException(message: String, val descriptors: Collection<ComponentDescriptor>) : Exception(message)
 
-class ComponentStorage(val myId: String, parent: ComponentStorage?) : ValueResolver {
+class ComponentStorage(private val myId: String, parent: ComponentStorage?) : ValueResolver {
     var state = ComponentStorageState.Initial
     private val registry = ComponentRegistry()
     init {
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryJavaClass.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryJavaClass.kt
index 11d4b1e3611..e5335c657f9 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryJavaClass.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryJavaClass.kt
@@ -39,7 +39,7 @@ class BinaryJavaClass(
         override val outerClass: JavaClass?,
         classContent: ByteArray? = null
 ) : ClassVisitor(ASM_API_VERSION_FOR_CLASS_READING), VirtualFileBoundJavaClass, BinaryJavaModifierListOwner, MapBasedJavaAnnotationOwner {
-    lateinit var myInternalName: String
+    private lateinit var myInternalName: String
 
     override val annotations: MutableCollection<JavaAnnotation> = ContainerUtil.newSmartList()
     override lateinit var typeParameters: List<JavaTypeParameter>
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt
index c3fbe33af2e..8273f90c2cd 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt
@@ -47,7 +47,7 @@ class IncrementalPackageFragmentProvider(
         val target: TargetId,
         private val kotlinClassFinder: KotlinClassFinder
 ) : PackageFragmentProvider {
-    val fqNameToPackageFragment =
+    private val fqNameToPackageFragment =
             PackagePartClassUtils.getFilesWithCallables(sourceFiles)
                     .mapTo(hashSetOf()) { it.packageFqName }
                     .keysToMap(this::IncrementalPackageFragment)
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmSimpleNameBacktickChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmSimpleNameBacktickChecker.kt
index 7757bf36fd4..cba0a368ee1 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmSimpleNameBacktickChecker.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmSimpleNameBacktickChecker.kt
@@ -47,7 +47,7 @@ object JvmSimpleNameBacktickChecker : IdentifierChecker {
         }
     }
 
-    fun checkNamed(declaration: KtNamedDeclaration, diagnosticHolder: DiagnosticSink) {
+    private fun checkNamed(declaration: KtNamedDeclaration, diagnosticHolder: DiagnosticSink) {
         val name = declaration.name ?: return
 
         val element = declaration.nameIdentifier ?: declaration
diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt
index 0586765a73c..8d6d16d8803 100644
--- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt
+++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt
@@ -93,7 +93,7 @@ open class KotlinScriptDefinitionFromAnnotatedTemplate(
         }
     }
 
-    val samWithReceiverAnnotations: List<String>? by lazy {
+    private val samWithReceiverAnnotations: List<String>? by lazy {
         takeUnlessError { template.annotations.firstIsInstanceOrNull<kotlin.script.extensions.SamWithReceiverAnnotations>()?.annotations?.toList() }
         ?: takeUnlessError { template.annotations.firstIsInstanceOrNull<org.jetbrains.kotlin.script.SamWithReceiverAnnotations>()?.annotations?.toList() }
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
index eaa3e2fde9d..0d691b15185 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
@@ -75,8 +75,8 @@ class EmptyResolverForProject<M : ModuleInfo> : ResolverForProject<M>() {
 
 class ResolverForProjectImpl<M : ModuleInfo>(
         private val debugName: String,
-        val descriptorByModule: Map<M, ModuleDescriptorImpl>,
-        val delegateResolver: ResolverForProject<M> = EmptyResolverForProject()
+        private val descriptorByModule: Map<M, ModuleDescriptorImpl>,
+        private val delegateResolver: ResolverForProject<M> = EmptyResolverForProject()
 ) : ResolverForProject<M>() {
     override fun tryGetResolverForModule(moduleInfo: M): ResolverForModule? {
         if (!isCorrectModuleInfo(moduleInfo)) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt
index 4e9f0f345dc..b464761ba90 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt
@@ -36,7 +36,7 @@ class NondeterministicJumpInstruction(
     private val _resolvedTargets: MutableMap<Label, Instruction> = linkedMapOf()
 
     val targetLabels: List<Label> = ArrayList(targetLabels)
-    val resolvedTargets: Map<Label, Instruction>
+    private val resolvedTargets: Map<Label, Instruction>
             get() = _resolvedTargets
 
     fun setResolvedTarget(label: Label, resolvedTarget: Instruction) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt
index 6559a709da3..c836be91c30 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt
@@ -28,7 +28,7 @@ class ThrowExceptionInstruction(
         expression: KtThrowExpression,
         blockScope: BlockScope,
         errorLabel: Label,
-        val thrownValue: PseudoValue
+        private val thrownValue: PseudoValue
 ) : AbstractJumpInstruction(expression, errorLabel, blockScope) {
     override val inputValues: List<PseudoValue> get() = Collections.singletonList(thrownValue)
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocTag.kt b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocTag.kt
index 1280ab97d23..1380874e6e9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocTag.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocTag.kt
@@ -150,7 +150,7 @@ open class KDocTag(node: ASTNode) : KDocElementImpl(node) {
         return processedLines.joinToString("\n")
     }
 
-    fun String.calcIndent() = indexOfFirst { !it.isWhitespace() }
+    private fun String.calcIndent() = indexOfFirst { !it.isWhitespace() }
 
     companion object {
         val indentationWhiteSpaces = " ".repeat(4)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/userDataUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/userDataUtil.kt
index 6a81fae201e..1eab19aae70 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/userDataUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/userDataUtil.kt
@@ -49,8 +49,10 @@ class NotNullableCopyableUserDataProperty<in R : PsiElement, T : Any>(val key: K
     }
 }
 
-class NotNullableCopyableUserDataPropertyWithLazyDefault<in R : PsiElement, T : Any>(val key: Key<T>,
-                                                                                            val computeDefaultValue: () -> T) {
+class NotNullableCopyableUserDataPropertyWithLazyDefault<in R : PsiElement, T : Any>(
+        val key: Key<T>,
+        val computeDefaultValue: () -> T
+) {
     private val delegate by lazy { NotNullableCopyableUserDataProperty<R, T>(key, computeDefaultValue()) }
 
     operator fun getValue(thisRef: R, property: KProperty<*>) = delegate.getValue(thisRef, property)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
index 1d01f0bc300..ffc6e6b3d09 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
@@ -249,7 +249,7 @@ class AnnotationChecker(private val additionalCheckers: Iterable<AdditionalAnnot
 
             val T_DESTRUCTURING_DECLARATION = targetList(DESTRUCTURING_DECLARATION)
 
-            fun TargetListBuilder.propertyTargets(backingField: Boolean, delegate: Boolean) {
+            private fun TargetListBuilder.propertyTargets(backingField: Boolean, delegate: Boolean) {
                 if (backingField) extraTargets(FIELD)
                 if (delegate) {
                     onlyWithUseSiteTarget(VALUE_PARAMETER, PROPERTY_GETTER, PROPERTY_SETTER, FIELD)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt
index d1ffa554d4a..904f8902030 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt
@@ -90,14 +90,14 @@ object ModifierCheckerCore {
             IMPL_KEYWORD      to EnumSet.of(TOP_LEVEL_FUNCTION, MEMBER_FUNCTION, TOP_LEVEL_PROPERTY, MEMBER_PROPERTY, CONSTRUCTOR, CLASS_ONLY, OBJECT, INTERFACE, ENUM_CLASS, ANNOTATION_CLASS, TYPEALIAS)
     )
 
-    val featureDependencies = mapOf(
+    private val featureDependencies = mapOf(
             SUSPEND_KEYWORD   to LanguageFeature.Coroutines,
             INLINE_KEYWORD    to LanguageFeature.InlineProperties,
             HEADER_KEYWORD    to LanguageFeature.MultiPlatformProjects,
             IMPL_KEYWORD      to LanguageFeature.MultiPlatformProjects
     )
 
-    val featureDependenciesTargets = mapOf(
+    private val featureDependenciesTargets = mapOf(
             LanguageFeature.InlineProperties to setOf(PROPERTY, PROPERTY_GETTER, PROPERTY_SETTER)
     )
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.kt
index bbff4a0d293..9fdd434d701 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.kt
@@ -285,7 +285,7 @@ class CallExpressionResolver(
                 }
             }
 
-    fun resolveSimpleName(
+    private fun resolveSimpleName(
             context: ExpressionTypingContext, expression: KtSimpleNameExpression
     ): OverloadResolutionResults<VariableDescriptor> {
         val temporaryForVariable = TemporaryTraceAndCache.create(context, "trace to resolve as local variable or property", expression)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/GenericCandidateResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/GenericCandidateResolver.kt
index bde9597595d..05574acd8c5 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/GenericCandidateResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/GenericCandidateResolver.kt
@@ -167,7 +167,7 @@ class GenericCandidateResolver(
         })
     }
 
-    fun addConstraintForValueArgument(
+    private fun addConstraintForValueArgument(
             valueArgument: ValueArgument,
             valueParameterDescriptor: ValueParameterDescriptor,
             substitutor: TypeSubstitutor,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/UnderscoreUsageChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/UnderscoreUsageChecker.kt
index b9cd8249217..ffb0c0c91dd 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/UnderscoreUsageChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/UnderscoreUsageChecker.kt
@@ -57,7 +57,7 @@ object UnderscoreUsageChecker : CallChecker {
         }
     }
 
-    fun String.isUnderscoreOnlyName() =
+    private fun String.isUnderscoreOnlyName() =
             isNotEmpty() && all { it == '_' }
 
 }
\ No newline at end of file
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastManager.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastManager.kt
index 51b621b2626..5b9c87ce912 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastManager.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastManager.kt
@@ -37,12 +37,11 @@ import java.util.*
 
 class SmartCastManager {
 
-    fun getSmartCastVariants(
+    private fun getSmartCastVariants(
             receiverToCast: ReceiverValue,
             context: ResolutionContext<*>
-    ): List<KotlinType> {
-        return getSmartCastVariants(receiverToCast, context.trace.bindingContext, context.scope.ownerDescriptor, context.dataFlowInfo)
-    }
+    ): List<KotlinType> =
+            getSmartCastVariants(receiverToCast, context.trace.bindingContext, context.scope.ownerDescriptor, context.dataFlowInfo)
 
     fun getSmartCastVariants(
             receiverToCast: ReceiverValue,
@@ -73,7 +72,7 @@ class SmartCastManager {
     /**
      * @return variants @param receiverToCast may be cast to according to @param dataFlowInfo, @param receiverToCast itself is NOT included
      */
-    fun getSmartCastVariantsExcludingReceiver(
+    private fun getSmartCastVariantsExcludingReceiver(
             bindingContext: BindingContext,
             containingDeclarationOrModule: DeclarationDescriptor,
             dataFlowInfo: DataFlowInfo,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
index 03184551642..7fbe2aa6e9b 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
@@ -177,7 +177,7 @@ class ConstantExpressionEvaluator(
         return getArgumentExpressionsForArrayLikeCall(resolvedCall)
     }
 
-    fun getArgumentExpressionsForCollectionLiteralCall(
+    private fun getArgumentExpressionsForCollectionLiteralCall(
             expression: KtCollectionLiteralExpression,
             trace: BindingTrace): Pair<List<KtExpression>, KotlinType?>? {
         val resolvedCall = trace[COLLECTION_LITERAL_CALL, expression] ?: return null
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.kt
index f58a3ebff16..bab74f8846f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.kt
@@ -166,7 +166,7 @@ class InlineAnalyzerExtension(
         trace.report(Errors.NOTHING_TO_INLINE.on(reportOn, functionDescriptor))
     }
 
-    fun checkInlinableParameter(
+    private fun checkInlinableParameter(
             parameter: ParameterDescriptor,
             expression: KtElement,
             functionDescriptor: CallableDescriptor,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/CombinedPackageMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/CombinedPackageMemberDeclarationProvider.kt
index 76f72fd58ef..c457578d570 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/CombinedPackageMemberDeclarationProvider.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/CombinedPackageMemberDeclarationProvider.kt
@@ -20,7 +20,9 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtDestructuringDeclarationEntry
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 
-class CombinedPackageMemberDeclarationProvider(val providers: Collection<PackageMemberDeclarationProvider>) : PackageMemberDeclarationProvider {
+class CombinedPackageMemberDeclarationProvider(
+        val providers: Collection<PackageMemberDeclarationProvider>
+) : PackageMemberDeclarationProvider {
     override fun getAllDeclaredSubPackages(nameFilter: (Name) -> Boolean) = providers.flatMap { it.getAllDeclaredSubPackages(nameFilter) }
 
     override fun getPackageFiles() = providers.flatMap { it.getPackageFiles() }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
index 11edbfe5888..c011bf1b5e3 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
@@ -118,7 +118,7 @@ protected constructor(
         return propertyDescriptors(name)
     }
 
-    fun doGetProperties(name: Name): Collection<PropertyDescriptor> {
+    private fun doGetProperties(name: Name): Collection<PropertyDescriptor> {
         val result = LinkedHashSet<PropertyDescriptor>()
 
         val declarations = declarationProvider.getPropertyDeclarations(name)
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
index cb90530e439..7865041e551 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
@@ -92,7 +92,7 @@ class IncrementalJvmCompilerRunner(
         private val artifactChangesProvider: ArtifactChangesProvider? = null,
         private val changesRegistry: ChangesRegistry? = null
 ) {
-    var anyClassesCompiled: Boolean = false
+    private var anyClassesCompiled: Boolean = false
             private set
     private val cacheDirectory = File(workingDir, CACHES_DIR_NAME)
     private val dirtySourcesSinceLastTimeFile = File(workingDir, DIRTY_SOURCES_FILE_NAME)
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
index 77ef0833e2b..002dd8c3509 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
@@ -39,7 +39,11 @@ import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.org.objectweb.asm.Type
 import java.lang.RuntimeException
 
-class ClassCodegen private constructor(val irClass: IrClass, val context: JvmBackendContext, val parentClassCodegen: ClassCodegen? = null) : InnerClassConsumer {
+class ClassCodegen private constructor(
+        private val irClass: IrClass,
+        val context: JvmBackendContext,
+        private val parentClassCodegen: ClassCodegen? = null
+) : InnerClassConsumer {
 
     private val innerClasses = mutableListOf<ClassDescriptor>()
 
@@ -49,7 +53,7 @@ class ClassCodegen private constructor(val irClass: IrClass, val context: JvmBac
 
     val descriptor = irClass.descriptor
 
-    val isAnonymous = DescriptorUtils.isAnonymousObject(irClass.descriptor)
+    private val isAnonymous = DescriptorUtils.isAnonymousObject(irClass.descriptor)
 
     val type: Type = if (isAnonymous) CodegenBinding.asmTypeForAnonymousClass(state.bindingContext, descriptor.source.getPsi() as KtElement) else typeMapper.mapType(descriptor)
 
@@ -120,7 +124,7 @@ class ClassCodegen private constructor(val irClass: IrClass, val context: JvmBac
     }
 
 
-    fun generateField(field: IrField) {
+    private fun generateField(field: IrField) {
         val fieldType = typeMapper.mapType(field.descriptor)
         val fieldSignature = typeMapper.mapFieldSignature(field.descriptor.type, field.descriptor)
         val fv = visitor.newField(field.OtherOrigin, field.descriptor.calculateCommonFlags(), field.descriptor.name.asString(), fieldType.descriptor,
@@ -134,7 +138,7 @@ class ClassCodegen private constructor(val irClass: IrClass, val context: JvmBac
         }
     }
 
-    fun generateMethod(method: IrFunction) {
+    private fun generateMethod(method: IrFunction) {
         if (method.origin == IrDeclarationOrigin.FAKE_OVERRIDE) return
         FunctionCodegen(method, this).generate()
     }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt
index 2cf6da59821..caf856e0657 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt
@@ -36,7 +36,7 @@ import org.jetbrains.org.objectweb.asm.MethodVisitor
 import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 
-class FunctionCodegen(val irFunction: IrFunction, val classCodegen: ClassCodegen) {
+class FunctionCodegen(private val irFunction: IrFunction, private val classCodegen: ClassCodegen) {
 
     val state = classCodegen.state
 
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/KnownDescriptors.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/KnownDescriptors.kt
index d43b328fc02..243e34b8079 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/KnownDescriptors.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/KnownDescriptors.kt
@@ -77,7 +77,7 @@ open class KnownClassDescriptor(
                     initialize(emptyList(), supertypes)
                 }
 
-        inline fun createClassWithTypeParameters(
+        private inline fun createClassWithTypeParameters(
                 name: Name,
                 containingDeclaration: DeclarationDescriptor,
                 supertypes: List<KotlinType>,
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SpecialDescriptorsFactory.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SpecialDescriptorsFactory.kt
index b471e0da67d..3e35213fcec 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SpecialDescriptorsFactory.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SpecialDescriptorsFactory.kt
@@ -33,8 +33,8 @@ import org.jetbrains.org.objectweb.asm.Opcodes
 import java.util.*
 
 class SpecialDescriptorsFactory(
-        val psiSourceManager: PsiSourceManager,
-        val builtIns: KotlinBuiltIns
+        private val psiSourceManager: PsiSourceManager,
+        private val builtIns: KotlinBuiltIns
 ) {
     private val singletonFieldDescriptors = HashMap<ClassDescriptor, PropertyDescriptor>()
     private val outerThisDescriptors = HashMap<ClassDescriptor, PropertyDescriptor>()
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt
index a9005ddb274..2b2ba58a21b 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt
@@ -108,7 +108,7 @@ class BridgeLowering(val state: GenerationState) : ClassLoweringPass {
     }
 
 
-    fun generateBridges(descriptor: FunctionDescriptor, irClass: IrClass) {
+    private fun generateBridges(descriptor: FunctionDescriptor, irClass: IrClass) {
         // equals(Any?), hashCode(), toString() never need bridges
         if (isMethodOfAny(descriptor)) {
             return
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt
index 3f071131d6e..914b8455c2a 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt
@@ -103,7 +103,7 @@ class SyntheticAccessorLowering(val state: GenerationState) : FileLoweringPass,
     private val IrClassContext.codegenContext: CodegenContext<*>
         get() = contextAnnotator.context2Codegen[this]!!
 
-    var contextAnnotator by Delegates.notNull<ContextAnnotator>()
+    private lateinit var contextAnnotator: ContextAnnotator
 
     private val ClassDescriptor.codegenContext: CodegenContext<*>
         get() = contextAnnotator.class2Codegen[this]!!
diff --git a/compiler/ir/ir.ir2cfg/src/org/jetbrains/kotlin/ir2cfg/generators/FunctionGenerator.kt b/compiler/ir/ir.ir2cfg/src/org/jetbrains/kotlin/ir2cfg/generators/FunctionGenerator.kt
index 3c36219b4b8..47815d49d07 100644
--- a/compiler/ir/ir.ir2cfg/src/org/jetbrains/kotlin/ir2cfg/generators/FunctionGenerator.kt
+++ b/compiler/ir/ir.ir2cfg/src/org/jetbrains/kotlin/ir2cfg/generators/FunctionGenerator.kt
@@ -45,7 +45,7 @@ class FunctionGenerator(val function: IrFunction) {
 
     inner class FunctionVisitor : IrElementVisitor<IrStatement?, Boolean> {
 
-        inline fun <reified IE : IrElement> IE.process(includeSelf: Boolean = true) = this.accept(this@FunctionVisitor, includeSelf)
+        private inline fun <reified IE : IrElement> IE.process(includeSelf: Boolean = true) = this.accept(this@FunctionVisitor, includeSelf)
 
         override fun visitFunction(declaration: IrFunction, data: Boolean): IrStatement? {
             if (data) {
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/PsiSourceManager.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/PsiSourceManager.kt
index dab589da032..47f2484a586 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/PsiSourceManager.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/PsiSourceManager.kt
@@ -63,7 +63,7 @@ class PsiSourceManager : SourceManager {
                         endColumnNumber = getColumnNumber(endOffset)
                 )
 
-        fun getRecognizableName(): String = psiFileName
+        private fun getRecognizableName(): String = psiFileName
 
         override val name: String get() = getRecognizableName()
 
@@ -74,7 +74,7 @@ class PsiSourceManager : SourceManager {
     private val fileEntriesByIrFile = HashMap<IrFile, PsiFileEntry>()
     private val ktFileByFileEntry = HashMap<PsiFileEntry, KtFile>()
 
-    fun createFileEntry(ktFile: KtFile): PsiFileEntry {
+    private fun createFileEntry(ktFile: KtFile): PsiFileEntry {
         if (ktFile in fileEntriesByKtFile) error("PsiFileEntry is already created for $ktFile")
         val newEntry = PsiFileEntry(ktFile)
         fileEntriesByKtFile[ktFile] = newEntry
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt
index ddfed995c52..e10f660f1ea 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt
@@ -219,7 +219,7 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
         generateValueParameterDeclarations(irFunction, null, null, withDefaultValues = false)
     }
 
-    fun generateValueParameterDeclarations(
+    private fun generateValueParameterDeclarations(
             irFunction: IrFunction,
             ktParameterOwner: KtElement?,
             ktReceiverParameterElement: KtElement?,
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopySymbolsRemapper.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopySymbolsRemapper.kt
index aeb8e3df8f0..a41c21ae226 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopySymbolsRemapper.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopySymbolsRemapper.kt
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
 import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
 
 open class DeepCopySymbolsRemapper(
-        val descriptorsRemapper: DescriptorsRemapper = DescriptorsRemapper.DEFAULT
+        private val descriptorsRemapper: DescriptorsRemapper = DescriptorsRemapper.DEFAULT
 ) : IrElementVisitorVoid, SymbolRemapper {
     private val classes = hashMapOf<IrClassSymbol, IrClassSymbol>()
     private val constructors = hashMapOf<IrConstructorSymbol, IrConstructorSymbol>()
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt
index dee895539f9..d0a78e48c5b 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt
@@ -40,8 +40,8 @@ fun IrFile.dumpTreesFromLineNumber(lineNumber: Int): String {
 }
 
 class DumpIrTreeVisitor(out: Appendable): IrElementVisitor<Unit, String> {
-    val printer = Printer(out, "  ")
-    val elementRenderer = RenderIrElementVisitor()
+    private val printer = Printer(out, "  ")
+    private val elementRenderer = RenderIrElementVisitor()
 
     companion object {
         val ANNOTATIONS_RENDERER = DescriptorRenderer.withOptions {
@@ -223,10 +223,10 @@ class DumpIrTreeVisitor(out: Appendable): IrElementVisitor<Unit, String> {
 
 class DumpTreeFromSourceLineVisitor(
         val fileEntry: SourceManager.FileEntry,
-        val lineNumber: Int,
+        private val lineNumber: Int,
         out: Appendable
 ): IrElementVisitorVoid {
-    val dumper = DumpIrTreeVisitor(out)
+    private val dumper = DumpIrTreeVisitor(out)
 
     override fun visitElement(element: IrElement) {
         if (fileEntry.getLineNumber(element.startOffset) == lineNumber) {
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/DeclaredMemberIndex.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/DeclaredMemberIndex.kt
index 398ef86e1df..06356af20db 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/DeclaredMemberIndex.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/DeclaredMemberIndex.kt
@@ -39,7 +39,10 @@ interface DeclaredMemberIndex {
     }
 }
 
-open class ClassDeclaredMemberIndex(val jClass: JavaClass, val memberFilter: (JavaMember) -> Boolean) : DeclaredMemberIndex {
+open class ClassDeclaredMemberIndex(
+        val jClass: JavaClass,
+        private val memberFilter: (JavaMember) -> Boolean
+) : DeclaredMemberIndex {
     private val methodFilter = {
         m: JavaMethod ->
         memberFilter(m) && !DescriptorResolverUtils.isObjectMethodInInterface(m)
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibility.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibility.kt
index 358c19a9a6d..c680741d3f1 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibility.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibility.kt
@@ -262,7 +262,7 @@ enum class RelationToType(val description: String) {
     override fun toString() = description
 }
 
-data class DescriptorWithRelation(val descriptor: ClassifierDescriptor, val relation: RelationToType) {
+data class DescriptorWithRelation(val descriptor: ClassifierDescriptor, private val relation: RelationToType) {
     fun effectiveVisibility() =
             (descriptor as? ClassDescriptor)?.visibility?.effectiveVisibility(descriptor, false) ?: Public
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/ClassifierNamePolicy.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/ClassifierNamePolicy.kt
index 1a71952fb9b..dc55949a54d 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/ClassifierNamePolicy.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/ClassifierNamePolicy.kt
@@ -50,11 +50,10 @@ interface ClassifierNamePolicy {
 
     // for local declarations qualified up to function scope
     object SOURCE_CODE_QUALIFIED : ClassifierNamePolicy {
-        override fun renderClassifier(classifier: ClassifierDescriptor, renderer: DescriptorRenderer): String {
-            return qualifiedNameForSourceCode(classifier)
-        }
+        override fun renderClassifier(classifier: ClassifierDescriptor, renderer: DescriptorRenderer): String =
+                qualifiedNameForSourceCode(classifier)
 
-        fun qualifiedNameForSourceCode(descriptor: ClassifierDescriptor): String {
+        private fun qualifiedNameForSourceCode(descriptor: ClassifierDescriptor): String {
             val nameString = descriptor.name.render()
             if (descriptor is TypeParameterDescriptor) {
                 return nameString
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
index 293e76726cd..f647774980a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
@@ -106,7 +106,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
         return getMethodSequenceByName(name, scope).toList().toTypedArray()
     }
 
-    fun getMethodSequenceByName(name: String, scope: GlobalSearchScope): Sequence<PsiMethod> {
+    private fun getMethodSequenceByName(name: String, scope: GlobalSearchScope): Sequence<PsiMethod> {
         val propertiesIndex = KotlinPropertyShortNameIndex.getInstance()
         val functionIndex = KotlinFunctionShortNameIndex.getInstance()
 
@@ -160,7 +160,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
         set.addAll(allMethodNames)
     }
 
-    fun getFieldSequenceByName(name: String, scope: GlobalSearchScope): Sequence<PsiField> {
+    private fun getFieldSequenceByName(name: String, scope: GlobalSearchScope): Sequence<PsiField> {
         return KotlinPropertyShortNameIndex.getInstance().get(name, project, scope).asSequence()
                 .map { LightClassUtil.getLightClassBackingField(it) }
                 .filterNotNull()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
index 037b731628e..c659c7b967a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
@@ -276,7 +276,7 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
         return getClassRelativeName(parent).child(name)
     }
 
-    fun createLightClassForDecompiledKotlinFile(file: KtClsFile): KtLightClassForDecompiledDeclaration? {
+    private fun createLightClassForDecompiledKotlinFile(file: KtClsFile): KtLightClassForDecompiledDeclaration? {
         val virtualFile = file.virtualFile ?: return null
 
         val classOrObject = file.declarations.filterIsInstance<KtClassOrObject>().singleOrNull()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt
index 3b4762568a8..5c2cd6bccaf 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt
@@ -37,8 +37,11 @@ class ScriptModuleSearchScope(val scriptFile: VirtualFile, baseScope: GlobalSear
     override fun hashCode() = scriptFile.hashCode() * 73 * super.hashCode()
 }
 
-data class ScriptModuleInfo(val project: Project, val scriptFile: VirtualFile,
-                            val scriptDefinition: KotlinScriptDefinition) : IdeaModuleInfo {
+data class ScriptModuleInfo(
+        val project: Project,
+        val scriptFile: VirtualFile,
+        val scriptDefinition: KotlinScriptDefinition
+) : IdeaModuleInfo {
     override val moduleOrigin: ModuleOrigin
         get() = ModuleOrigin.OTHER
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt
index 812a09d87fb..9bef30b5222 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt
@@ -51,7 +51,7 @@ open class KotlinClsStubBuilder : ClsStubBuilder() {
         return doBuildFileStub(file, content.content)
     }
 
-    fun doBuildFileStub(file: VirtualFile, fileContent: ByteArray): PsiFileStub<KtFile>? {
+    private fun doBuildFileStub(file: VirtualFile, fileContent: ByteArray): PsiFileStub<KtFile>? {
         val kotlinClass = IDEKotlinBinaryClassCache.getKotlinBinaryClass(file, fileContent) ?: error("Can't find binary class for Kotlin file: $file")
         val header = kotlinClass.classHeader
         val classId = kotlinClass.classId
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt
index 01d6514ba34..f70f669f50c 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt
@@ -45,7 +45,7 @@ import kotlin.reflect.KClass
 @Suppress("DEPRECATION")
 @Deprecated("Please do not use for new inspections. Use AbstractKotlinInspection as base class for them")
 abstract class IntentionBasedInspection<TElement : PsiElement>(
-        val intentionInfos: List<IntentionBasedInspection.IntentionData<TElement>>,
+        private val intentionInfos: List<IntentionBasedInspection.IntentionData<TElement>>,
         protected open val problemText: String?
 ) : AbstractKotlinInspection() {
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt
index 2a70271086a..59228d2f728 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt
@@ -64,7 +64,7 @@ sealed class SyntheticPropertyAccessorReference(expression: KtNameReferenceExpre
 
     override fun canRename() = true
 
-    fun renameByPropertyName(newName: String): PsiElement? {
+    private fun renameByPropertyName(newName: String): PsiElement? {
         val nameIdentifier = KtPsiFactory(expression).createNameIdentifier(newName)
         expression.getReferencedNameElement().replace(nameIdentifier)
         return expression
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/PsiBasedClassResolver.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/PsiBasedClassResolver.kt
index c8c8b4cba7c..a97d1624181 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/PsiBasedClassResolver.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/PsiBasedClassResolver.kt
@@ -225,7 +225,7 @@ class PsiBasedClassResolver @TestOnly constructor(private val targetClassFqName:
         Ambiguity(UNSURE)
     }
 
-    fun Result.changeTo(newResult: Result): Result {
+    private fun Result.changeTo(newResult: Result): Result {
         if (this == Result.NothingFound || this.returnValue == newResult.returnValue) {
             return newResult
         }
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt
index d3e6c1b1e55..2b1810d4790 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt
@@ -52,12 +52,12 @@ class IllegalIdentifierInspection : AbstractKotlinInspection() {
                 }
             }
 
-            fun checkAndroidFacet(element: PsiElement): Boolean {
+            private fun checkAndroidFacet(element: PsiElement): Boolean {
                 return element.getAndroidFacetForFile() != null || ApplicationManager.getApplication().isUnitTestMode
             }
 
             // https://source.android.com/devices/tech/dalvik/dex-format.html#string-syntax
-            fun isValidDalvikCharacter(c: Char) = when (c) {
+            private fun isValidDalvikCharacter(c: Char) = when (c) {
                 in 'A'..'Z' -> true
                 in 'a'..'z' -> true
                 in '0'..'9' -> true
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
index 6072352a7ca..8b72a23c18b 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
@@ -290,15 +290,13 @@ object KeywordCompletion {
         return buildFilterWithReducedContext("", null, position)
     }
 
-    fun computeKeywordApplications(prefixText: String, keyword: KtKeywordToken): Sequence<String> {
-        return when (keyword) {
-            SUSPEND_KEYWORD -> sequenceOf("suspend () -> Unit>", "suspend X")
-            else -> {
-                if (prefixText.endsWith("@"))
-                    sequenceOf(keyword.value + ":X Y.Z")
-                else
-                    sequenceOf(keyword.value + " X")
-            }
+    private fun computeKeywordApplications(prefixText: String, keyword: KtKeywordToken): Sequence<String> = when (keyword) {
+        SUSPEND_KEYWORD -> sequenceOf("suspend () -> Unit>", "suspend X")
+        else -> {
+            if (prefixText.endsWith("@"))
+                sequenceOf(keyword.value + ":X Y.Z")
+            else
+                sequenceOf(keyword.value + " X")
         }
     }
 
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OperatorNameCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OperatorNameCompletion.kt
index 37ae5ec0cd5..442f7720eaf 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OperatorNameCompletion.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OperatorNameCompletion.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions.SET
 
 object OperatorNameCompletion {
 
-    val additionalOperatorPresentation = mapOf(
+    private val additionalOperatorPresentation = mapOf(
             SET to "[...] = ...",
             GET to "[...]",
             CONTAINS to "in !in",
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ReferenceVariantsCollector.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ReferenceVariantsCollector.kt
index ff877d6a571..d4f80bdf9c1 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ReferenceVariantsCollector.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ReferenceVariantsCollector.kt
@@ -153,7 +153,7 @@ class ReferenceVariantsCollector(
         return ReferenceVariants(filterConfiguration.filterVariants(basicVariants).toHashSet(), emptyList())
     }
 
-    fun doCollectExtensionVariants(filterConfiguration: FilterConfiguration, basicVariants: ReferenceVariants): ReferenceVariants {
+    private fun doCollectExtensionVariants(filterConfiguration: FilterConfiguration, basicVariants: ReferenceVariants): ReferenceVariants {
         val (_, additionalPropertyNameFilter, shadowedDeclarationsFilter, completeExtensionsFromIndices) = filterConfiguration
 
         if (completeExtensionsFromIndices) {
@@ -184,7 +184,7 @@ class ReferenceVariantsCollector(
         return ReferenceVariants(emptyList(), emptyList())
     }
 
-    fun <TDescriptor : DeclarationDescriptor> FilterConfiguration.filterVariants(_variants: Collection<TDescriptor>): Collection<TDescriptor> {
+    private fun <TDescriptor : DeclarationDescriptor> FilterConfiguration.filterVariants(_variants: Collection<TDescriptor>): Collection<TDescriptor> {
         var variants = _variants
 
         if (shadowedDeclarationsFilter != null)
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ToFromOriginalFileMapper.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ToFromOriginalFileMapper.kt
index e6fab485e7a..585ddb10926 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ToFromOriginalFileMapper.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ToFromOriginalFileMapper.kt
@@ -56,20 +56,16 @@ class ToFromOriginalFileMapper private constructor(
         shift = syntheticLength - originalLength
     }
 
-    fun toOriginalFile(offset: Int): Int? {
-        return when {
-            offset <= completionOffset -> offset
-            offset >= syntheticLength - tailLength -> offset - shift
-            else -> null
-        }
+    private fun toOriginalFile(offset: Int): Int? = when {
+        offset <= completionOffset -> offset
+        offset >= syntheticLength - tailLength -> offset - shift
+        else -> null
     }
 
-    fun toSyntheticFile(offset: Int): Int? {
-        return when {
-            offset <= completionOffset -> offset
-            offset >= originalLength - tailLength -> offset + shift
-            else -> null
-        }
+    private fun toSyntheticFile(offset: Int): Int? = when {
+        offset <= completionOffset -> offset
+        offset >= originalLength - tailLength -> offset + shift
+        else -> null
     }
 
     fun <TElement : PsiElement> toOriginalFile(element: TElement): TElement? {
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt
index 012ff2dc18d..bb53d87cd41 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt
@@ -45,7 +45,10 @@ import org.jetbrains.kotlin.util.descriptorsEqualWithSubstitution
 import java.util.*
 
 class ArtificialElementInsertHandler(
-        val textBeforeCaret: String, val textAfterCaret: String, val shortenRefs: Boolean) : InsertHandler<LookupElement>{
+        private val textBeforeCaret: String,
+        private val textAfterCaret: String,
+        private val shortenRefs: Boolean
+) : InsertHandler<LookupElement>{
     override fun handleInsert(context: InsertionContext, item: LookupElement) {
         val offset = context.editor.caretModel.offset
         val startOffset = offset - item.lookupString.length
diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/jsr223/KotlinJsr223JvmScriptEngine4Idea.kt b/idea/idea-repl/src/org/jetbrains/kotlin/jsr223/KotlinJsr223JvmScriptEngine4Idea.kt
index 61d8f3129d6..205411566df 100644
--- a/idea/idea-repl/src/org/jetbrains/kotlin/jsr223/KotlinJsr223JvmScriptEngine4Idea.kt
+++ b/idea/idea-repl/src/org/jetbrains/kotlin/jsr223/KotlinJsr223JvmScriptEngine4Idea.kt
@@ -73,7 +73,7 @@ class KotlinJsr223JvmScriptEngine4Idea(
     override fun overrideScriptArgs(context: ScriptContext): ScriptArgsWithTypes? =
             getScriptArgs(getContext(), scriptArgsTypes)
 
-    val localEvaluator: ReplFullEvaluator by lazy { GenericReplCompilingEvaluator(replCompiler, templateClasspath, Thread.currentThread().contextClassLoader) }
+    private val localEvaluator: ReplFullEvaluator by lazy { GenericReplCompilingEvaluator(replCompiler, templateClasspath, Thread.currentThread().contextClassLoader) }
 
     override val replEvaluator: ReplFullEvaluator get() = localEvaluator
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
index dc6c48e3ae6..6b190d70c31 100644
--- a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
@@ -329,7 +329,7 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() {
             }
         }
 
-        fun String.htmlEscape(): String = HtmlEscapers.htmlEscaper().escape(this)
+        private fun String.htmlEscape(): String = HtmlEscapers.htmlEscaper().escape(this)
 
         private inline fun StringBuilder.wrap(prefix: String, postfix: String, crossinline body: () -> Unit) {
             this.append(prefix)
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/internal/SearchNotPropertyCandidatesAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/internal/SearchNotPropertyCandidatesAction.kt
index 1a877d82490..6fb3e2426a0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/internal/SearchNotPropertyCandidatesAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/SearchNotPropertyCandidatesAction.kt
@@ -64,7 +64,7 @@ class SearchNotPropertyCandidatesAction : AnAction() {
     }
 
 
-    fun processAllDescriptors(desc: DeclarationDescriptor, project: Project) {
+    private fun processAllDescriptors(desc: DeclarationDescriptor, project: Project) {
         val processed = mutableSetOf<DeclarationDescriptor>()
         var pFunctions = 0
         val matchedDescriptors = mutableSetOf<FunctionDescriptor>()
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt
index 59e7d519377..7494e9cb3f1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt
@@ -50,9 +50,9 @@ class PlainTextPasteImportResolver(val dataForConversion: DataForConversion, val
     private val shortNameCache = PsiShortNamesCache.getInstance(project)
     private val scope = file.resolveScope
 
-    val failedToResolveReferenceNames = HashSet<String>()
-    var ambiguityInResolution = false
-    var couldNotResolve = false
+    private val failedToResolveReferenceNames = HashSet<String>()
+    private var ambiguityInResolution = false
+    private var couldNotResolve = false
 
     val addedImports = ArrayList<PsiImportStatementBase>()
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt
index 987df475cbc..d40cf72770d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt
@@ -72,7 +72,7 @@ class DebuggerClassNameProvider(
         }
     }
 
-    val inlineUsagesSearcher = InlineCallableUsagesSearcher(debugProcess, scopes)
+    private val inlineUsagesSearcher = InlineCallableUsagesSearcher(debugProcess, scopes)
 
     /**
      * Returns classes in which the given line number *is* present.
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/InlineCallableUsagesSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/InlineCallableUsagesSearcher.kt
index 2e7cb537db5..ba06af8c2f7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/InlineCallableUsagesSearcher.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/InlineCallableUsagesSearcher.kt
@@ -37,7 +37,10 @@ import org.jetbrains.kotlin.idea.debugger.DebuggerClassNameProvider.Companion.ge
 import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches
 import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches.ComputedClassNames
 
-class InlineCallableUsagesSearcher(val myDebugProcess: DebugProcess, val scopes: List<GlobalSearchScope>) {
+class InlineCallableUsagesSearcher(
+        private val myDebugProcess: DebugProcess,
+        val scopes: List<GlobalSearchScope>
+) {
     fun findInlinedCalls(
             declaration: KtDeclaration,
             bindingContext: BindingContext = KotlinDebuggerCaches.getOrCreateTypeMapper(declaration).bindingContext,
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt
index 10930a0d2a0..5ce0d4337cf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt
@@ -230,7 +230,7 @@ class KotlinFieldBreakpoint(
         }
     }
 
-    inline fun <reified T : EventRequest> findRequest(debugProcess: DebugProcessImpl, requestClass: Class<T>, requestor: Requestor): T? {
+    inline private fun <reified T : EventRequest> findRequest(debugProcess: DebugProcessImpl, requestClass: Class<T>, requestor: Requestor): T? {
         val requests = debugProcess.requestsManager.findRequests(requestor)
         for (eventRequest in requests) {
             if (eventRequest::class.java == requestClass) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/render/DelegatedPropertyFieldDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/render/DelegatedPropertyFieldDescriptor.kt
index 81d8d86863e..86f477151de 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/render/DelegatedPropertyFieldDescriptor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/render/DelegatedPropertyFieldDescriptor.kt
@@ -33,7 +33,7 @@ class DelegatedPropertyFieldDescriptor(
         project: Project,
         objectRef: ObjectReference,
         val delegate: Field,
-        val renderDelegatedProperty: Boolean
+        private val renderDelegatedProperty: Boolean
 ) : FieldDescriptorImpl(project, objectRef, delegate) {
 
     override fun calcValue(evaluationContext: EvaluationContextImpl?): Value? {
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/render/KotlinClassWithDelegatedPropertyRenderer.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/render/KotlinClassWithDelegatedPropertyRenderer.kt
index c486ed4e270..582db2c2d78 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/render/KotlinClassWithDelegatedPropertyRenderer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/render/KotlinClassWithDelegatedPropertyRenderer.kt
@@ -41,7 +41,7 @@ private val LOG = Logger.getInstance(KotlinClassWithDelegatedPropertyRenderer::c
 private fun notPreparedClassMessage(referenceType: ReferenceType) =
     "$referenceType ${referenceType.isPrepared} ${referenceType.sourceName()}"
 
-class KotlinClassWithDelegatedPropertyRenderer(val rendererSettings: NodeRendererSettings) : ClassRenderer() {
+class KotlinClassWithDelegatedPropertyRenderer(private val rendererSettings: NodeRendererSettings) : ClassRenderer() {
     override fun isApplicable(jdiType: Type?): Boolean {
         if (!super.isApplicable(jdiType)) return false
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinMultilineStringEnterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinMultilineStringEnterHandler.kt
index 51172301bfc..aaa37edf347 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinMultilineStringEnterHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinMultilineStringEnterHandler.kt
@@ -247,9 +247,9 @@ class KotlinMultilineStringEnterHandler : EnterHandlerDelegateAdapter() {
             private val kotlinIndentOptions =
                     CodeStyleSettingsManager.getInstance(project).currentSettings.getIndentOptions(KotlinFileType.INSTANCE)
 
-            val useTabs = kotlinIndentOptions.USE_TAB_CHARACTER
-            val tabSize = kotlinIndentOptions.TAB_SIZE
-            val regularIndent = kotlinIndentOptions.INDENT_SIZE
+            private val useTabs = kotlinIndentOptions.USE_TAB_CHARACTER
+            private val tabSize = kotlinIndentOptions.TAB_SIZE
+            private val regularIndent = kotlinIndentOptions.INDENT_SIZE
             val marginIndent = regularIndent
 
             fun getSmartSpaces(count: Int): String = when {
@@ -301,7 +301,7 @@ class KotlinMultilineStringEnterHandler : EnterHandlerDelegateAdapter() {
         }
 
 
-        fun getLiteralCalls(str: KtStringTemplateExpression): Sequence<KtCallExpression> {
+        private fun getLiteralCalls(str: KtStringTemplateExpression): Sequence<KtCallExpression> {
             var previous: PsiElement = str
             return str.parents
                     .takeWhile { parent ->
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt
index bad7c205a1d..6317ced773a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt
@@ -44,6 +44,6 @@ class KotlinMissingForOrWhileBodyFixer : SmartEnterProcessorWithFixers.Fixer<Kot
         doc.insertString(rParen.range.end, "{}")
     }
 
-    fun KtLoopExpression.isValidLoopCondition() = leftParenthesis != null && rightParenthesis != null
+    private fun KtLoopExpression.isValidLoopCondition() = leftParenthesis != null && rightParenthesis != null
 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingWhenBodyFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingWhenBodyFixer.kt
index a120c7f09b2..0146031414a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingWhenBodyFixer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingWhenBodyFixer.kt
@@ -39,7 +39,7 @@ class KotlinMissingWhenBodyFixer : SmartEnterProcessorWithFixers.Fixer<KotlinSma
         }
     }
 
-    fun KtWhenExpression.insertOpenBraceAfter(): PsiElement? = when {
+    private fun KtWhenExpression.insertOpenBraceAfter(): PsiElement? = when {
         rightParenthesis != null -> rightParenthesis
         subjectExpression != null -> null
         leftParenthesis != null -> null
diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
index 111a04865f4..0daeed94064 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
@@ -48,10 +48,10 @@ class KotlinFacetEditorGeneralTab(
     ) : JPanel(BorderLayout()) {
         private val isMultiEditor = configuration == null
 
-        var editableCommonArguments: CommonCompilerArguments
-        var editableJvmArguments: K2JVMCompilerArguments
-        var editableJsArguments: K2JSCompilerArguments
-        var editableCompilerSettings: CompilerSettings
+        private var editableCommonArguments: CommonCompilerArguments
+        private var editableJvmArguments: K2JVMCompilerArguments
+        private var editableJsArguments: K2JSCompilerArguments
+        private var editableCompilerSettings: CompilerSettings
 
         val compilerConfigurable: KotlinCompilerConfigurableTab
 
@@ -146,7 +146,7 @@ class KotlinFacetEditorGeneralTab(
             compilerConfigurable.reset()
         }
 
-        val chosenPlatform: TargetPlatformKind<*>?
+        private val chosenPlatform: TargetPlatformKind<*>?
             get() = targetPlatformComboBox.selectedItem as TargetPlatformKind<*>?
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt
index dd65466b1c9..9eaf2a58867 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt
@@ -24,57 +24,52 @@ import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.findUsages.UsageTypeEnum.*
 
 object KotlinUsageTypeProvider : UsageTypeProviderEx {
-    override fun getUsageType(element: PsiElement?): UsageType? {
-        return getUsageType(element, UsageTarget.EMPTY_ARRAY)
-    }
+    override fun getUsageType(element: PsiElement?): UsageType? = getUsageType(element, UsageTarget.EMPTY_ARRAY)
 
     override fun getUsageType(element: PsiElement?, targets: Array<out UsageTarget>): UsageType? {
-        val usageType = UsageTypeUtils.getUsageType(element)
-        if (usageType == null) return null
+        val usageType = UsageTypeUtils.getUsageType(element) ?: return null
         return convertEnumToUsageType(usageType)
     }
 
-    fun convertEnumToUsageType(usageType: UsageTypeEnum): UsageType {
-        return when (usageType) {
-            TYPE_CONSTRAINT -> KotlinUsageTypes.TYPE_CONSTRAINT
-            VALUE_PARAMETER_TYPE -> KotlinUsageTypes.VALUE_PARAMETER_TYPE
-            NON_LOCAL_PROPERTY_TYPE -> KotlinUsageTypes.NON_LOCAL_PROPERTY_TYPE
-            FUNCTION_RETURN_TYPE -> KotlinUsageTypes.FUNCTION_RETURN_TYPE
-            SUPER_TYPE -> KotlinUsageTypes.SUPER_TYPE
-            IS -> KotlinUsageTypes.IS
-            CLASS_OBJECT_ACCESS -> KotlinUsageTypes.CLASS_OBJECT_ACCESS
-            COMPANION_OBJECT_ACCESS -> KotlinUsageTypes.COMPANION_OBJECT_ACCESS
-            EXTENSION_RECEIVER_TYPE -> KotlinUsageTypes.EXTENSION_RECEIVER_TYPE
-            SUPER_TYPE_QUALIFIER -> KotlinUsageTypes.SUPER_TYPE_QUALIFIER
-            TYPE_ALIAS -> KotlinUsageTypes.TYPE_ALIAS
+    fun convertEnumToUsageType(usageType: UsageTypeEnum): UsageType = when (usageType) {
+        TYPE_CONSTRAINT -> KotlinUsageTypes.TYPE_CONSTRAINT
+        VALUE_PARAMETER_TYPE -> KotlinUsageTypes.VALUE_PARAMETER_TYPE
+        NON_LOCAL_PROPERTY_TYPE -> KotlinUsageTypes.NON_LOCAL_PROPERTY_TYPE
+        FUNCTION_RETURN_TYPE -> KotlinUsageTypes.FUNCTION_RETURN_TYPE
+        SUPER_TYPE -> KotlinUsageTypes.SUPER_TYPE
+        IS -> KotlinUsageTypes.IS
+        CLASS_OBJECT_ACCESS -> KotlinUsageTypes.CLASS_OBJECT_ACCESS
+        COMPANION_OBJECT_ACCESS -> KotlinUsageTypes.COMPANION_OBJECT_ACCESS
+        EXTENSION_RECEIVER_TYPE -> KotlinUsageTypes.EXTENSION_RECEIVER_TYPE
+        SUPER_TYPE_QUALIFIER -> KotlinUsageTypes.SUPER_TYPE_QUALIFIER
+        TYPE_ALIAS -> KotlinUsageTypes.TYPE_ALIAS
 
-            FUNCTION_CALL -> KotlinUsageTypes.FUNCTION_CALL
-            IMPLICIT_GET -> KotlinUsageTypes.IMPLICIT_GET
-            IMPLICIT_SET -> KotlinUsageTypes.IMPLICIT_SET
-            IMPLICIT_INVOKE -> KotlinUsageTypes.IMPLICIT_INVOKE
-            IMPLICIT_ITERATION -> KotlinUsageTypes.IMPLICIT_ITERATION
-            PROPERTY_DELEGATION -> KotlinUsageTypes.PROPERTY_DELEGATION
+        FUNCTION_CALL -> KotlinUsageTypes.FUNCTION_CALL
+        IMPLICIT_GET -> KotlinUsageTypes.IMPLICIT_GET
+        IMPLICIT_SET -> KotlinUsageTypes.IMPLICIT_SET
+        IMPLICIT_INVOKE -> KotlinUsageTypes.IMPLICIT_INVOKE
+        IMPLICIT_ITERATION -> KotlinUsageTypes.IMPLICIT_ITERATION
+        PROPERTY_DELEGATION -> KotlinUsageTypes.PROPERTY_DELEGATION
 
-            RECEIVER -> KotlinUsageTypes.RECEIVER
-            DELEGATE -> KotlinUsageTypes.DELEGATE
+        RECEIVER -> KotlinUsageTypes.RECEIVER
+        DELEGATE -> KotlinUsageTypes.DELEGATE
 
-            PACKAGE_DIRECTIVE -> KotlinUsageTypes.PACKAGE_DIRECTIVE
-            PACKAGE_MEMBER_ACCESS -> KotlinUsageTypes.PACKAGE_MEMBER_ACCESS
+        PACKAGE_DIRECTIVE -> KotlinUsageTypes.PACKAGE_DIRECTIVE
+        PACKAGE_MEMBER_ACCESS -> KotlinUsageTypes.PACKAGE_MEMBER_ACCESS
 
-            CALLABLE_REFERENCE -> KotlinUsageTypes.CALLABLE_REFERENCE
+        CALLABLE_REFERENCE -> KotlinUsageTypes.CALLABLE_REFERENCE
 
-            READ -> UsageType.READ
-            WRITE -> UsageType.WRITE
-            CLASS_IMPORT -> UsageType.CLASS_IMPORT
-            CLASS_LOCAL_VAR_DECLARATION -> UsageType.CLASS_LOCAL_VAR_DECLARATION
-            TYPE_PARAMETER -> UsageType.TYPE_PARAMETER
-            CLASS_CAST_TO -> UsageType.CLASS_CAST_TO
-            ANNOTATION -> UsageType.ANNOTATION
-            CLASS_NEW_OPERATOR -> UsageType.CLASS_NEW_OPERATOR
-            NAMED_ARGUMENT -> KotlinUsageTypes.NAMED_ARGUMENT
+        READ -> UsageType.READ
+        WRITE -> UsageType.WRITE
+        CLASS_IMPORT -> UsageType.CLASS_IMPORT
+        CLASS_LOCAL_VAR_DECLARATION -> UsageType.CLASS_LOCAL_VAR_DECLARATION
+        TYPE_PARAMETER -> UsageType.TYPE_PARAMETER
+        CLASS_CAST_TO -> UsageType.CLASS_CAST_TO
+        ANNOTATION -> UsageType.ANNOTATION
+        CLASS_NEW_OPERATOR -> UsageType.CLASS_NEW_OPERATOR
+        NAMED_ARGUMENT -> KotlinUsageTypes.NAMED_ARGUMENT
 
-            USAGE_IN_STRING_LITERAL -> UsageType.LITERAL_USAGE
-        }
+        USAGE_IN_STRING_LITERAL -> UsageType.LITERAL_USAGE
     }
 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt b/idea/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt
index 2205dd1e194..14bf9cfb0bf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt
@@ -50,7 +50,8 @@ import kotlin.collections.ArrayList
 class KotlinLanguageInjector(
         val configuration: Configuration,
         val project: Project,
-        val temporaryPlacesRegistry: TemporaryPlacesRegistry) : MultiHostInjector {
+        val temporaryPlacesRegistry: TemporaryPlacesRegistry
+) : MultiHostInjector {
     companion object {
         private val STRING_LITERALS_REGEXP = "\"([^\"]*)\"".toRegex()
         private val ABSENT_KOTLIN_INJECTION = BaseInjection("ABSENT_KOTLIN_BASE_INJECTION")
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertLambdaToReferenceIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertLambdaToReferenceIntention.kt
index 3420130175c..48dbce51ca1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertLambdaToReferenceIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertLambdaToReferenceIntention.kt
@@ -50,7 +50,7 @@ open class ConvertLambdaToReferenceIntention(text: String) :
 
     open fun buildReferenceText(element: KtLambdaExpression) = buildReferenceText(lambdaExpression = element, shortTypes = false)
 
-    protected fun KtLambdaArgument.outerCalleeDescriptor(): FunctionDescriptor? {
+    private fun KtLambdaArgument.outerCalleeDescriptor(): FunctionDescriptor? {
         val outerCallExpression = parent as? KtCallExpression ?: return null
         val context = outerCallExpression.analyze()
         val outerCallee = outerCallExpression.calleeExpression as? KtReferenceExpression ?: return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
index c9d2ee2e8fb..7bee90517c2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPrimaryConstructorToSecondaryIntention.kt
@@ -143,7 +143,7 @@ class ConvertPrimaryConstructorToSecondaryIntention : SelfTargetingIntention<KtP
         element.delete()
     }
 
-    fun convertValueParametersToProperties(
+    private fun convertValueParametersToProperties(
             element: KtPrimaryConstructor, klass: KtClass, factory: KtPsiFactory, anchorBefore: PsiElement?
     ) {
         for (valueParameter in element.valueParameters.reversed()) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReferenceToLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReferenceToLambdaIntention.kt
index 3d45096bbdc..b64106279c0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReferenceToLambdaIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReferenceToLambdaIntention.kt
@@ -39,7 +39,7 @@ class ConvertReferenceToLambdaInspection : IntentionBasedInspection<KtCallableRe
 class ConvertReferenceToLambdaIntention : SelfTargetingOffsetIndependentIntention<KtCallableReferenceExpression>(
         KtCallableReferenceExpression::class.java, "Convert reference to lambda"
 ) {
-    val SOURCE_RENDERER = IdeDescriptorRenderers.SOURCE_CODE
+    private val SOURCE_RENDERER = IdeDescriptorRenderers.SOURCE_CODE
 
     override fun applyTo(element: KtCallableReferenceExpression, editor: Editor?) {
         val context = element.analyze(BodyResolveMode.PARTIAL)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MovePropertyToClassBodyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MovePropertyToClassBodyIntention.kt
index 0b0d6b6a3d1..09f30d1b17d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/MovePropertyToClassBodyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MovePropertyToClassBodyIntention.kt
@@ -71,7 +71,7 @@ class MovePropertyToClassBodyIntention : SelfTargetingIntention<KtParameter>(KtP
         if (hasVararg) element.addModifier(KtTokens.VARARG_KEYWORD)
     }
 
-    fun KtAnnotationEntry.isAppliedToProperty(): Boolean {
+    private fun KtAnnotationEntry.isAppliedToProperty(): Boolean {
         useSiteTarget?.getAnnotationUseSiteTarget()?.let {
             return it == AnnotationUseSiteTarget.FIELD
                    || it == AnnotationUseSiteTarget.PROPERTY
@@ -83,7 +83,7 @@ class MovePropertyToClassBodyIntention : SelfTargetingIntention<KtParameter>(KtP
         return !isApplicableToConstructorParameter()
     }
 
-    fun KtAnnotationEntry.isAppliedToConstructorParameter(): Boolean {
+    private fun KtAnnotationEntry.isAppliedToConstructorParameter(): Boolean {
         useSiteTarget?.getAnnotationUseSiteTarget()?.let {
             return it == AnnotationUseSiteTarget.CONSTRUCTOR_PARAMETER
         }
@@ -91,19 +91,19 @@ class MovePropertyToClassBodyIntention : SelfTargetingIntention<KtParameter>(KtP
         return isApplicableToConstructorParameter()
     }
 
-    fun KtAnnotationEntry.isApplicableToConstructorParameter(): Boolean {
+    private fun KtAnnotationEntry.isApplicableToConstructorParameter(): Boolean {
         val context = analyze(BodyResolveMode.PARTIAL)
         val descriptor = context[BindingContext.ANNOTATION, this] ?: return false
         val applicableTargets = AnnotationChecker.applicableTargetSet(descriptor)
         return applicableTargets.contains(KotlinTarget.VALUE_PARAMETER)
     }
 
-    fun KtAnnotationEntry.textWithoutUseSite() = "@" + typeReference?.text.orEmpty() + valueArgumentList?.text.orEmpty()
+    private fun KtAnnotationEntry.textWithoutUseSite() = "@" + typeReference?.text.orEmpty() + valueArgumentList?.text.orEmpty()
 
-    fun KtAnnotationUseSiteTarget.removeWithColon() {
+    private fun KtAnnotationUseSiteTarget.removeWithColon() {
         nextSibling?.delete() // ':' symbol after use site
         delete()
     }
 
-    fun KtPrimaryConstructor.isNotContainedInAnnotation() = !getContainingClassOrObject().isAnnotation()
+    private fun KtPrimaryConstructor.isNotContainedInAnnotation() = !getContainingClassOrObject().isAnnotation()
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MovePropertyToConstructorIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MovePropertyToConstructorIntention.kt
index 7165ee189a2..dbb75dd9cd7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/MovePropertyToConstructorIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MovePropertyToConstructorIntention.kt
@@ -132,7 +132,7 @@ class MovePropertyToConstructorIntention :
         return parameterDescriptor.source.getPsi() as? KtParameter
     }
 
-    fun KtAnnotationEntry.isApplicableToConstructorParameter(): Boolean {
+    private fun KtAnnotationEntry.isApplicableToConstructorParameter(): Boolean {
         val context = analyze(BodyResolveMode.PARTIAL)
         val descriptor = context[BindingContext.ANNOTATION, this] ?: return false
         val applicableTargets = AnnotationChecker.applicableTargetSet(descriptor)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/UsePropertyAccessSyntaxIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/UsePropertyAccessSyntaxIntention.kt
index 3c5ba588cb8..13c985ee1b1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/UsePropertyAccessSyntaxIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/UsePropertyAccessSyntaxIntention.kt
@@ -69,7 +69,7 @@ class UsePropertyAccessSyntaxInspection : IntentionBasedInspection<KtCallExpress
 
     val fqNameList = mutableListOf<FqNameUnsafe>()
 
-    var fqNameStrings: List<String>
+    private var fqNameStrings: List<String>
         get() = fqNameList.map { it.asString() }
         set(value) {
             fqNameList.clear()
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedFoldingUtils.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedFoldingUtils.kt
index 4ec6e13fb49..989c18a9a5c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedFoldingUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedFoldingUtils.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.psiUtil.lastBlockStatementOrThis
 import org.jetbrains.kotlin.types.typeUtil.isNothing
 
 object BranchedFoldingUtils {
-    fun getFoldableBranchedAssignment(branch: KtExpression?): KtBinaryExpression? {
+    private fun getFoldableBranchedAssignment(branch: KtExpression?): KtBinaryExpression? {
         fun checkAssignment(expression: KtBinaryExpression): Boolean {
             if (expression.operationToken !in KtTokens.ALL_ASSIGNMENTS) return false
 
@@ -52,7 +52,7 @@ object BranchedFoldingUtils {
                 it.getTargetLabel() == null
             }
 
-    fun checkAssignmentsMatch(a1: KtBinaryExpression, a2: KtBinaryExpression): Boolean =
+    private fun checkAssignmentsMatch(a1: KtBinaryExpression, a2: KtBinaryExpression): Boolean =
             a1.left?.text == a2.left?.text && a1.operationToken == a2.operationToken
 
     internal fun getFoldableAssignmentNumber(expression: KtExpression?): Int {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/Condition.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/Condition.kt
index 3384051f4c4..c807af89d5a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/Condition.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/Condition.kt
@@ -57,7 +57,7 @@ interface Condition {
     }
 }
 
-class AtomicCondition(val expression: KtExpression, val isNegated: Boolean = false) : Condition {
+class AtomicCondition(val expression: KtExpression, private val isNegated: Boolean = false) : Condition {
     init {
         assert(expression.isPhysical)
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerServiceImpl.kt b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerServiceImpl.kt
index b95b08ff0cb..23e09906b85 100644
--- a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerServiceImpl.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerServiceImpl.kt
@@ -60,7 +60,7 @@ class KotlinDecompilerServiceImpl : KotlinDecompilerService {
         return resultSaver.resultText
     }
 
-    fun bytecodeMapForExistingClassfile(file: VirtualFile): Map<File, () -> ByteArray> {
+    private fun bytecodeMapForExistingClassfile(file: VirtualFile): Map<File, () -> ByteArray> {
         val mask = "${file.nameWithoutExtension}$"
         val files =
                 mapOf(file.path to file) +
@@ -73,7 +73,7 @@ class KotlinDecompilerServiceImpl : KotlinDecompilerService {
         }
     }
 
-    fun bytecodeMapForSourceFile(file: KtFile): Map<File, () -> ByteArray> {
+    private fun bytecodeMapForSourceFile(file: KtFile): Map<File, () -> ByteArray> {
         val configuration = CompilerConfiguration().apply {
             languageVersionSettings = file.languageVersionSettings
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt b/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt
index c78d5b7a57b..2276e897e53 100644
--- a/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt
@@ -179,7 +179,7 @@ object KDocRenderer {
         fun child(type: IElementType): MarkdownNode? = children.firstOrNull { it.type == type }
     }
 
-    fun MarkdownNode.visit(action: (MarkdownNode, () -> Unit) -> Unit) {
+    private fun MarkdownNode.visit(action: (MarkdownNode, () -> Unit) -> Unit) {
         action(this) {
             for (child in children) {
                 child.visit(action)
@@ -187,7 +187,7 @@ object KDocRenderer {
         }
     }
 
-    fun MarkdownNode.toHtml(): String {
+    private fun MarkdownNode.toHtml(): String {
         if (node.type == MarkdownTokenTypes.WHITE_SPACE) {
             return text   // do not trim trailing whitespace
         }
@@ -311,11 +311,11 @@ object KDocRenderer {
         return sb.toString().trimEnd()
     }
 
-    fun StringBuilder.trimEnd() {
+    private fun StringBuilder.trimEnd() {
         while (length > 0 && this[length - 1] == ' ') {
             deleteCharAt(length - 1)
         }
     }
 
-    fun String.htmlEscape(): String = replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
+    private fun String.htmlEscape(): String = replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddLoopLabelFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddLoopLabelFix.kt
index fafeca2b312..893ccb87016 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddLoopLabelFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddLoopLabelFix.kt
@@ -25,7 +25,10 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 import org.jetbrains.kotlin.psi.psiUtil.parents
 
-class AddLoopLabelFix(loop: KtLoopExpression, val jumpExpression: KtExpressionWithLabel): KotlinQuickFixAction<KtLoopExpression>(loop) {
+class AddLoopLabelFix(
+        loop: KtLoopExpression,
+        private val jumpExpression: KtExpressionWithLabel
+): KotlinQuickFixAction<KtLoopExpression>(loop) {
 
     private val existingLabelName = (loop.parent as? KtLabeledExpression)?.getLabelName()
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddReifiedToTypeParameterOfFunctionFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddReifiedToTypeParameterOfFunctionFix.kt
index e6774d0589a..070a219cf47 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddReifiedToTypeParameterOfFunctionFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddReifiedToTypeParameterOfFunctionFix.kt
@@ -48,7 +48,7 @@ class AddReifiedToTypeParameterOfFunctionFix(
         val function: KtNamedFunction
 ) : AddModifierFix(typeParameter, KtTokens.REIFIED_KEYWORD) {
 
-    val inlineFix = AddInlineToFunctionWithReifiedFix(function)
+    private val inlineFix = AddInlineToFunctionWithReifiedFix(function)
 
     override fun getText() = element?.let { "Make ${getElementName(it)} reified and ${getElementName(function)} inline" } ?: ""
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddTypeAnnotationToValueParameterFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddTypeAnnotationToValueParameterFix.kt
index 17d62760e5d..5af1c78fcd1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddTypeAnnotationToValueParameterFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddTypeAnnotationToValueParameterFix.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getType
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
 class AddTypeAnnotationToValueParameterFix(element: KtParameter) : KotlinQuickFixAction<KtParameter>(element) {
-    val typeNameShort : String?
+    private val typeNameShort : String?
     val typeName: String?
 
     init {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityFix.kt
index f76bff3a216..d6150ef3bbc 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityFix.kt
@@ -35,8 +35,8 @@ import org.jetbrains.kotlin.resolve.ExposedVisibilityChecker
 
 open class ChangeVisibilityFix(
         element: KtModifierListOwner,
-        protected val elementName: String,
-        protected val visibilityModifier: KtModifierKeywordToken
+        private val elementName: String,
+        private val visibilityModifier: KtModifierKeywordToken
 ) : KotlinQuickFixAction<KtModifierListOwner>(element) {
 
     override fun getText() = "Make '$elementName' $visibilityModifier"
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt
index 08373c2af5d..3bc597274dc 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt
@@ -48,7 +48,7 @@ class CreateExtensionCallableFromUsageFix<E : KtElement>(
 
 abstract class CreateCallableFromUsageFixBase<E : KtElement>(
         originalExpression: E,
-        val callableInfos: List<CallableInfo>,
+        private val callableInfos: List<CallableInfo>,
         val isExtension: Boolean
 ) : CreateFromUsageFixBase<E>(originalExpression) {
     init {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableMemberFromUsageFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableMemberFromUsageFactory.kt
index 7f52b510f86..173fbad81eb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableMemberFromUsageFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableMemberFromUsageFactory.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.KtElement
 import java.util.*
 
 abstract class CreateCallableMemberFromUsageFactory<E : KtElement>(
-        val extensionsSupported: Boolean = true
+        private val extensionsSupported: Boolean = true
 ) : KotlinIntentionActionFactoryWithDelegate<E, List<CallableInfo>>() {
     private fun newCallableQuickFix(
             originalElementPointer: SmartPsiElementPointer<E>,
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt
index 937340584da..5414bab59d6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt
@@ -64,7 +64,10 @@ data class ClassInfo(
         val parameterInfos: List<ParameterInfo> = Collections.emptyList()
 )
 
-open class CreateClassFromUsageFix<E : KtElement> protected constructor (element: E, val classInfo: ClassInfo): CreateFromUsageFixBase<E>(element) {
+open class CreateClassFromUsageFix<E : KtElement> protected constructor (
+        element: E,
+        private val classInfo: ClassInfo
+): CreateFromUsageFixBase<E>(element) {
     override fun getText() = "Create ${classInfo.kind.description} '${classInfo.name}'"
 
     override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createTypeAlias/CreateTypeAliasFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createTypeAlias/CreateTypeAliasFromUsageFix.kt
index 032af91c095..6ac648a9eb3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createTypeAlias/CreateTypeAliasFromUsageFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createTypeAlias/CreateTypeAliasFromUsageFix.kt
@@ -41,7 +41,7 @@ class TypeAliasInfo(
 
 class CreateTypeAliasFromUsageFix<E : KtElement>(
         element: E,
-        val aliasInfo: TypeAliasInfo
+        private val aliasInfo: TypeAliasInfo
 ) : CreateFromUsageFixBase<E>(element), LowPriorityAction {
     override fun getText() = "Create type alias '${aliasInfo.name}'"
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceProtectedToPublishedApiCallFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceProtectedToPublishedApiCallFix.kt
index a3a625b9587..c6d6d3087f9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceProtectedToPublishedApiCallFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceProtectedToPublishedApiCallFix.kt
@@ -83,7 +83,7 @@ class ReplaceProtectedToPublishedApiCallFix(
     }
 
     companion object : KotlinSingleIntentionActionFactory() {
-        val signatureRenderer = IdeDescriptorRenderers.SOURCE_CODE.withOptions {
+        private val signatureRenderer = IdeDescriptorRenderers.SOURCE_CODE.withOptions {
             defaultParameterValueRenderer = null
             startFromDeclarationKeyword = true
             withoutReturnType = true
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt
index a3e68f315c6..8af7267394b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt
@@ -66,13 +66,13 @@ fun runChangeSignature(project: Project,
     return KotlinChangeSignature(project, callableDescriptor, configuration, defaultValueContext, commandName).run()
 }
 
-class KotlinChangeSignature(project: Project,
-                                   callableDescriptor: CallableDescriptor,
-                                   val configuration: KotlinChangeSignatureConfiguration,
-                                   val defaultValueContext: PsiElement,
-                                   commandName: String?): CallableRefactoring<CallableDescriptor>(project,
-                                                                                               callableDescriptor,
-                                                                                               commandName ?: ChangeSignatureHandler.REFACTORING_NAME) {
+class KotlinChangeSignature(
+        project: Project,
+        callableDescriptor: CallableDescriptor,
+        val configuration: KotlinChangeSignatureConfiguration,
+        val defaultValueContext: PsiElement,
+        commandName: String?
+): CallableRefactoring<CallableDescriptor>(project, callableDescriptor, commandName ?: ChangeSignatureHandler.REFACTORING_NAME) {
 
     private val LOG = Logger.getInstance(KotlinChangeSignature::class.java)
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt
index 5f9f7a6d183..1f225977fef 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt
@@ -47,9 +47,9 @@ class KotlinChangePropertySignatureDialog(
     private val nameField = EditorTextField(methodDescriptor.name)
     private var returnTypeField: EditorTextField by Delegates.notNull()
     private var receiverTypeCheckBox: JCheckBox? = null
-    var receiverTypeLabel: JLabel by Delegates.notNull()
+    private var receiverTypeLabel: JLabel by Delegates.notNull()
     private var receiverTypeField: EditorTextField by Delegates.notNull()
-    var receiverDefaultValueLabel: JLabel? = null
+    private var receiverDefaultValueLabel: JLabel? = null
     private var receiverDefaultValueField: EditorTextField? = null
 
     init {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
index 275b504a075..7be25b9bd4c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
@@ -393,7 +393,7 @@ class KotlinChangeSignatureDialog(
         return KotlinChangeSignatureProcessor(myProject, changeInfo, commandName ?: title)
     }
 
-    fun getMethodDescriptor(): KotlinMethodDescriptor = myMethod
+    private fun getMethodDescriptor(): KotlinMethodDescriptor = myMethod
 
     override fun getSelectedIdx(): Int {
         return myMethod.parameters.withIndex().firstOrNull { it.value.isNewParameter }?.index
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt
index 8ccffa7c4d0..e1e12470ea3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt
@@ -252,7 +252,7 @@ class KotlinFunctionCallUsage(
             val resolvedArgument: ResolvedValueArgument?,
             val receiverValue: ReceiverValue?
     ) {
-        val mainValueArgument: ValueArgument?
+        private val mainValueArgument: ValueArgument?
             get() = resolvedArgument?.arguments?.firstOrNull()
 
         val wasNamed: Boolean
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperHandlerBase.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperHandlerBase.kt
index fc6297bc273..73191b73650 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperHandlerBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperHandlerBase.kt
@@ -77,7 +77,7 @@ abstract class KotlinExtractSuperHandlerBase(private val isExtractInterface: Boo
         return true
     }
 
-    fun selectElements(klass: KtClassOrObject, project: Project, editor: Editor?) {
+    private fun selectElements(klass: KtClassOrObject, project: Project, editor: Editor?) {
         val containers = klass.getExtractionContainers(strict = true, includeAll = true) + SeparateFileWrapper(klass.manager)
 
         if (editor == null) return doInvoke(klass, containers.first(), project, editor)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
index ae492f6854e..adcdca1ee45 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtFile
 
 class ExtractKotlinFunctionHandler(
-        val allContainersEnabled: Boolean = false,
+        private val allContainersEnabled: Boolean = false,
         private val helper: ExtractionEngineHelper = ExtractKotlinFunctionHandler.InteractiveExtractionHelper) : RefactoringActionHandler {
 
     object InteractiveExtractionHelper : ExtractionEngineHelper(EXTRACT_FUNCTION) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
index 4de97a64277..30c50510803 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
@@ -451,7 +451,7 @@ interface KotlinIntroduceLambdaParameterHelper: KotlinIntroduceParameterHelper {
 open class KotlinIntroduceLambdaParameterHandler(
         helper: KotlinIntroduceLambdaParameterHelper = KotlinIntroduceLambdaParameterHelper.Default
 ): KotlinIntroduceParameterHandler(helper) {
-    val extractLambdaHelper = object: ExtractionEngineHelper(INTRODUCE_LAMBDA_PARAMETER) {
+    private val extractLambdaHelper = object: ExtractionEngineHelper(INTRODUCE_LAMBDA_PARAMETER) {
         private fun createDialog(
                 project: Project,
                 editor: Editor,
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/IntroduceTypeAliasHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/IntroduceTypeAliasHandler.kt
index 96775e1b2ce..92e822bdd57 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/IntroduceTypeAliasHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/IntroduceTypeAliasHandler.kt
@@ -48,7 +48,7 @@ open class KotlinIntroduceTypeAliasHandler : RefactoringActionHandler {
         val INSTANCE = KotlinIntroduceTypeAliasHandler()
     }
 
-    fun selectElements(editor: Editor, file: KtFile, continuation: (elements: List<PsiElement>, targetSibling: PsiElement) -> Unit) {
+    private fun selectElements(editor: Editor, file: KtFile, continuation: (elements: List<PsiElement>, targetSibling: PsiElement) -> Unit) {
         selectElementsWithTargetSibling(
                 REFACTORING_NAME,
                 editor,
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
index b70c33af0e8..10e41c21700 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
@@ -449,7 +449,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
         }
     }
 
-    fun doRefactoring(
+    private fun doRefactoring(
             project: Project,
             editor: Editor?,
             expression: KtExpression,
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/AutocreatingPsiDirectoryWrapper.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/AutocreatingPsiDirectoryWrapper.kt
index 042c473838a..11f2378685b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/AutocreatingPsiDirectoryWrapper.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/AutocreatingPsiDirectoryWrapper.kt
@@ -21,12 +21,12 @@ import com.intellij.refactoring.MoveDestination
 import org.jetbrains.kotlin.idea.core.getPackage
 
 sealed class AutocreatingPsiDirectoryWrapper {
-    class ByPsiDirectory(val psiDirectory: PsiDirectory) : AutocreatingPsiDirectoryWrapper() {
+    class ByPsiDirectory(private val psiDirectory: PsiDirectory) : AutocreatingPsiDirectoryWrapper() {
         override fun getPackageName(): String = psiDirectory.getPackage()?.qualifiedName ?: ""
         override fun getOrCreateDirectory(source: PsiDirectory) = psiDirectory
     }
 
-    class ByMoveDestination(val moveDestination: MoveDestination) : AutocreatingPsiDirectoryWrapper() {
+    class ByMoveDestination(private val moveDestination: MoveDestination) : AutocreatingPsiDirectoryWrapper() {
         override fun getPackageName() = moveDestination.targetPackage.qualifiedName
         override fun getOrCreateDirectory(source: PsiDirectory) = moveDestination.getTargetDirectory(source)
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinAwareMoveFilesOrDirectoriesDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinAwareMoveFilesOrDirectoriesDialog.kt
index 49d454cbc6b..bfd4b42571f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinAwareMoveFilesOrDirectoriesDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinAwareMoveFilesOrDirectoriesDialog.kt
@@ -157,7 +157,7 @@ class KotlinAwareMoveFilesOrDirectoriesDialog(
 
     override fun doHelpAction() = HelpManager.getInstance().invokeHelp(helpID)
 
-    fun isOpenInEditor(): Boolean {
+    private fun isOpenInEditor(): Boolean {
         if (ApplicationManager.getApplication().isUnitTestMode) return false
         return PropertiesComponent.getInstance().getBoolean(MOVE_FILES_OPEN_IN_EDITOR, false)
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
index 02b32459093..14802dbedb4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
@@ -430,7 +430,7 @@ fun postProcessMoveUsages(
 
 var KtFile.updatePackageDirective: Boolean? by UserDataProperty(Key.create("UPDATE_PACKAGE_DIRECTIVE"))
 
-sealed class OuterInstanceReferenceUsageInfo(element: PsiElement, val isIndirectOuter: Boolean) : UsageInfo(element) {
+sealed class OuterInstanceReferenceUsageInfo(element: PsiElement, private val isIndirectOuter: Boolean) : UsageInfo(element) {
     open fun reportConflictIfAny(conflicts: MultiMap<PsiElement, String>): Boolean {
         val element = element ?: return false
 
@@ -453,7 +453,7 @@ sealed class OuterInstanceReferenceUsageInfo(element: PsiElement, val isIndirect
     class ImplicitReceiver(
             callElement: KtElement,
             isIndirectOuter: Boolean,
-            val isDoubleReceiver: Boolean
+            private val isDoubleReceiver: Boolean
     ) : OuterInstanceReferenceUsageInfo(callElement, isIndirectOuter) {
         val callElement: KtElement?
             get() = element as? KtElement
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpData.kt
index 29d7afa3a47..625c6245d11 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpData.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpData.kt
@@ -60,7 +60,7 @@ class KotlinPullUpData(val sourceClass: KtClassOrObject,
 
     val targetClassSuperResolvedCall = superEntryForTargetClass.getResolvedCall(sourceClassContext)
 
-    val typeParametersInSourceClassContext by lazy {
+    private val typeParametersInSourceClassContext by lazy {
         sourceClassDescriptor.declaredTypeParameters +
         sourceClass.getResolutionScope(sourceClassContext, resolutionFacade)
                 .collectDescriptorsFiltered(DescriptorKindFilter.NON_SINGLETON_CLASSIFIERS)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownDialog.kt
index 2c2405558e6..b1007fd6aa3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownDialog.kt
@@ -51,7 +51,7 @@ class KotlinPushDownDialog(
 
     private var memberInfoModel: MemberInfoModel<KtNamedDeclaration, KotlinMemberInfo>? = null
 
-    val selectedMemberInfos: List<KotlinMemberInfo>
+    private val selectedMemberInfos: List<KotlinMemberInfo>
         get() = memberInfos.filter { it.isChecked && memberInfoModel?.isMemberEnabled(it) ?: false }
 
     override fun getDimensionServiceKey() = "#" + this::class.java.name
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt
index 8728f437e8b..e6228dfec30 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt
@@ -284,7 +284,7 @@ class RenameKotlinPropertyProcessor : RenameKotlinPsiProcessor() {
         }
     }
 
-    class PropertyMethodWrapper(val propertyMethod: PsiMethod) : PsiNamedElement by propertyMethod, NavigationItem by propertyMethod {
+    class PropertyMethodWrapper(private val propertyMethod: PsiMethod) : PsiNamedElement by propertyMethod, NavigationItem by propertyMethod {
         override fun getName() = propertyMethod.name
         override fun setName(name: String) = this
         override fun copy() = this
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinTranslator.kt b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinTranslator.kt
index ec8d9b53233..183728004c6 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinTranslator.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinTranslator.kt
@@ -27,7 +27,7 @@ object JavaToKotlinTranslator {
         return PsiFileFactory.getInstance(project).createFileFromText("test.java", JavaLanguage.INSTANCE, text)
     }
 
-    fun prettify(code: String?): String {
+    private fun prettify(code: String?): String {
         if (code == null) {
             return ""
         }
diff --git a/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt b/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt
index 69787e648af..ad7d34f9ab6 100644
--- a/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt
+++ b/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt
@@ -244,7 +244,7 @@ abstract class AnnotationCollectorExtensionBase(val supportInheritedAnnotations:
 
 class AnnotationCollectorExtension(
         override val annotationFilterList: List<String>? = null,
-        val outputFilename: String? = null,
+        private val outputFilename: String? = null,
         supportInheritedAnnotations: Boolean
 ) : AnnotationCollectorExtensionBase(supportInheritedAnnotations) {