Code cleanup: removed redundant semicolons

ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt

@@ -87,7 +87,7 @@ abstract class KotlinCompilerBaseTask : Task() {
         val compiler = compilerClass.newInstance()
         val exec = compilerClass.getMethod("execFullPathsInMessages", PrintStream::class.java, Array<String>::class.java)
 
-        log("Compiling ${src!!.list().toList()} => [${output!!.canonicalPath}]");
+        log("Compiling ${src!!.list().toList()} => [${output!!.canonicalPath}]")
 
         val result = exec(compiler, System.err, args.toTypedArray())
         exitCode = (result as Enum<*>).ordinal

compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt

@@ -39,7 +39,7 @@ object CodegenUtilKt {
             toInterface: ClassDescriptor,
             delegateExpressionType: KotlinType? = null
     ): Map<CallableMemberDescriptor, CallableDescriptor> {
-        if (delegateExpressionType?.isDynamic() ?: false) return mapOf();
+        if (delegateExpressionType?.isDynamic() ?: false) return mapOf()
 
         return descriptor.defaultType.memberScope.getContributedDescriptors().asSequence()
             .filterIsInstance<CallableMemberDescriptor>()

compiler/backend/src/org/jetbrains/kotlin/codegen/BranchedValue.kt

@@ -43,13 +43,13 @@ open class BranchedValue(
         v.visitLabel(branchJumpLabel)
         v.iconst(0)
         v.visitLabel(endLabel)
-        coerceTo(type, v);
+        coerceTo(type, v)
     }
 
     open fun condJump(jumpLabel: Label, v: InstructionAdapter, jumpIfFalse: Boolean) {
         if (arg1 is CondJump) arg1.condJump(jumpLabel, v, jumpIfFalse) else arg1.put(operandType, v)
         arg2?.put(operandType, v)
-        v.visitJumpInsn(patchOpcode(if (jumpIfFalse) opcode else negatedOperations[opcode]!!, v), jumpLabel);
+        v.visitJumpInsn(patchOpcode(if (jumpIfFalse) opcode else negatedOperations[opcode]!!, v), jumpLabel)
     }
 
     open fun loopJump(jumpLabel: Label, v: InstructionAdapter, jumpIfFalse: Boolean) {

compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.codegen;
+package org.jetbrains.kotlin.codegen
 
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.org.objectweb.asm.Type

compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.codegen;
+package org.jetbrains.kotlin.codegen
 
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind

compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultCallArgs.kt

@@ -42,7 +42,7 @@ class DefaultCallArgs(val size: Int) {
         for (i in 0..size - 1) {
             if (i != 0 && i % Integer.SIZE == 0) {
                 masks.add(mask)
-                mask = 0;
+                mask = 0
             }
             mask = mask or if (bits.get(i)) 1 shl (i % Integer.SIZE) else 0
         }
@@ -61,6 +61,6 @@ class DefaultCallArgs(val size: Int) {
             val parameterType = if (isConstructor) AsmTypes.DEFAULT_CONSTRUCTOR_MARKER else AsmTypes.OBJECT_TYPE
             callGenerator.putValueIfNeeded(parameterType, StackValue.constant(null, parameterType))
         }
-        return toInts.isNotEmpty();
+        return toInts.isNotEmpty()
     }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt

@@ -156,7 +156,7 @@ class DefaultParameterValueSubstitutor(val state: GenerationState) {
             val delegateOwner = delegateFunctionDescriptor.containingDeclaration
             if (delegateOwner is ClassDescriptor && delegateOwner.isCompanionObject) {
                 val singletonValue = StackValue.singleton(delegateOwner, typeMapper)
-                singletonValue.put(singletonValue.type, v);
+                singletonValue.put(singletonValue.type, v)
             }
         }
 

compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt

@@ -149,7 +149,7 @@ class InterfaceImplBodyCodegen(
     override fun generateKotlinMetadataAnnotation() {
         (v as InterfaceImplClassBuilder).stopCounting()
 
-        writeSyntheticClassMetadata(v);
+        writeSyntheticClassMetadata(v)
     }
 
     override fun done() {

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AsmTypeRemapper.kt

@@ -29,7 +29,7 @@ class AsmTypeRemapper(val typeRemapper: TypeRemapper, val isDefaultGeneration: B
 
     override fun createRemappingSignatureAdapter(v: SignatureVisitor?): SignatureVisitor {
         if (isDefaultGeneration) {
-            return super.createRemappingSignatureAdapter(v);
+            return super.createRemappingSignatureAdapter(v)
         }
 
         return object : RemappingSignatureAdapter(v, this) {

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt

@@ -71,7 +71,7 @@ abstract class CoveringTryCatchNodeProcessor(parameterSize: Int) {
         }
 
         Collections.sort<TryCatchBlockNodeInfo>(intervals, comp)
-        return intervals;
+        return intervals
     }
 
     protected fun substituteTryBlockNodes(node: MethodNode) {

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt

@@ -84,7 +84,7 @@ class ReifiedTypeInliner(private val parametersMapping: TypeParameterMappings?)
                     Opcodes.INVOKESTATIC,
                     IntrinsicMethods.INTRINSICS_CLASS_NAME, NEED_CLASS_REIFICATION_MARKER_METHOD_NAME,
                     Type.getMethodDescriptor(Type.VOID_TYPE), false
-            );
+            )
         }
     }
 

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt

@@ -113,7 +113,7 @@ open class NestedSourceMapper(
             value, key ->
             if (key.dest in value) 0 else RangeMapping.Comparator.compare(value, key)
         })
-        return if (index < 0) null else ranges[index];
+        return if (index < 0) null else ranges[index]
     }
 }
 
@@ -188,7 +188,7 @@ open class DefaultSourceMapper(val sourceInfo: SourceInfo) : SourceMapper {
 
     protected val origin: RawFileMapping
 
-    var callSiteMarker: CallSiteMarker? = null;
+    var callSiteMarker: CallSiteMarker? = null
         set(value) {
             lastMappedWithChanges = null
             field = value

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TransformationInfo.kt

@@ -105,6 +105,6 @@ class AnonymousObjectTransformationInfo internal constructor(
     }
 
     override fun createTransformer(inliningContext: InliningContext, sameModule: Boolean): ObjectTransformer<*> {
-        return AnonymousObjectTransformer(this, inliningContext, sameModule);
+        return AnonymousObjectTransformer(this, inliningContext, sameModule)
     }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayGet.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics
 
 import org.jetbrains.kotlin.codegen.AsmUtil.correctElementType
 import org.jetbrains.kotlin.codegen.Callable

compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/BinaryOp.kt

@@ -37,8 +37,8 @@ class BinaryOp(private val opcode: Int) : IntrinsicMethod() {
 
         return createBinaryIntrinsicCallable(returnType, paramType, operandType) {
             v ->
-                v.visitInsn(returnType.getOpcode(opcode));
-                if (operandType != returnType)
+                v.visitInsn(returnType.getOpcode(opcode))
+            if (operandType != returnType)
                     StackValue.coerce(operandType, returnType, v)
         }
     }

compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt

@@ -169,7 +169,7 @@ object TypeIntrinsics {
     private val OBJECT_TYPE = Type.getObjectType("java/lang/Object")
 
     private fun getAsMutableCollectionDescriptor(asmType: Type): String =
-            Type.getMethodDescriptor(asmType, OBJECT_TYPE);
+            Type.getMethodDescriptor(asmType, OBJECT_TYPE)
 
     private val BEFORE_CHECKCAST_TO_FUNCTION_OF_ARITY = "beforeCheckcastToFunctionOfArity"
 

compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.codegen.optimization.boxing;
+package org.jetbrains.kotlin.codegen.optimization.boxing
 
 import com.google.common.collect.ImmutableSet
 import org.jetbrains.kotlin.codegen.AsmUtil

compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingInterpreter.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.codegen.optimization.boxing;
+package org.jetbrains.kotlin.codegen.optimization.boxing
 
 import com.google.common.collect.ImmutableSet
 import org.jetbrains.org.objectweb.asm.Opcodes

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt

@@ -56,7 +56,7 @@ open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
             PathUtil.getKotlinPathsForCompiler()
 
         messageSeverityCollector.report(CompilerMessageSeverity.LOGGING, "Using Kotlin home directory " + paths.homePath, CompilerMessageLocation.NO_LOCATION)
-        PerformanceCounter.setTimeCounterEnabled(arguments.reportPerf);
+        PerformanceCounter.setTimeCounterEnabled(arguments.reportPerf)
 
         val configuration = CompilerConfiguration()
         configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageSeverityCollector)
@@ -280,9 +280,9 @@ open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
             configuration.put(JVMConfigurationKeys.DISABLE_INLINE, arguments.noInline)
             configuration.put(JVMConfigurationKeys.DISABLE_OPTIMIZATION, arguments.noOptimize)
             configuration.put(JVMConfigurationKeys.DECLARATIONS_JSON_PATH, arguments.declarationsOutputPath)
-            configuration.put(JVMConfigurationKeys.INHERIT_MULTIFILE_PARTS, arguments.inheritMultifileParts);
-            configuration.put(CLIConfigurationKeys.ALLOW_KOTLIN_PACKAGE, arguments.allowKotlinPackage);
-            configuration.put(CLIConfigurationKeys.REPORT_PERF, arguments.reportPerf);
+            configuration.put(JVMConfigurationKeys.INHERIT_MULTIFILE_PARTS, arguments.inheritMultifileParts)
+            configuration.put(CLIConfigurationKeys.ALLOW_KOTLIN_PACKAGE, arguments.allowKotlinPackage)
+            configuration.put(CLIConfigurationKeys.REPORT_PERF, arguments.reportPerf)
         }
 
         private fun getClasspath(paths: KotlinPaths, arguments: K2JVMCompilerArguments): List<File> {

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt

@@ -29,7 +29,7 @@ class JvmPackagePartProvider(val env: KotlinCoreEnvironment) : PackagePartProvid
         env.configuration.getList(CommonConfigurationKeys.CONTENT_ROOTS).
                 filterIsInstance<JvmClasspathRoot>().
                 mapNotNull {
-                    env.contentRootToVirtualFile(it);
+                    env.contentRootToVirtualFile(it)
                 }.filter { it.findChild("META-INF") != null }.toMutableList()
     }
 

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

@@ -128,7 +128,7 @@ object KotlinToJVMBytecodeCompiler {
 
         result.throwIfError()
 
-        val generationStates = ArrayList<GenerationState>();
+        val generationStates = ArrayList<GenerationState>()
 
         for (module in chunk) {
             ProgressIndicatorAndCompilationCanceledStatus.checkCanceled()
@@ -144,7 +144,7 @@ object KotlinToJVMBytecodeCompiler {
                                            module.getModuleName(),  onIndependentPartCompilationEnd)
 
             outputFiles.put(module, generationState.factory)
-            generationStates.add(generationState);
+            generationStates.add(generationState)
         }
 
         try {
@@ -156,7 +156,7 @@ object KotlinToJVMBytecodeCompiler {
         }
         finally {
             for (generationState in generationStates) {
-                generationState.destroy();
+                generationState.destroy()
             }
         }
     }
@@ -435,7 +435,7 @@ object KotlinToJVMBytecodeCompiler {
 
         AnalyzerWithCompilerReport.reportBytecodeVersionErrors(
                 generationState.extraJvmDiagnosticsTrace.bindingContext, environment.messageCollector()
-        );
+        )
 
         ProgressIndicatorAndCompilationCanceledStatus.checkCanceled()
         return generationState

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/reader/ConsoleReplCommandReader.kt

@@ -29,7 +29,7 @@ class ConsoleReplCommandReader : ReplCommandReader {
     }
 
     override fun readLine(next: ReplFromTerminal.WhatNextAfterOneLine): String? {
-        val prompt = if (next == ReplFromTerminal.WhatNextAfterOneLine.INCOMPLETE) "... " else ">>> ";
+        val prompt = if (next == ReplFromTerminal.WhatNextAfterOneLine.INCOMPLETE) "... " else ">>> "
         return consoleReader.readLine(prompt)
     }
 

compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt

@@ -275,7 +275,7 @@ class CompileServiceImpl(
         }
 
         val stub = UnicastRemoteObject.exportObject(this, port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory) as CompileService
-        registry.rebind (COMPILER_SERVICE_RMI_NAME, stub);
+        registry.rebind (COMPILER_SERVICE_RMI_NAME, stub)
 
         timer.schedule(0) {
             initiateElections()

compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt

@@ -71,11 +71,11 @@ fun isContainedByCompiledPartOfOurModule(descriptor: DeclarationDescriptor, outD
         val file = binaryClass.file
         if (file.fileSystem.protocol == StandardFileSystems.FILE_PROTOCOL) {
             val ioFile = VfsUtilCore.virtualToIoFile(file)
-            return ioFile.absolutePath.startsWith(outDirectory.absolutePath + File.separator);
+            return ioFile.absolutePath.startsWith(outDirectory.absolutePath + File.separator)
         }
     }
 
-    return false;
+    return false
 }
 
 fun getSourceElement(descriptor: DeclarationDescriptor): SourceElement =

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedInSuperClassCompanionCallChecker.kt

@@ -42,7 +42,7 @@ class ProtectedInSuperClassCompanionCallChecker : CallChecker {
             if (!parentClassDescriptors.any { DescriptorUtils.isSubclass(it, companionOwnerDescriptor) }) return
             // Called not within the same companion object or its owner class
             if (companionDescriptor !in parentClassDescriptors && companionOwnerDescriptor !in parentClassDescriptors) {
-                context.trace.report(ErrorsJvm.SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC.on(resolvedCall.call.callElement));
+                context.trace.report(ErrorsJvm.SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC.on(resolvedCall.call.callElement))
             }
         }
     }

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/annotationCheckers.kt

@@ -49,7 +49,7 @@ object RepeatableAnnotationChecker: AdditionalAnnotationChecker {
             if (duplicateAnnotation
                 && classDescriptor.isRepeatableAnnotation()
                 && classDescriptor.getAnnotationRetention() != KotlinRetention.SOURCE) {
-                trace.report(ErrorsJvm.NON_SOURCE_REPEATED_ANNOTATION.on(entry));
+                trace.report(ErrorsJvm.NON_SOURCE_REPEATED_ANNOTATION.on(entry))
             }
 
             existingTargetsForAnnotation.add(useSiteTarget)

compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt

@@ -131,7 +131,7 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
         val propertyType = getMethod.returnType!!
 
         val descriptor = MyPropertyDescriptor.create(ownerClass, getMethod.original, setMethod?.original, name, propertyType)
-        return result(descriptor, possibleGetMethodNames, setMethodName);
+        return result(descriptor, possibleGetMethodNames, setMethodName)
     }
 
     private fun isGoodGetMethod(descriptor: FunctionDescriptor): Boolean {

compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.cfg
 
-import org.jetbrains.kotlin.psi.*;
+import org.jetbrains.kotlin.psi.*
 import com.intellij.psi.PsiElement
 import com.intellij.psi.tree.TokenSet
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns

compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt

@@ -63,9 +63,9 @@ class KDocLinkParser(): PsiParser {
         }
         else {
             if (!builder.eof()) {
-                builder.error("Expression expected");
+                builder.error("Expression expected")
                 while (!builder.eof()) {
-                    builder.advanceLexer();
+                    builder.advanceLexer()
                 }
             }
         }

compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt

@@ -107,14 +107,14 @@ abstract class KtClassOrObject :
     fun isAnnotation(): Boolean = hasModifier(KtTokens.ANNOTATION_KEYWORD)
 
     override fun delete() {
-        CheckUtil.checkWritable(this);
+        CheckUtil.checkWritable(this)
 
-        val file = getContainingKtFile();
+        val file = getContainingKtFile()
         if (!isTopLevel() || file.declarations.size > 1) {
             super.delete()
         }
         else {
-            file.delete();
+            file.delete()
         }
     }
 }

compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt

@@ -38,7 +38,7 @@ abstract class KtCodeFragment(
         private val context: PsiElement?
 ): KtFile((PsiManager.getInstance(_project) as PsiManagerEx).fileManager.createFileViewProvider(LightVirtualFile(name, KotlinFileType.INSTANCE, text), true), false), JavaCodeFragment {
 
-    private var viewProvider = super<KtFile>.getViewProvider() as SingleRootFileViewProvider
+    private var viewProvider = super.getViewProvider() as SingleRootFileViewProvider
     private var imports = LinkedHashSet<String>()
 
     init {
@@ -68,7 +68,7 @@ abstract class KtCodeFragment(
 
     override fun getContext() = context
 
-    override fun getResolveScope() = context?.resolveScope ?: super<KtFile>.getResolveScope()
+    override fun getResolveScope() = context?.resolveScope ?: super.getResolveScope()
 
     override fun clone(): KtCodeFragment {
         val clone = cloneImpl(calcTreeElement().clone() as FileElement) as KtCodeFragment

compiler/frontend/src/org/jetbrains/kotlin/psi/KtConstructor.kt

@@ -87,7 +87,7 @@ abstract class KtConstructor<T : KtConstructor<T>> : KtDeclarationStub<KotlinPla
     override fun getTextOffset(): Int {
         return getConstructorKeyword()?.getTextOffset()
                ?: getValueParameterList()?.getTextOffset()
-               ?: super<KtDeclarationStub>.getTextOffset()
+               ?: super.getTextOffset()
     }
 
     override fun getUseScope(): SearchScope {

compiler/frontend/src/org/jetbrains/kotlin/psi/KtEnumEntrySuperclassReferenceExpression.kt

@@ -54,7 +54,7 @@ class KtEnumEntrySuperclassReferenceExpression :
     }
 
     override fun getReferencedNameAsName(): Name {
-        return referencedElement.getName()?.let { Name.identifier(it) } ?: SpecialNames.NO_NAME_PROVIDED;
+        return referencedElement.getName()?.let { Name.identifier(it) } ?: SpecialNames.NO_NAME_PROVIDED
     }
 
     override fun getReferencedNameElement(): PsiElement {

compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionImpl.kt

@@ -30,7 +30,7 @@ abstract class KtExpressionImpl(node: ASTNode) : KtElementImpl(node), KtExpressi
     }
 
     override fun replace(newElement: PsiElement): PsiElement {
-        return replaceExpression(this, newElement, { super<KtElementImpl>.replace(it) })
+        return replaceExpression(this, newElement, { super.replace(it) })
     }
 
     companion object {

compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt

@@ -89,7 +89,7 @@ class AnnotationChecker(private val additionalCheckers: Iterable<AdditionalAnnot
                                       || (existingTargetsForAnnotation.any { (it == null) != (useSiteTarget == null) })
 
             if (duplicateAnnotation && !classDescriptor.isRepeatableAnnotation()) {
-                trace.report(Errors.REPEATED_ANNOTATION.on(entry));
+                trace.report(Errors.REPEATED_ANNOTATION.on(entry))
             }
 
             existingTargetsForAnnotation.add(useSiteTarget)

compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationChecker.kt

@@ -26,6 +26,6 @@ interface DeclarationChecker {
             declaration: KtDeclaration,
             descriptor: DeclarationDescriptor,
             diagnosticHolder: DiagnosticSink,
-            bindingContext: BindingContext);
+            bindingContext: BindingContext)
 
 }

compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegationResolver.kt

@@ -69,9 +69,9 @@ class DelegationResolver<T : CallableMemberDescriptor> private constructor(
         val alreadyDelegated = delegatedMembers.firstOrNull { isOverridableBy(it, candidate) }
         if (alreadyDelegated != null) {
             trace.report(MANY_IMPL_MEMBER_NOT_IMPLEMENTED.on(classOrObject, classOrObject, alreadyDelegated))
-            return true;
+            return true
         }
-        return false;
+        return false
     }
 
 

compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt

@@ -272,7 +272,7 @@ object ModifierCheckerCore {
         for (second in children) {
             for (first in children) {
                 if (first == second) {
-                    break;
+                    break
                 }
                 checkCompatibility(trace, first, second, list.owner, incorrectNodes)
             }

compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt

@@ -85,11 +85,11 @@ private class ExplicitTypeBinding(
             // todo fix for List<*>
             val jetTypeReference = psiTypeArguments[index]
             val jetTypeElement = jetTypeReference?.typeElement
-            if (jetTypeElement == null) return@map null;
+            if (jetTypeElement == null) return@map null
 
             if (isErrorBinding) {
                 val nextJetType = trace[BindingContext.TYPE, jetTypeReference]
-                if (nextJetType == null) return@map null;
+                if (nextJetType == null) return@map null
 
                 return@map TypeArgumentBindingImpl(
                         TypeProjectionImpl(nextJetType),

compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt

@@ -96,7 +96,7 @@ class TypeResolver(
 
             val lazyKotlinType = LazyKotlinType()
             c.trace.record(BindingContext.TYPE, typeReference, lazyKotlinType)
-            return type(lazyKotlinType);
+            return type(lazyKotlinType)
         }
 
         val type = doResolvePossiblyBareType(c, typeReference)

compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt

@@ -207,7 +207,7 @@ class VarianceCheckerCore(
             when (descriptor) {
                 is FunctionDescriptorImpl -> descriptor.visibility = Visibilities.PRIVATE_TO_THIS
                 is PropertyDescriptorImpl -> {
-                    descriptor.visibility = Visibilities.PRIVATE_TO_THIS;
+                    descriptor.visibility = Visibilities.PRIVATE_TO_THIS
                     for (accessor in descriptor.accessors) {
                         (accessor as PropertyAccessorDescriptorImpl).visibility = Visibilities.PRIVATE_TO_THIS
                     }

compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt

@@ -161,7 +161,7 @@ class CandidateResolver(
                     val candidateReflectionType = getReflectionTypeForCandidateDescriptor(
                             candidate, reflectionTypes,
                             call.callElement.parent.let { it is KtCallableReferenceExpression && it.isEmptyLHS }
-                    );
+                    )
                     if (candidateReflectionType != null) {
                         if (!KotlinTypeChecker.DEFAULT.isSubtypeOf(candidateReflectionType, expectedType)) {
                             candidateCall.addStatus(OTHER_ERROR)
@@ -384,7 +384,7 @@ class CandidateResolver(
                         val dataFlowValue = DataFlowValueFactory.createDataFlowValue(expression, type, context)
                         val smartCastResult = SmartCastManager.checkAndRecordPossibleCast(dataFlowValue, expectedType, expression, context, null, false)
                         if (smartCastResult == null || !smartCastResult.isCorrect) {
-                            context.trace.report(Errors.SPREAD_OF_NULLABLE.on(spreadElement));
+                            context.trace.report(Errors.SPREAD_OF_NULLABLE.on(spreadElement))
                         }
                     }
                 }

compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt

@@ -250,7 +250,7 @@ private class ConstantExpressionEvaluatorVisitor(
         private fun createStringConstant(compileTimeConstant: CompileTimeConstant<*>): TypedCompileTimeConstant<String>? {
             val constantValue = compileTimeConstant.toConstantValue(TypeUtils.NO_EXPECTED_TYPE)
             if (constantValue.isStandaloneOnlyConstant()) {
-                return null;
+                return null
             }
             return when (constantValue) {
                 is ErrorValue, is EnumValue -> return null
@@ -533,7 +533,7 @@ private class ConstantExpressionEvaluatorVisitor(
     }
 
     override fun visitSimpleNameExpression(expression: KtSimpleNameExpression, expectedType: KotlinType?): CompileTimeConstant<*>? {
-        val enumDescriptor = trace.bindingContext.get(BindingContext.REFERENCE_TARGET, expression);
+        val enumDescriptor = trace.bindingContext.get(BindingContext.REFERENCE_TARGET, expression)
         if (enumDescriptor != null && DescriptorUtils.isEnumEntry(enumDescriptor)) {
             return factory.createEnumValue(enumDescriptor as ClassDescriptor).wrap()
         }

compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.resolve.inline;
+package org.jetbrains.kotlin.resolve.inline
 
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.diagnostics.Errors

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt

@@ -144,7 +144,7 @@ class LazyAnnotationDescriptor(
 
         @Suppress("UNCHECKED_CAST")
         return resolutionResults.resultingCall.valueArguments
-                .mapValues { val (valueParameter, resolvedArgument) = it;
+                .mapValues { val (valueParameter, resolvedArgument) = it
                     if (resolvedArgument == null) null
                     else c.annotationResolver.getAnnotationArgumentValue(c.trace, valueParameter, resolvedArgument)
                 }

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt

@@ -193,7 +193,7 @@ open class LazyClassMemberScope(
             if (descriptor.kind != FAKE_OVERRIDE && descriptor.kind != DELEGATION) {
                 OverridingUtil.resolveUnknownVisibilityForMember(descriptor, OverrideResolver.createCannotInferVisibilityReporter(trace))
             }
-            VarianceCheckerCore(trace.bindingContext, DiagnosticSink.DO_NOTHING).recordPrivateToThisIfNeeded(descriptor);
+            VarianceCheckerCore(trace.bindingContext, DiagnosticSink.DO_NOTHING).recordPrivateToThisIfNeeded(descriptor)
         }
     }
 

compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt

@@ -189,7 +189,7 @@ internal class FunctionsTypingVisitor(facade: ExpressionTypingInternals) : Expre
             functionTypeExpected: Boolean
     ): KotlinType {
         val expectedReturnType = if (functionTypeExpected) getReturnTypeFromFunctionType(context.expectedType) else null
-        val returnType = computeUnsafeReturnType(expression, context, functionDescriptor, expectedReturnType);
+        val returnType = computeUnsafeReturnType(expression, context, functionDescriptor, expectedReturnType)
 
         if (!expression.functionLiteral.hasDeclaredReturnType() && functionTypeExpected) {
             if (!TypeUtils.noExpectedType(expectedReturnType!!) && KotlinBuiltIns.isUnit(expectedReturnType)) {

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClass.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.asJava;
+package org.jetbrains.kotlin.asJava
 
-import com.intellij.psi.PsiClass;
-import org.jetbrains.kotlin.name.FqName;
+import com.intellij.psi.PsiClass
+import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtClassOrObject
 
 interface KtLightClass : PsiClass, KtLightDeclaration<KtClassOrObject, PsiClass> {

compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tasks/synthesizedInvokes.kt

@@ -88,8 +88,8 @@ private fun createSynthesizedFunctionWithFirstParameterAsReceiver(descriptor: Fu
     result.isExternal = original.isExternal
     result.isInline = original.isInline
     result.isTailrec = original.isTailrec
-    result.setHasStableParameterNames(false);
-    result.setHasSynthesizedParameterNames(true);
+    result.setHasStableParameterNames(false)
+    result.setHasSynthesizedParameterNames(true)
 
     return result
 }

compiler/tests-common/org/jetbrains/kotlin/codegen/InlineTestUtil.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.codegen;
+package org.jetbrains.kotlin.codegen
 
 import org.jetbrains.kotlin.backend.common.output.OutputFile
 import org.jetbrains.kotlin.inline.inlineFunctionsJvmNames

compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt

@@ -57,7 +57,7 @@ class KotlinClassFinderTest : KotlinTestWithEnvironmentManagement() {
         val className = "test.A.B.C"
         val psiClass = JavaPsiFacade.getInstance(project).findClass(className, GlobalSearchScope.allScope(project))
         assertNotNull(psiClass, "Psi class not found for $className")
-        assertTrue(psiClass !is KtLightClass, "Kotlin light classes are not not expected");
+        assertTrue(psiClass !is KtLightClass, "Kotlin light classes are not not expected")
 
         val binaryClass = JvmVirtualFileFinder.SERVICE.getInstance(project).findKotlinClass(JavaClassImpl(psiClass!!))
         assertNotNull(binaryClass, "No binary class for $className")

compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt

@@ -171,7 +171,7 @@ class CapturedTypeApproximationTest : KotlinTestWithEnvironment() {
     }
 
     fun testSimpleT() {
-        doTest("simpleT.txt", "T");
+        doTest("simpleT.txt", "T")
     }
 
     fun testNullableT() {
@@ -179,19 +179,19 @@ class CapturedTypeApproximationTest : KotlinTestWithEnvironment() {
     }
 
     fun testUseSiteInT() {
-        doTest("useSiteInT.txt", "in T");
+        doTest("useSiteInT.txt", "in T")
     }
 
     fun testUseSiteInNullableT() {
-        doTest("useSiteInNullableT.txt", "in T?");
+        doTest("useSiteInNullableT.txt", "in T?")
     }
 
     fun testUseSiteOutT() {
-        doTest("useSiteOutT.txt", "out T");
+        doTest("useSiteOutT.txt", "out T")
     }
 
     fun testUseSiteOutNullableT() {
-        doTest("useSiteOutNullableT.txt", "out T?");
+        doTest("useSiteOutNullableT.txt", "out T?")
     }
 
     fun testTwoVariables() {

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt

@@ -550,7 +550,7 @@ class LazyJavaClassMemberScope(
         constructorDescriptor.initialize(valueParameters, getConstructorVisibility(classDescriptor))
         constructorDescriptor.setHasStableParameterNames(true)
         constructorDescriptor.returnType = classDescriptor.defaultType
-        c.components.javaResolverCache.recordConstructor(jClass, constructorDescriptor);
+        c.components.javaResolverCache.recordConstructor(jClass, constructorDescriptor)
         return constructorDescriptor
     }
 

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt

@@ -258,7 +258,7 @@ abstract class LazyJavaScope(protected val c: LazyJavaResolverContext) : MemberS
                     })
         }
 
-        c.components.javaResolverCache.recordField(field, propertyDescriptor);
+        c.components.javaResolverCache.recordField(field, propertyDescriptor)
 
         return propertyDescriptor
     }

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt

@@ -134,7 +134,7 @@ fun <T : Any> mapType(
         descriptor is TypeParameterDescriptor -> {
             val type = mapType(getRepresentativeUpperBound(descriptor),
                             factory, mode, typeMappingConfiguration, writeGenericType = DO_NOTHING_3, descriptorTypeWriter = null)
-            descriptorTypeWriter?.writeTypeVariable(descriptor.getName(), type);
+            descriptorTypeWriter?.writeTypeVariable(descriptor.getName(), type)
             return type
         }
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageFragmentDescriptorImpl.kt

@@ -32,7 +32,7 @@ abstract class PackageFragmentDescriptorImpl(
             visitor.visitPackageFragmentDescriptor(this, data)
 
     override fun getContainingDeclaration(): ModuleDescriptor {
-        return super<DeclarationDescriptorNonRootImpl>.getContainingDeclaration() as ModuleDescriptor
+        return super.getContainingDeclaration() as ModuleDescriptor
     }
 
     override fun getSource(): SourceElement {

core/descriptors/src/org/jetbrains/kotlin/types/DisjointKeysUnionTypeSubstitution.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.types;
+package org.jetbrains.kotlin.types
 
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 

core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt

@@ -139,7 +139,7 @@ abstract class DelegatingFlexibleType protected constructor(
         @Suppress("UNCHECKED_CAST")
         return when(capabilityClass) {
             Flexibility::class.java, SubtypingRepresentatives::class.java -> this as T
-            else -> super<DelegatingType>.getCapability(capabilityClass)
+            else -> super.getCapability(capabilityClass)
         }
     }
 

core/deserialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.serialization;
+package org.jetbrains.kotlin.serialization
 
 import com.google.protobuf.ExtensionRegistryLite
 import com.google.protobuf.GeneratedMessageLite.GeneratedExtension

eval4j/src/org/jetbrains/eval4j/members.kt

@@ -38,7 +38,7 @@ open class MemberDescription protected constructor(
     }
 
     override fun hashCode(): Int {
-        var result = 13;
+        var result = 13
         result = result * 23 + ownerInternalName.hashCode()
         result = result * 23 + name.hashCode()
         result = result * 23 + desc.hashCode()

eval4j/test/org/jetbrains/eval4j/test/main.kt

@@ -353,7 +353,7 @@ fun MethodDescription.matches(ctor: Constructor<*>): Boolean {
         if (!p.matches(methodParams[i])) return false
     }
 
-    return true;
+    return true
 }
 
 fun MethodDescription.matches(method: Method): Boolean {

generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt

@@ -375,7 +375,7 @@ val SHOULD_NOT_BE_ESCAPED = JsFunctionScope.RESERVED_WORDS.filter { it !in SHOUL
 val s1 = SHOULD_BE_ESCAPED.cyclicSequence()
 val s2 = SHOULD_NOT_BE_ESCAPED.cyclicSequence()
 
-val PORTION_PART_SIZE = 2;
+val PORTION_PART_SIZE = 2
 
 fun nextKeywordPortion() = s1.take(PORTION_PART_SIZE).toList() + s2.take(PORTION_PART_SIZE).toList()
 

idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt

@@ -38,7 +38,7 @@ class KotlinSpacingBuilder(val codeStyleSettings: CodeStyleSettings, val spacing
 
     inner class BasicSpacingBuilder() : SpacingBuilder(codeStyleSettings, KotlinLanguage.INSTANCE), Builder {
         override fun getSpacing(parent: ASTBlock, left: ASTBlock, right: ASTBlock): Spacing? {
-            return super<SpacingBuilder>.getSpacing(parent, left, right)
+            return super.getSpacing(parent, left, right)
         }
     }
 

idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocMissingDocumentationInspection.kt

@@ -50,7 +50,7 @@ class KDocMissingDocumentationInspection(): AbstractKotlinInspection() {
 
             if (element is KtNamedDeclaration) {
                 val nameIdentifier = element.nameIdentifier
-                val descriptor = element.resolveToDescriptor() as? MemberDescriptor;
+                val descriptor = element.resolveToDescriptor() as? MemberDescriptor
                 if (nameIdentifier != null && descriptor?.visibility == Visibilities.PUBLIC) {
                     val hasDocumentation = element.docComment != null ||
                                            (descriptor as? CallableMemberDescriptor)?.overriddenDescriptors

idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt

@@ -100,7 +100,7 @@ class KtSimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleRefere
 
     override fun handleElementRename(newElementName: String?): PsiElement {
         if (!canRename()) throw IncorrectOperationException()
-        if (newElementName == null) return expression;
+        if (newElementName == null) return expression
 
         // Do not rename if the reference corresponds to synthesized component function
         val expressionText = expression.text

idea/idea-android/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt

@@ -83,7 +83,7 @@ class IllegalIdentifierInspection : AbstractKotlinInspection() {
             val editor = editorManager.getSelectedEditor(file.virtualFile) ?: return
             val dataContext = DataManager.getInstance().getDataContext(editor.component)
             val renameHandler = RenameHandlerRegistry.getInstance().getRenameHandler(dataContext)
-            renameHandler?.invoke(project, arrayOf(element), dataContext);
+            renameHandler?.invoke(project, arrayOf(element), dataContext)
         }
     }
 }

idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/DeclarationLookupObjectImpl.kt

@@ -52,7 +52,7 @@ abstract class DeclarationLookupObjectImpl(
                 (psiElement as? PsiClass)?.qualifiedName?.let { FqName(it) }
         }
 
-    override fun toString() = super<DeclarationLookupObject>.toString() + " " + (descriptor ?: psiElement)
+    override fun toString() = super.toString() + " " + (descriptor ?: psiElement)
 
     override fun hashCode(): Int {
         return if (descriptor != null) descriptor.original.hashCode() else psiElement!!.hashCode()

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt

@@ -115,7 +115,7 @@ abstract class CompletionHandlerTestBase() : KotlinLightCodeInsightFixtureTestCa
         if (lookup.currentItem != item) { // do not touch selection if not changed - important for char filter tests
             lookup.currentItem = item
         }
-        lookup.focusDegree = LookupImpl.FocusDegree.FOCUSED;
+        lookup.focusDegree = LookupImpl.FocusDegree.FOCUSED
         if (LookupEvent.isSpecialCompletionChar(completionChar)) {
             (object : WriteCommandAction.Simple<Any>(project) {
                 override fun run(result: Result<Any>) {

idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt

@@ -28,7 +28,7 @@ class ExtraSteppingFilter : com.intellij.debugger.engine.ExtraSteppingFilter {
 
     override fun isApplicable(context: SuspendContext?): Boolean {
         if (context == null) {
-            return false;
+            return false
         }
 
         val debugProcess = context.debugProcess ?: return false
@@ -43,7 +43,7 @@ class ExtraSteppingFilter : com.intellij.debugger.engine.ExtraSteppingFilter {
     private fun shouldFilter(positionManager: KotlinPositionManager, location: Location): Boolean {
         val defaultStrata = location.declaringType()?.defaultStratum()
         if ("Kotlin" != defaultStrata) {
-            return false;
+            return false
         }
 
         val sourcePosition =
@@ -68,7 +68,7 @@ class ExtraSteppingFilter : com.intellij.debugger.engine.ExtraSteppingFilter {
             }
         }
 
-        return false;
+        return false
     }
 
     override fun getStepRequestDepth(context: SuspendContext?): Int {

idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinReferenceTransferableData.kt

@@ -90,7 +90,7 @@ class KotlinReferenceData(
 
     public override fun clone(): KotlinReferenceData {
         try {
-            return super<Cloneable>.clone() as KotlinReferenceData
+            return super.clone() as KotlinReferenceData
         }
         catch (e: CloneNotSupportedException) {
             throw RuntimeException()

idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt

@@ -171,7 +171,7 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
         if (start == null || end == null) return null
 
         val literalsOrFunctions = getLambdasAtLineIfAny(file, lineNumber)
-        if (literalsOrFunctions.isEmpty()) return null;
+        if (literalsOrFunctions.isEmpty()) return null
 
         val elementAt = file.findElementAt(start) ?: return null
         val typeMapper = KotlinDebuggerCaches.getOrCreateTypeMapper(elementAt)

idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt

@@ -161,10 +161,10 @@ class KotlinFieldBreakpointType : JavaBreakpointType<KotlinPropertyBreakpointPro
     override fun getDisplayText(breakpoint: XLineBreakpoint<KotlinPropertyBreakpointProperties>): String? {
         val kotlinBreakpoint = BreakpointManager.getJavaBreakpoint(breakpoint) as? BreakpointWithHighlighter
         if (kotlinBreakpoint != null) {
-            return kotlinBreakpoint.description;
+            return kotlinBreakpoint.description
         }
         else {
-            return super.getDisplayText(breakpoint);
+            return super.getDisplayText(breakpoint)
         }
     }
 

idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt

@@ -67,8 +67,8 @@ class KotlinEnterHandler: EnterHandlerDelegateAdapter() {
         if (elementAt is PsiWhiteSpace && ("\n" in elementAt.getText()!!)) return EnterHandlerDelegate.Result.Continue
 
         // Indent for LBRACE can be removed after fixing IDEA-124917
-        val elementBefore = CodeInsightUtils.getElementAtOffsetIgnoreWhitespaceAfter(file, caretOffset);
-        val elementAfter = CodeInsightUtils.getElementAtOffsetIgnoreWhitespaceBefore(file, caretOffset);
+        val elementBefore = CodeInsightUtils.getElementAtOffsetIgnoreWhitespaceAfter(file, caretOffset)
+        val elementAfter = CodeInsightUtils.getElementAtOffsetIgnoreWhitespaceBefore(file, caretOffset)
 
         val isAfterLBraceOrArrow = elementBefore != null && elementBefore.node!!.elementType in FORCE_INDENT_IN_LAMBDA_AFTER
         val isBeforeRBrace = elementAfter == null || elementAfter.node!!.elementType == KtTokens.RBRACE
@@ -81,7 +81,7 @@ class KotlinEnterHandler: EnterHandlerDelegateAdapter() {
                 CodeStyleManager.getInstance(file.getProject())!!.adjustLineIndent(file, editor.caretModel.offset)
             }
             catch (e: IncorrectOperationException) {
-                LOG.error(e);
+                LOG.error(e)
             }
 
             return EnterHandlerDelegate.Result.DefaultForceIndent

idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionParametersFixer.kt

@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.KtNamedFunction
 
 class KotlinFunctionParametersFixer : SmartEnterProcessorWithFixers.Fixer<KotlinSmartEnterHandler>() {
     override fun apply(editor: Editor, processor: KotlinSmartEnterHandler, psiElement: PsiElement) {
-        if (psiElement !is KtNamedFunction) return;
+        if (psiElement !is KtNamedFunction) return
 
         val parameterList = psiElement.valueParameterList
         if (parameterList == null) {

idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinPropertySetterParametersFixer.kt

@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.psiUtil.endOffset
 
 class KotlinPropertySetterParametersFixer : SmartEnterProcessorWithFixers.Fixer<KotlinSmartEnterHandler>() {
     override fun apply(editor: Editor, processor: KotlinSmartEnterHandler, psiElement: PsiElement) {
-        if (psiElement !is KtPropertyAccessor) return;
+        if (psiElement !is KtPropertyAccessor) return
 
         if (!psiElement.isSetter) return
 

idea/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilter.kt

@@ -154,7 +154,7 @@ class KotlinExceptionFilter(private val searchScope: GlobalSearchScope) : Filter
     }
 
     private fun readDebugInfo(bytes: ByteArray): SmapData? {
-        val cr = ClassReader(bytes);
+        val cr = ClassReader(bytes)
         var debugInfo: String? = null
         cr.accept(object : ClassVisitor(InlineCodegenUtil.API) {
             override fun visitSource(source: String?, debug: String?) {

idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt

@@ -178,7 +178,7 @@ class ConflictingExtensionPropertyInspection : AbstractKotlinInspection(), Clean
     }
 
     private class DeleteRedundantExtensionAction(property: KtProperty) : KotlinQuickFixAction<KtProperty>(property) {
-        private val LOG = Logger.getInstance(DeleteRedundantExtensionAction::class.java);
+        private val LOG = Logger.getInstance(DeleteRedundantExtensionAction::class.java)
 
         override fun getFamilyName() = "Delete redundant extension property"
         override fun getText() = familyName

idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt

@@ -58,13 +58,13 @@ class ConvertPropertyToFunctionIntention : SelfTargetingIntention<KtProperty>(Kt
         private val newName: String = JvmAbi.getterName(callableDescriptor.name.asString())
 
         private fun convertProperty(originalProperty: KtProperty, psiFactory: KtPsiFactory) {
-            val property = originalProperty.copy() as KtProperty;
-            val getter = property.getter;
+            val property = originalProperty.copy() as KtProperty
+            val getter = property.getter
 
-            val sampleFunction = psiFactory.createFunction("fun foo() {\n\n}");
+            val sampleFunction = psiFactory.createFunction("fun foo() {\n\n}")
 
-            property.valOrVarKeyword.replace(sampleFunction.funKeyword!!);
-            property.addAfter(psiFactory.createParameterList("()"), property.nameIdentifier);
+            property.valOrVarKeyword.replace(sampleFunction.funKeyword!!)
+            property.addAfter(psiFactory.createParameterList("()"), property.nameIdentifier)
             if (property.initializer == null) {
                 if (getter != null) {
                     val dropGetterTo = (getter.equalsToken ?: getter.bodyExpression)

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt

@@ -73,11 +73,11 @@ class DoubleBangToIfThenIntention : SelfTargetingRangeIntention<KtPostfixExpress
         val exceptionLookupExpression = ChooseStringExpression(listOf(nullPtrExceptionText, kotlinNullPtrExceptionText))
         val project = element.project
         val builder = TemplateBuilderImpl(thrownExpression)
-        builder.replaceElement(thrownExpression, exceptionLookupExpression);
+        builder.replaceElement(thrownExpression, exceptionLookupExpression)
 
-        PsiDocumentManager.getInstance(project).commitAllDocuments();
-        PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.document);
-        editor.caretModel.moveToOffset(thrownExpression.node!!.startOffset);
+        PsiDocumentManager.getInstance(project).commitAllDocuments()
+        PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.document)
+        editor.caretModel.moveToOffset(thrownExpression.node!!.startOffset)
 
         TemplateManager.getInstance(project).startTemplate(editor, builder.buildInlineTemplate(), object: TemplateEditingAdapter() {
             override fun templateFinished(template: Template?, brokenOff: Boolean) {

idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt

@@ -68,7 +68,7 @@ object KDocRenderer {
                 to.append(", ")
             }
         }
-        to.append("</DD></DL></DD>");
+        to.append("</DD></DL></DD>")
     }
 
     private fun renderTagList(tags: List<KDocTag>, title: String, to: StringBuilder) {

idea/src/org/jetbrains/kotlin/idea/quickfix/RenameUnderscoreFix.kt

@@ -33,7 +33,7 @@ class RenameUnderscoreFix(declaration: KtDeclaration) : KotlinQuickFixAction<KtD
         if (editor == null) return
         val dataContext = DataManager.getInstance().getDataContext(editor.component)
         val renameHandler = RenameHandlerRegistry.getInstance().getRenameHandler(dataContext)
-        renameHandler?.invoke(project, arrayOf(element), dataContext);
+        renameHandler?.invoke(project, arrayOf(element), dataContext)
     }
 
     override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean {

idea/src/org/jetbrains/kotlin/idea/quickfix/WholeProjectModalAction.kt

@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.utils.singletonOrEmptyList
 import java.util.*
 
 abstract class WholeProjectModalAction<TData : Any>(val title: String) : IntentionAction {
-    private val LOG = Logger.getInstance(WholeProjectModalAction::class.java);
+    private val LOG = Logger.getInstance(WholeProjectModalAction::class.java)
 
     override final fun startInWriteAction() = false
 

idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt

@@ -87,7 +87,7 @@ class TypeCandidate(val theType: KotlinType, scope: HierarchicalScope? = null) {
         private set
 
     fun render(typeParameterNameMap: Map<TypeParameterDescriptor, String>, fakeFunction: FunctionDescriptor?) {
-        renderedType = theType.renderShort(typeParameterNameMap);
+        renderedType = theType.renderShort(typeParameterNameMap)
         renderedTypeParameters = typeParameters.map {
             RenderedTypeParameter(it, it.containingDeclaration == fakeFunction, typeParameterNameMap[it]!!)
         }
@@ -97,10 +97,10 @@ class TypeCandidate(val theType: KotlinType, scope: HierarchicalScope? = null) {
         val typeParametersInType = theType.getTypeParameters()
         if (scope == null) {
             typeParameters = typeParametersInType.toTypedArray()
-            renderedType = theType.renderShort(Collections.emptyMap());
+            renderedType = theType.renderShort(Collections.emptyMap())
         }
         else {
-            typeParameters = getTypeParameterNamesNotInScope(typeParametersInType, scope).toTypedArray();
+            typeParameters = getTypeParameterNamesNotInScope(typeParametersInType, scope).toTypedArray()
         }
     }
 
@@ -874,7 +874,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
             }
             modifierList.setModifierProperty(PsiModifier.STATIC, needStatic)
 
-            JavaCodeStyleManager.getInstance(project).shortenClassReferences(newJavaMember);
+            JavaCodeStyleManager.getInstance(project).shortenClassReferences(newJavaMember)
 
             val descriptor = OpenFileDescriptor(project, targetClass.containingFile.virtualFile)
             val targetEditor = FileEditorManager.getInstance(project).openTextEditor(descriptor, true)!!

idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt

@@ -47,7 +47,7 @@ class DeprecatedSymbolUsageInWholeProjectFix(
         private val text: String
 ) : DeprecatedSymbolUsageFixBase(element, replaceWith) {
 
-    private val LOG = Logger.getInstance(DeprecatedSymbolUsageInWholeProjectFix::class.java);
+    private val LOG = Logger.getInstance(DeprecatedSymbolUsageInWholeProjectFix::class.java)
 
     override fun getFamilyName() = "Replace deprecated symbol usage in whole project"
 

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt

@@ -144,7 +144,7 @@ open class KotlinChangeInfo(
     }
 
     fun removeParameter(index: Int) {
-        val parameterInfo = newParameters.removeAt(index);
+        val parameterInfo = newParameters.removeAt(index)
         if (parameterInfo == receiverParameterInfo) {
             receiverParameterInfo = null
         }

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureData.kt

@@ -160,7 +160,7 @@ class KotlinChangeSignatureData(
     }
 
     override fun canChangeVisibility(): Boolean {
-        if (DescriptorUtils.isLocal(baseDescriptor)) return false;
+        if (DescriptorUtils.isLocal(baseDescriptor)) return false
         val parent = baseDescriptor.containingDeclaration
         return !(baseDescriptor is AnonymousFunctionDescriptor || parent is ClassDescriptor && parent.kind == ClassKind.INTERFACE)
     }

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt

@@ -385,7 +385,7 @@ class KotlinChangeSignatureDialog(
                                             methodName,
                                             myDefaultValueContext,
                                             false)
-        changeInfo.primaryPropagationTargets = myMethodsToPropagateParameters ?: emptyList();
+        changeInfo.primaryPropagationTargets = myMethodsToPropagateParameters ?: emptyList()
         return KotlinChangeSignatureProcessor(myProject, changeInfo, commandName ?: title)
     }
 

idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt

@@ -266,7 +266,7 @@ private fun makeCall(
     anchor.nextSibling?.let { from ->
         val to = rangeToReplace.endElement
         if (to != anchor) {
-            anchorParent.deleteChildRange(from, to);
+            anchorParent.deleteChildRange(from, to)
         }
     }
 

idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt

@@ -165,7 +165,7 @@ fun IntroduceParameterDescriptor.performRefactoring() {
             override fun performSilently(affectedFunctions: Collection<PsiElement>): Boolean = true
         }
 
-        val project = callable.project;
+        val project = callable.project
         val changeSignature = { runChangeSignature(project, callableDescriptor, config, callable, INTRODUCE_PARAMETER) }
         changeSignature.runRefactoringWithPostprocessing(project, "refactoring.changeSignature") {
             try {

idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt

@@ -254,7 +254,7 @@ fun <T, E: PsiElement> getPsiElementPopup(
         }
         addListener(object: JBPopupAdapter() {
             override fun onClosed(event: LightweightWindowEvent?) {
-                highlighter?.dropHighlight();
+                highlighter?.dropHighlight()
             }
         })
 

idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberSelectionTable.kt

@@ -61,7 +61,7 @@ class KotlinMemberSelectionTable(
     }
 
     override fun setVisibilityIcon(memberInfo: KotlinMemberInfo, icon: RowIcon) {
-        icon.setIcon(KotlinIconProvider.getVisibilityIcon(memberInfo.member.modifierList), 1);
+        icon.setIcon(KotlinIconProvider.getVisibilityIcon(memberInfo.member.modifierList), 1)
     }
 
     override fun getOverrideIcon(memberInfo: KotlinMemberInfo): Icon? {

idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.refactoring.move.changePackage;
+package org.jetbrains.kotlin.idea.refactoring.move.changePackage
 
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.codeInsight.template.*

idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveDeclarationsDelegate.kt

@@ -95,7 +95,7 @@ sealed class MoveDeclarationsDelegate {
         ) {
             val usageIterator = usages.iterator()
             while (usageIterator.hasNext()) {
-                val usage = usageIterator.next();
+                val usage = usageIterator.next()
                 val element = usage.element ?: continue
 
                 val isConflict = when (usage) {

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt

@@ -39,7 +39,7 @@ class RenameDynamicMemberHandler: VariableInplaceRenameHandler() {
     }
 
     override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) {
-        CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to dynamically invoked members", "Rename", null);
+        CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to dynamically invoked members", "Rename", null)
     }
 
     override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext?) {

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.refactoring.rename;
+package org.jetbrains.kotlin.idea.refactoring.rename
 
 import com.intellij.openapi.editor.Editor
 import com.intellij.psi.PsiElement

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt

@@ -42,13 +42,13 @@ class RenameOnSecondaryConstructorHandler : RenameHandler {
                 file, editor.caretModel.offset, KtSecondaryConstructor::class.java, false,
                 KtBlockExpression::class.java, KtValueArgumentList::class.java, KtParameterList::class.java
         )
-        return element != null;
+        return element != null
     }
 
     override fun isRenaming(dataContext: DataContext?): Boolean = isAvailableOnDataContext(dataContext)
 
     override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) {
-        CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to secondary constructors", "Rename", null);
+        CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to secondary constructors", "Rename", null)
     }
 
     override fun invoke(project: Project, elements: Array<out PsiElement>, dataContext: DataContext?) {

idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt

@@ -262,7 +262,7 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() {
         val virtualFile = file.virtualFile
 
         val runnable = {
-            var offset = -1;
+            var offset = -1
             while (true) {
                 val fileText = document.text
                 offset = fileText.indexOf("point!", offset + 1)

idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt

@@ -217,7 +217,7 @@ abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestBase() {
                         Printer(config).printTree(tree)
 
                         for (extra in getExtraVars()) {
-                            watchesView.addWatchExpression(XExpressionImpl.fromText(extra.text), -1, false);
+                            watchesView.addWatchExpression(XExpressionImpl.fromText(extra.text), -1, false)
                         }
                         Printer(config).printTree(watchesView.tree)
                     }

idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt

@@ -56,5 +56,5 @@ abstract class AbstractSelectExpressionForDebuggerTest : LightCodeInsightFixture
 
     override fun getProjectDescriptor() = KotlinLightProjectDescriptor.INSTANCE
 
-    override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/debugger/selectExpression";
+    override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/debugger/selectExpression"
 }