diff --git a/.idea/inspectionProfiles/Semicolons_only.xml b/.idea/inspectionProfiles/Semicolons_only.xml
new file mode 100644
index 00000000000..8f3256d2d05
--- /dev/null
+++ b/.idea/inspectionProfiles/Semicolons_only.xml
@@ -0,0 +1,2281 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt
index b67a2bcaf1b..417068ef8a8 100644
--- a/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt
+++ b/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::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
diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt
index 6b5cc33c6e3..02914f3e739 100644
--- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt
+++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt
@@ -39,7 +39,7 @@ object CodegenUtilKt {
toInterface: ClassDescriptor,
delegateExpressionType: KotlinType? = null
): Map {
- if (delegateExpressionType?.isDynamic() ?: false) return mapOf();
+ if (delegateExpressionType?.isDynamic() ?: false) return mapOf()
return descriptor.defaultType.memberScope.getContributedDescriptors().asSequence()
.filterIsInstance()
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/BranchedValue.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/BranchedValue.kt
index b578ec06307..12b57a3a838 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/BranchedValue.kt
+++ b/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) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.kt
index d587709a673..f40a68e96f6 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.kt
+++ b/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
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.kt
index 0ae22eef335..2c747bd04f6 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.kt
+++ b/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
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultCallArgs.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultCallArgs.kt
index 2f3528c243a..184f8452f9d 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultCallArgs.kt
+++ b/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()
}
}
\ No newline at end of file
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt
index e5a20782557..0ef0dd506a3 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt
+++ b/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)
}
}
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt
index 61666b35a2d..fe6153aadfc 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt
+++ b/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() {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AsmTypeRemapper.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AsmTypeRemapper.kt
index d9fe1fadf0f..c14a25b631f 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AsmTypeRemapper.kt
+++ b/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) {
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 12a740b4dae..d3e7ce0e558 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt
@@ -71,7 +71,7 @@ abstract class CoveringTryCatchNodeProcessor(parameterSize: Int) {
}
Collections.sort(intervals, comp)
- return intervals;
+ return intervals
}
protected fun substituteTryBlockNodes(node: MethodNode) {
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 6734cc0359a..a623c4e93fa 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt
+++ b/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
- );
+ )
}
}
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 d333635f240..cfea1fb6c99 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
+++ b/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
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 470a51314d4..9c39f481f86 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TransformationInfo.kt
+++ b/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)
}
}
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayGet.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayGet.kt
index 39c291b2518..3b7c8f1f5d6 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayGet.kt
+++ b/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
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/BinaryOp.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/BinaryOp.kt
index d5d4f12ed90..d3bf2457ea7 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/BinaryOp.kt
+++ b/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)
}
}
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt
index c7e4cbf7b86..2947759895b 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/TypeIntrinsics.kt
+++ b/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"
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.kt
index f835f26ec2d..6a399df8665 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.kt
+++ b/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
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingInterpreter.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingInterpreter.kt
index 239b8427fbc..cbd0c7f3f03 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingInterpreter.kt
+++ b/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
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
index 30275344b7f..f105b90d4f8 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
@@ -56,7 +56,7 @@ open class K2JVMCompiler : CLICompiler() {
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() {
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 {
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt
index d78d3b45e76..db11dce27b9 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt
+++ b/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().
mapNotNull {
- env.contentRootToVirtualFile(it);
+ env.contentRootToVirtualFile(it)
}.filter { it.findChild("META-INF") != null }.toMutableList()
}
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
index 3d5d50e2d3d..b03a75497ae 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
@@ -128,7 +128,7 @@ object KotlinToJVMBytecodeCompiler {
result.throwIfError()
- val generationStates = ArrayList();
+ val generationStates = ArrayList()
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
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/reader/ConsoleReplCommandReader.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/reader/ConsoleReplCommandReader.kt
index 0387a2ce563..09936e3c564 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/reader/ConsoleReplCommandReader.kt
+++ b/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)
}
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
index 794b314bea2..50917e01054 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+++ b/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()
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt
index c4f1574d00d..36144d125f6 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt
+++ b/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 =
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedInSuperClassCompanionCallChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedInSuperClassCompanionCallChecker.kt
index 3619aad0000..e16b04c552c 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedInSuperClassCompanionCallChecker.kt
+++ b/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))
}
}
}
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/annotationCheckers.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/annotationCheckers.kt
index 8208631543c..ead84e029e9 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/annotationCheckers.kt
+++ b/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)
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt
index 87b119dd10d..b8038e21291 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt
+++ b/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 {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt
index fb6b5c878ef..77c2dccd961 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt
+++ b/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
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt
index 5f3704c2d17..0ec624f8a3f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt
+++ b/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()
}
}
}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt
index f824985f66d..f5954f3f822 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt
+++ b/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()
}
}
}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt
index a152431acda..c06a3b6c24b 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt
+++ b/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.getViewProvider() as SingleRootFileViewProvider
+ private var viewProvider = super.getViewProvider() as SingleRootFileViewProvider
private var imports = LinkedHashSet()
init {
@@ -68,7 +68,7 @@ abstract class KtCodeFragment(
override fun getContext() = context
- override fun getResolveScope() = context?.resolveScope ?: super.getResolveScope()
+ override fun getResolveScope() = context?.resolveScope ?: super.getResolveScope()
override fun clone(): KtCodeFragment {
val clone = cloneImpl(calcTreeElement().clone() as FileElement) as KtCodeFragment
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtConstructor.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtConstructor.kt
index af24be747fb..7238b5dc0d0 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtConstructor.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtConstructor.kt
@@ -87,7 +87,7 @@ abstract class KtConstructor> : KtDeclarationStub.getTextOffset()
+ ?: super.getTextOffset()
}
override fun getUseScope(): SearchScope {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtEnumEntrySuperclassReferenceExpression.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtEnumEntrySuperclassReferenceExpression.kt
index b7af04ded3c..b2407084281 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtEnumEntrySuperclassReferenceExpression.kt
+++ b/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 {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionImpl.kt
index 9ca66b60b4d..adf272fcf40 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionImpl.kt
+++ b/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.replace(it) })
+ return replaceExpression(this, newElement, { super.replace(it) })
}
companion object {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
index 86c57e3a722..d0b19398b5a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
@@ -89,7 +89,7 @@ class AnnotationChecker(private val additionalCheckers: Iterable 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
}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt
index a60b12c578a..60fe50cd8cb 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt
+++ b/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)
}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt
index 2629900da0c..14935a760f6 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt
+++ b/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),
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
index f2fef4bfe65..6ab89614913 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
+++ b/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)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt
index 3a7abb18901..aa3e4384379 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt
+++ b/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
}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt
index 73ec5f95457..52e3cdb070e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt
+++ b/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))
}
}
}
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 9dd26a37ab0..c0b20a69c13 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
@@ -250,7 +250,7 @@ private class ConstantExpressionEvaluatorVisitor(
private fun createStringConstant(compileTimeConstant: CompileTimeConstant<*>): TypedCompileTimeConstant? {
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()
}
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 227da5008b0..598ce384e44 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.kt
+++ b/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
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt
index 866b41f80d5..d0a2be74139 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt
+++ b/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)
}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
index b8391789327..d4f2ead11d9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
+++ b/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)
}
}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt
index 8ab95ecc096..83badbabd8e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt
+++ b/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)) {
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClass.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClass.kt
index 24496456774..14d319f0948 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClass.kt
+++ b/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 {
diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tasks/synthesizedInvokes.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tasks/synthesizedInvokes.kt
index a89ee3c759d..c3323909153 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tasks/synthesizedInvokes.kt
+++ b/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
}
diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/InlineTestUtil.kt b/compiler/tests-common/org/jetbrains/kotlin/codegen/InlineTestUtil.kt
index ebac772e89a..f9bbfff361e 100644
--- a/compiler/tests-common/org/jetbrains/kotlin/codegen/InlineTestUtil.kt
+++ b/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
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt
index 7be49245380..48b37f3843e 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt
+++ b/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")
diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt
index 3d560715b1b..b7dd86be717 100644
--- a/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt
+++ b/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() {
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt
index caabbde74e0..a7bfa82caec 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+++ b/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
}
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt
index 4a8388f616b..3582c80db03 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt
+++ b/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
}
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt
index c3ab7087df4..98d931de7ec 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt
@@ -134,7 +134,7 @@ fun 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
}
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageFragmentDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageFragmentDescriptorImpl.kt
index d022130edf8..5e4a8f2198d 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageFragmentDescriptorImpl.kt
+++ b/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.getContainingDeclaration() as ModuleDescriptor
+ return super.getContainingDeclaration() as ModuleDescriptor
}
override fun getSource(): SourceElement {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/DisjointKeysUnionTypeSubstitution.kt b/core/descriptors/src/org/jetbrains/kotlin/types/DisjointKeysUnionTypeSubstitution.kt
index 3bfcdd5499f..1db6056108b 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/DisjointKeysUnionTypeSubstitution.kt
+++ b/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
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt
index c9b60c5037f..4b6e630df32 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt
+++ b/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.getCapability(capabilityClass)
+ else -> super.getCapability(capabilityClass)
}
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt
index 227f8f2d49a..bd9ab99f255 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt
+++ b/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
diff --git a/eval4j/src/org/jetbrains/eval4j/members.kt b/eval4j/src/org/jetbrains/eval4j/members.kt
index ff5f18c6bb8..0d8ec619c42 100644
--- a/eval4j/src/org/jetbrains/eval4j/members.kt
+++ b/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()
diff --git a/eval4j/test/org/jetbrains/eval4j/test/main.kt b/eval4j/test/org/jetbrains/eval4j/test/main.kt
index 7edf2af6dfa..6fe45ceeb23 100644
--- a/eval4j/test/org/jetbrains/eval4j/test/main.kt
+++ b/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 {
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt
index 4c2bec461dd..462d3131ec5 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt
+++ b/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()
diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt
index fff92839c7b..5b07c6587b6 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt
+++ b/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.getSpacing(parent, left, right)
+ return super.getSpacing(parent, left, right)
}
}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocMissingDocumentationInspection.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocMissingDocumentationInspection.kt
index 38b5477a69a..2b710f42551 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocMissingDocumentationInspection.kt
+++ b/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
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
index 7b48feb94d1..db8388b4ac5 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
+++ b/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
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 9febda18b56..8ca83c74a8b 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
@@ -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)
}
}
}
\ No newline at end of file
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/DeclarationLookupObjectImpl.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/DeclarationLookupObjectImpl.kt
index d5366f883ef..c60e6b16575 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/DeclarationLookupObjectImpl.kt
+++ b/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.toString() + " " + (descriptor ?: psiElement)
+ override fun toString() = super.toString() + " " + (descriptor ?: psiElement)
override fun hashCode(): Int {
return if (descriptor != null) descriptor.original.hashCode() else psiElement!!.hashCode()
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt
index d72a4268938..6d4b991117b 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt
+++ b/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(project) {
override fun run(result: Result) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt b/idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt
index c80d1ed0906..8f10ee038ae 100644
--- a/idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt
+++ b/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 {
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinReferenceTransferableData.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinReferenceTransferableData.kt
index 556cd0da0ca..95e655381d4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinReferenceTransferableData.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinReferenceTransferableData.kt
@@ -90,7 +90,7 @@ class KotlinReferenceData(
public override fun clone(): KotlinReferenceData {
try {
- return super.clone() as KotlinReferenceData
+ return super.clone() as KotlinReferenceData
}
catch (e: CloneNotSupportedException) {
throw RuntimeException()
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
index c88c5e67493..53d914f731a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
+++ b/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)
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt
index d8767efc086..29acaddb057 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt
@@ -161,10 +161,10 @@ class KotlinFieldBreakpointType : JavaBreakpointType): 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)
}
}
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt
index cbc1592e11b..9ef9477eae6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt
+++ b/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
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionParametersFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionParametersFixer.kt
index 6251144f728..973ab40cbd5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionParametersFixer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionParametersFixer.kt
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.KtNamedFunction
class KotlinFunctionParametersFixer : SmartEnterProcessorWithFixers.Fixer() {
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) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinPropertySetterParametersFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinPropertySetterParametersFixer.kt
index dff3c3fca17..ffc4c9d8b04 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinPropertySetterParametersFixer.kt
+++ b/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() {
override fun apply(editor: Editor, processor: KotlinSmartEnterHandler, psiElement: PsiElement) {
- if (psiElement !is KtPropertyAccessor) return;
+ if (psiElement !is KtPropertyAccessor) return
if (!psiElement.isSetter) return
diff --git a/idea/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilter.kt b/idea/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilter.kt
index 563b9bead07..4620dd4459a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilter.kt
+++ b/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?) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt
index 398d977cd15..94590a20376 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt
@@ -178,7 +178,7 @@ class ConflictingExtensionPropertyInspection : AbstractKotlinInspection(), Clean
}
private class DeleteRedundantExtensionAction(property: KtProperty) : KotlinQuickFixAction(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
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt
index 95a5cd5978e..155f04cbbcb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt
@@ -58,13 +58,13 @@ class ConvertPropertyToFunctionIntention : SelfTargetingIntention(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)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
index 6ab5adff605..c5074f21378 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
@@ -73,11 +73,11 @@ class DoubleBangToIfThenIntention : SelfTargetingRangeIntention");
+ to.append("")
}
private fun renderTagList(tags: List, title: String, to: StringBuilder) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameUnderscoreFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameUnderscoreFix.kt
index 21c89d3a7f8..ca9e603d043 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameUnderscoreFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameUnderscoreFix.kt
@@ -33,7 +33,7 @@ class RenameUnderscoreFix(declaration: KtDeclaration) : KotlinQuickFixAction(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
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index f6edf594e5e..ef768735efa 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/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, 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)!!
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt
index 45c304d63c7..592b18ad94d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt
+++ b/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"
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt
index 7c8324bab24..3a84b8d778d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt
+++ b/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
}
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureData.kt
index e1e86f0794d..cdd3c157c1a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureData.kt
+++ b/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)
}
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 180c8cecbd3..0d96d3b728a 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
@@ -385,7 +385,7 @@ class KotlinChangeSignatureDialog(
methodName,
myDefaultValueContext,
false)
- changeInfo.primaryPropagationTargets = myMethodsToPropagateParameters ?: emptyList();
+ changeInfo.primaryPropagationTargets = myMethodsToPropagateParameters ?: emptyList()
return KotlinChangeSignatureProcessor(myProject, changeInfo, commandName ?: title)
}
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt
index 5d70a2fd510..e3486f4e0c5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt
+++ b/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)
}
}
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 31670c9bae1..35ab1e7744d 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
@@ -165,7 +165,7 @@ fun IntroduceParameterDescriptor.performRefactoring() {
override fun performSilently(affectedFunctions: Collection): 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 {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
index 1db82369061..10eac925aa7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
@@ -254,7 +254,7 @@ fun getPsiElementPopup(
}
addListener(object: JBPopupAdapter() {
override fun onClosed(event: LightweightWindowEvent?) {
- highlighter?.dropHighlight();
+ highlighter?.dropHighlight()
}
})
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberSelectionTable.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberSelectionTable.kt
index 4c16aa42d2a..b5058273239 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberSelectionTable.kt
+++ b/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? {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt
index 8afe56ccafc..61e37a6f709 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt
+++ b/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.*
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveDeclarationsDelegate.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveDeclarationsDelegate.kt
index 6f30ddec975..ed76ea3251c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveDeclarationsDelegate.kt
+++ b/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) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt
index 0fdd925c1c2..dc2e512b303 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt
+++ b/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, dataContext: DataContext?) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt
index 997a062a5e8..b6453ec41e8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt
+++ b/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
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt
index 23b5257fc88..0070e94fa52 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt
+++ b/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, dataContext: DataContext?) {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
index 3e9fbe25f55..3f3929cd65c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
+++ b/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)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt
index e6eefad1056..8512bf7d8fe 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt
+++ b/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)
}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt
index 52c9e1ad7a5..7afca02168c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt
+++ b/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"
}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocNavigationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocNavigationTest.kt
index fea376d6676..898325c17b4 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocNavigationTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocNavigationTest.kt
@@ -33,7 +33,7 @@ class QuickDocNavigationTest() : LightPlatformCodeInsightFixtureTestCase() {
myFixture.configureByFile(getTestName(true) + ".kt")
val source = myFixture.elementAtCaret.getParentOfType(false)
val target = KotlinQuickDocumentationProvider().getDocumentationElementForLink(
- myFixture.psiManager, "C", source);
+ myFixture.psiManager, "C", source)
Assert.assertTrue(target is KtClass)
Assert.assertEquals("C", (target as KtClass).name)
}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightExitPointsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightExitPointsTest.kt
index b6c85796450..a1e35190adf 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightExitPointsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightExitPointsTest.kt
@@ -26,7 +26,7 @@ import kotlin.test.assertEquals
abstract class AbstractHighlightExitPointsTest : LightCodeInsightFixtureTestCase() {
fun doTest(testDataPath: String) {
myFixture.configureByFile(testDataPath)
- HighlightUsagesHandler.invoke(myFixture.project, myFixture.editor, myFixture.file);
+ HighlightUsagesHandler.invoke(myFixture.project, myFixture.editor, myFixture.file)
val text = myFixture.file.text
val expectedToBeHighlighted = InTextDirectivesUtils.findLinesWithPrefixesRemoved(text, "//HIGHLIGHTED:")
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt
index 3263ca46d27..d663db58f3a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.jetbrains.kotlin.idea.quickfix;
+package org.jetbrains.kotlin.idea.quickfix
import com.intellij.testFramework.TestDataPath
import org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/KotlinNamesValidatorTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/KotlinNamesValidatorTest.kt
index a886739d2d6..de1abb33364 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/KotlinNamesValidatorTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/KotlinNamesValidatorTest.kt
@@ -33,31 +33,31 @@ class KotlinNamesValidatorTest : LightCodeInsightFixtureTestCase() {
}
fun testKeywords() {
- Assert.assertTrue(isKeyword("val"));
- Assert.assertTrue(isKeyword("class"));
- Assert.assertTrue(isKeyword("fun"));
+ Assert.assertTrue(isKeyword("val"))
+ Assert.assertTrue(isKeyword("class"))
+ Assert.assertTrue(isKeyword("fun"))
- Assert.assertFalse(isKeyword("constructor"));
- Assert.assertFalse(isKeyword("123"));
- Assert.assertFalse(isKeyword("a.c"));
- Assert.assertFalse(isKeyword("-"));
+ Assert.assertFalse(isKeyword("constructor"))
+ Assert.assertFalse(isKeyword("123"))
+ Assert.assertFalse(isKeyword("a.c"))
+ Assert.assertFalse(isKeyword("-"))
}
fun testIdentifiers() {
- Assert.assertTrue(isIdentifier("abc"));
- Assert.assertTrue(isIdentifier("q_q"));
- Assert.assertTrue(isIdentifier("constructor"));
- Assert.assertTrue(isIdentifier("`val`"));
+ Assert.assertTrue(isIdentifier("abc"))
+ Assert.assertTrue(isIdentifier("q_q"))
+ Assert.assertTrue(isIdentifier("constructor"))
+ Assert.assertTrue(isIdentifier("`val`"))
- Assert.assertFalse(isIdentifier("val"));
- Assert.assertFalse(isIdentifier("class"));
- Assert.assertFalse(isIdentifier("fun"));
+ Assert.assertFalse(isIdentifier("val"))
+ Assert.assertFalse(isIdentifier("class"))
+ Assert.assertFalse(isIdentifier("fun"))
- Assert.assertFalse(isIdentifier("123"));
- Assert.assertFalse(isIdentifier("a.c"));
- Assert.assertFalse(isIdentifier("-"));
- Assert.assertFalse(isIdentifier("``"));
- Assert.assertFalse(isIdentifier(""));
- Assert.assertFalse(isIdentifier(" '"));
+ Assert.assertFalse(isIdentifier("123"))
+ Assert.assertFalse(isIdentifier("a.c"))
+ Assert.assertFalse(isIdentifier("-"))
+ Assert.assertFalse(isIdentifier("``"))
+ Assert.assertFalse(isIdentifier(""))
+ Assert.assertFalse(isIdentifier(" '"))
}
}
diff --git a/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt b/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt
index 181fc106ef7..7e9c93f06fd 100644
--- a/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt
@@ -42,8 +42,8 @@ class StringInjectionHostTest : KotlinTestWithEnvironment() {
}
fun testUnclosedSimpleLiteral() {
- assertFalse(stringExpression("\"").isValidHost);
- assertFalse(stringExpression("\"a").isValidHost);
+ assertFalse(stringExpression("\"").isValidHost)
+ assertFalse(stringExpression("\"a").isValidHost)
}
fun testEscapeSequences() {
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
index 0a12b1976d1..cc3724834cd 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
@@ -71,7 +71,7 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter {
override fun visitArrayAccessExpression(expression: PsiArrayAccessExpression) {
val assignment = expression.getStrictParentOfType()
- val lvalue = assignment != null && expression == assignment.lExpression;
+ val lvalue = assignment != null && expression == assignment.lExpression
result = ArrayAccessExpression(codeConverter.convertExpression(expression.arrayExpression),
codeConverter.convertExpression(expression.indexExpression),
lvalue)
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt
index 6022be77444..4592dc9e837 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt
+++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt
@@ -71,7 +71,7 @@ abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() {
CoreApplicationEnvironment.registerExtensionPoint(projectArea, PsiTreeChangePreprocessor.EP_NAME, PsiTreeChangePreprocessor::class.java)
CoreApplicationEnvironment.registerExtensionPoint(projectArea, PsiElementFinder.EP_NAME, PsiElementFinder::class.java)
}
- };
+ }
javaCoreEnvironment.project.registerService(NullableNotNullManager::class.java, object : NullableNotNullManager() {
override fun isNullable(owner: PsiModifierListOwner, checkBases: Boolean) = !isNotNull(owner, checkBases)
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt
index b45e10ff664..a27fba5990b 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt
@@ -37,7 +37,7 @@ fun disableJava6FileManager() {
}
private fun setFinalStaticToNull(field: Field) {
- field.isAccessible = true;
+ field.isAccessible = true
val modifiersField = (Field::class.java).getDeclaredField("modifiers")
modifiersField.isAccessible = true
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
index 30183d7a1fc..78b37df8d93 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -96,7 +96,7 @@ abstract class AbstractIncrementalJpsTest(
TestLoggerFactory.enableDebugLogging(myTestRootDisposable, "#org")
val console = ConsoleAppender()
- console.layout = PatternLayout("%d [%p|%c|%C{1}] %m%n");
+ console.layout = PatternLayout("%d [%p|%c|%C{1}] %m%n")
console.threshold = Level.ALL
console.activateOptions()
Logger.getRootLogger().addAppender(console)
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
index f848d7a9dbe..3f69c28f4cd 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
@@ -650,16 +650,16 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
val buildResult = BuildResult()
val canceledStatus = object: CanceledStatus {
- var checkFromIndex = 0;
+ var checkFromIndex = 0
override fun isCanceled(): Boolean {
val messages = buildResult.getMessages(BuildMessage.Kind.INFO)
for (i in checkFromIndex..messages.size - 1) {
- if (messages.get(i).messageText.startsWith("Kotlin JPS plugin version")) return true;
+ if (messages.get(i).messageText.startsWith("Kotlin JPS plugin version")) return true
}
- checkFromIndex = messages.size;
- return false;
+ checkFromIndex = messages.size
+ return false
}
}
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
index 23b1d45e2ff..124f60f8d93 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
@@ -69,7 +69,7 @@ class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY, "")
System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "")
// spaces in the name to test proper file name handling
- val flagFile = File.createTempFile("kotlin-jps - tests-", "-is-running");
+ val flagFile = File.createTempFile("kotlin-jps - tests-", "-is-running")
val logFile = File.createTempFile("kotlin-daemon", ".log")
System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath)
System.setProperty(COMPILE_DAEMON_LOG_PATH_PROPERTY, logFile.loggerCompatiblePath)
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt
index 9cf233a9f79..8b7afbd6796 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt
@@ -62,7 +62,7 @@ abstract class AbstractProtoComparisonTest : UsefulTestCase() {
p.printDifference(oldClassMap[name]!!, newClassMap[name]!!)
}
- KotlinTestUtils.assertEqualsToFile(File(testDataPath + File.separator + "result.out"), sb.toString());
+ KotlinTestUtils.assertEqualsToFile(File(testDataPath + File.separator + "result.out"), sb.toString())
}
private fun compileFileAndGetClasses(testPath: String, testDir: File, prefix: String): List {
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryAssignmentElimination.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryAssignmentElimination.kt
index c28045b9527..1a84dcf847c 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryAssignmentElimination.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryAssignmentElimination.kt
@@ -212,7 +212,7 @@ internal class TemporaryAssignmentElimination(private val root: JsBlock) {
hasChanges = true
ctx.replaceMe(replacement)
statementsToRemove += usage.statements
- return false;
+ return false
}
}
return super.visit(x, ctx)
diff --git a/js/js.parser/src/com/google/gwt/dev/js/ScopeContext.kt b/js/js.parser/src/com/google/gwt/dev/js/ScopeContext.kt
index 6c0cf58a436..113046937c5 100644
--- a/js/js.parser/src/com/google/gwt/dev/js/ScopeContext.kt
+++ b/js/js.parser/src/com/google/gwt/dev/js/ScopeContext.kt
@@ -22,7 +22,7 @@ import java.util.Stack
class ScopeContext(scope: JsScope) {
private val rootScope = generateSequence(scope) { it.parent }.first { it is JsRootScope }
- private val scopes = Stack();
+ private val scopes = Stack()
init {
scopes.push(scope)
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt
index 23d7c70e1dc..f08dbd91f13 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt
@@ -155,5 +155,5 @@ private fun TranslationContext.createCallInfo(resolvedCall: ResolvedCall,
extensionOrDispatchReceiver: JsExpression? = null
): JsExpression {
- val variableAccessInfo = VariableAccessInfo(context.getCallInfo(resolvedCall, extensionOrDispatchReceiver), null);
+ val variableAccessInfo = VariableAccessInfo(context.getCallInfo(resolvedCall, extensionOrDispatchReceiver), null)
return variableAccessInfo.translateVariableAccess()
}
@@ -56,7 +56,7 @@ object CallTranslator {
value: JsExpression,
extensionOrDispatchReceiver: JsExpression? = null
): JsExpression {
- val variableAccessInfo = VariableAccessInfo(context.getCallInfo(resolvedCall, extensionOrDispatchReceiver), value);
+ val variableAccessInfo = VariableAccessInfo(context.getCallInfo(resolvedCall, extensionOrDispatchReceiver), value)
return variableAccessInfo.translateVariableAccess()
}
@@ -65,7 +65,7 @@ object CallTranslator {
args: List,
dispatchReceiver: JsExpression?
): JsExpression {
- val argumentsInfo = CallArgumentTranslator.ArgumentsInfo(args, false, null);
+ val argumentsInfo = CallArgumentTranslator.ArgumentsInfo(args, false, null)
val functionName = context.getNameForDescriptor(functionDescriptor)
val isNative = AnnotationsUtils.isNativeObject(functionDescriptor)
val hasSpreadOperator = false
@@ -207,7 +207,7 @@ interface DelegateIntrinsic {
}
private fun I.getIntrinsic(): JsExpression? {
- val descriptor = getDescriptor();
+ val descriptor = getDescriptor()
// Now intrinsic support only FunctionDescriptor. See DelegatePropertyAccessIntrinsic.getDescriptor()
if (descriptor is FunctionDescriptor) {
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt
index efef0fc3756..06b0dfe67a6 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt
@@ -140,7 +140,7 @@ class UsageTracker(
if (containingDescriptor == container) return false
if (containingDescriptor !is ClassDescriptor) {
- val containingClass = getParentOfType(containingDescriptor, ClassDescriptor::class.java, false);
+ val containingClass = getParentOfType(containingDescriptor, ClassDescriptor::class.java, false)
if (containingClass == container) return false
}
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
index b2a458a1b27..56810f07d88 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
@@ -168,7 +168,7 @@ class ClassTranslator private constructor(
.innerWithUsageTracker(constructorScope, constructorDescriptor)
.innerContextWithAliased(receiverDescriptor, thisNameRef)
- val outerClassName = context.getOuterClassReference(classDescriptor);
+ val outerClassName = context.getOuterClassReference(classDescriptor)
val outerClass = DescriptorUtils.getContainingClass(classDescriptor)
if (outerClassName != null) {
val outerClassReceiver = outerClass!!.thisAsReceiverParameter
@@ -295,7 +295,7 @@ class ClassTranslator private constructor(
}
}
- function.body.statements.addAll(0, additionalStatements);
+ function.body.statements.addAll(0, additionalStatements)
}
private fun getSuperclassReferences(declarationContext: TranslationContext): JsExpression {
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt
index 83c90e4113e..c3c4a4a3b67 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt
@@ -42,10 +42,10 @@ class DelegationTranslator(
) : AbstractTranslator(context) {
private val classDescriptor: ClassDescriptor =
- BindingUtils.getClassDescriptor(context.bindingContext(), classDeclaration);
+ BindingUtils.getClassDescriptor(context.bindingContext(), classDeclaration)
private val delegationBySpecifiers =
- classDeclaration.getSuperTypeListEntries().filterIsInstance();
+ classDeclaration.getSuperTypeListEntries().filterIsInstance()
private class Field (val name: String, val generateField: Boolean)
private val fields = mutableMapOf()
@@ -186,6 +186,6 @@ class DelegationTranslator(
) {
val delegateRefName = context().getScopeForDescriptor(descriptor).declareName(delegateName)
val delegateRef = JsNameRef(delegateRefName, JsLiteral.THIS)
- properties.add(generateDelegateCall(descriptor, overriddenDescriptor, delegateRef, context()));
+ properties.add(generateDelegateCall(descriptor, overriddenDescriptor, delegateRef, context()))
}
}
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt
index 3d603dffc54..e014f48b3c4 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt
@@ -115,7 +115,7 @@ fun translateForExpression(expression: KtForExpression, context: TranslationCont
getClassDescriptorForType(rangeType).name.asString() == "IntArray"
}
- val destructuringParameter: KtDestructuringDeclaration? = expression.destructuringParameter;
+ val destructuringParameter: KtDestructuringDeclaration? = expression.destructuringParameter
fun declareParameter(): JsName {
val loopParameter = getLoopParameter(expression)
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt
index 606941d4cef..80d659073ec 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt
@@ -66,7 +66,7 @@ object LongOperationFIF : FunctionIntrinsicFactory {
"times" to BaseBinaryIntrinsic(::mul),
"div" to BaseBinaryIntrinsic(::div),
"mod" to BaseBinaryIntrinsic(::mod)
- );
+ )
class BaseBinaryIntrinsic(val applyFun: (left: JsExpression, right: JsExpression) -> JsExpression) : FunctionIntrinsic() {
override fun apply(receiver: JsExpression?, arguments: List, context: TranslationContext): JsExpression {
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt
index c59822823d0..2e1f3cebbb9 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt
@@ -29,7 +29,7 @@ object NumberAndCharConversionFIF : CompositeFIF() {
pattern("Int.toInt|toFloat|toDouble"), pattern("Short.toShort|toInt|toFloat|toDouble"),
pattern("Byte.toByte|toShort|toInt|toFloat|toDouble"), pattern("Float|Double.toFloat|toDouble"),
pattern("Long.toLong"), pattern("Char.toChar")
- );
+ )
private val convertOperations: Map =
mapOf(
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt
index 64a912640bb..ece66381fa7 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt
@@ -176,7 +176,7 @@ class CallArgumentTranslator private constructor(
return typeArgs.addReifiedTypeArgsTo(result, context)
}
- return result;
+ return result
}
private fun translateSingleArgument(actualArgument: ResolvedValueArgument, result: MutableList, context: TranslationContext): ArgumentsKind {
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt
index 45513bc1828..e42ddf1ac45 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt
@@ -36,7 +36,7 @@ fun generateDelegateCall(
val parameters = SmartList()
val args = SmartList()
- val functionScope = context.getScopeForDescriptor(fromDescriptor);
+ val functionScope = context.getScopeForDescriptor(fromDescriptor)
if (DescriptorUtils.isExtension(fromDescriptor)) {
val extensionFunctionReceiverName = functionScope.declareName(Namer.getReceiverParameterName())
diff --git a/libraries/stdlib/src/generated/_Arrays.kt b/libraries/stdlib/src/generated/_Arrays.kt
index 8712d560cbc..a3c5c08c72a 100644
--- a/libraries/stdlib/src/generated/_Arrays.kt
+++ b/libraries/stdlib/src/generated/_Arrays.kt
@@ -3850,7 +3850,7 @@ public fun Array.take(n: Int): List {
val list = ArrayList(n)
for (item in this) {
if (count++ == n)
- break;
+ break
list.add(item)
}
return list
@@ -3867,7 +3867,7 @@ public fun ByteArray.take(n: Int): List {
val list = ArrayList(n)
for (item in this) {
if (count++ == n)
- break;
+ break
list.add(item)
}
return list
@@ -3884,7 +3884,7 @@ public fun ShortArray.take(n: Int): List {
val list = ArrayList(n)
for (item in this) {
if (count++ == n)
- break;
+ break
list.add(item)
}
return list
@@ -3901,7 +3901,7 @@ public fun IntArray.take(n: Int): List {
val list = ArrayList(n)
for (item in this) {
if (count++ == n)
- break;
+ break
list.add(item)
}
return list
@@ -3918,7 +3918,7 @@ public fun LongArray.take(n: Int): List {
val list = ArrayList(n)
for (item in this) {
if (count++ == n)
- break;
+ break
list.add(item)
}
return list
@@ -3935,7 +3935,7 @@ public fun FloatArray.take(n: Int): List {
val list = ArrayList(n)
for (item in this) {
if (count++ == n)
- break;
+ break
list.add(item)
}
return list
@@ -3952,7 +3952,7 @@ public fun DoubleArray.take(n: Int): List {
val list = ArrayList(n)
for (item in this) {
if (count++ == n)
- break;
+ break
list.add(item)
}
return list
@@ -3969,7 +3969,7 @@ public fun BooleanArray.take(n: Int): List {
val list = ArrayList(n)
for (item in this) {
if (count++ == n)
- break;
+ break
list.add(item)
}
return list
@@ -3986,7 +3986,7 @@ public fun CharArray.take(n: Int): List {
val list = ArrayList(n)
for (item in this) {
if (count++ == n)
- break;
+ break
list.add(item)
}
return list
@@ -4233,7 +4233,7 @@ public inline fun Array.takeWhile(predicate: (T) -> Boolean): List
val list = ArrayList()
for (item in this) {
if (!predicate(item))
- break;
+ break
list.add(item)
}
return list
@@ -4246,7 +4246,7 @@ public inline fun ByteArray.takeWhile(predicate: (Byte) -> Boolean): List
val list = ArrayList()
for (item in this) {
if (!predicate(item))
- break;
+ break
list.add(item)
}
return list
@@ -4259,7 +4259,7 @@ public inline fun ShortArray.takeWhile(predicate: (Short) -> Boolean): List()
for (item in this) {
if (!predicate(item))
- break;
+ break
list.add(item)
}
return list
@@ -4272,7 +4272,7 @@ public inline fun IntArray.takeWhile(predicate: (Int) -> Boolean): List {
val list = ArrayList()
for (item in this) {
if (!predicate(item))
- break;
+ break
list.add(item)
}
return list
@@ -4285,7 +4285,7 @@ public inline fun LongArray.takeWhile(predicate: (Long) -> Boolean): List
val list = ArrayList()
for (item in this) {
if (!predicate(item))
- break;
+ break
list.add(item)
}
return list
@@ -4298,7 +4298,7 @@ public inline fun FloatArray.takeWhile(predicate: (Float) -> Boolean): List()
for (item in this) {
if (!predicate(item))
- break;
+ break
list.add(item)
}
return list
@@ -4311,7 +4311,7 @@ public inline fun DoubleArray.takeWhile(predicate: (Double) -> Boolean): List()
for (item in this) {
if (!predicate(item))
- break;
+ break
list.add(item)
}
return list
@@ -4324,7 +4324,7 @@ public inline fun BooleanArray.takeWhile(predicate: (Boolean) -> Boolean): List<
val list = ArrayList()
for (item in this) {
if (!predicate(item))
- break;
+ break
list.add(item)
}
return list
@@ -4337,7 +4337,7 @@ public inline fun CharArray.takeWhile(predicate: (Char) -> Boolean): List
val list = ArrayList()
for (item in this) {
if (!predicate(item))
- break;
+ break
list.add(item)
}
return list
diff --git a/libraries/stdlib/src/generated/_Collections.kt b/libraries/stdlib/src/generated/_Collections.kt
index 1ba5d15cd0c..bbda048d89c 100644
--- a/libraries/stdlib/src/generated/_Collections.kt
+++ b/libraries/stdlib/src/generated/_Collections.kt
@@ -750,7 +750,7 @@ public inline fun Iterable.takeWhile(predicate: (T) -> Boolean): List
val list = ArrayList()
for (item in this) {
if (!predicate(item))
- break;
+ break
list.add(item)
}
return list
diff --git a/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt b/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt
index 8ff42375355..1664fb8b07b 100644
--- a/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt
+++ b/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt
@@ -34,7 +34,7 @@ public abstract class AbstractIterator: Iterator {
private fun tryToComputeNext(): Boolean {
state = State.Failed
- computeNext();
+ computeNext()
return state == State.Ready
}
diff --git a/libraries/stdlib/src/kotlin/collections/Sequences.kt b/libraries/stdlib/src/kotlin/collections/Sequences.kt
index 9c0b5f0daca..a00eaf7eb6c 100644
--- a/libraries/stdlib/src/kotlin/collections/Sequences.kt
+++ b/libraries/stdlib/src/kotlin/collections/Sequences.kt
@@ -89,7 +89,7 @@ internal class FilteringSequence(private val sequence: Sequence,
) : Sequence {
override fun iterator(): Iterator = object : Iterator {
- val iterator = sequence.iterator();
+ val iterator = sequence.iterator()
var nextState: Int = -1 // -1 for unknown, 0 for done, 1 for continue
var nextItem: T? = null
@@ -325,7 +325,7 @@ internal class TakeSequence (
override fun iterator(): Iterator = object : Iterator {
var left = count
- val iterator = sequence.iterator();
+ val iterator = sequence.iterator()
override fun next(): T {
if (left == 0)
@@ -349,7 +349,7 @@ internal class TakeWhileSequence
private val predicate: (T) -> Boolean
) : Sequence {
override fun iterator(): Iterator = object : Iterator {
- val iterator = sequence.iterator();
+ val iterator = sequence.iterator()
var nextState: Int = -1 // -1 for unknown, 0 for done, 1 for continue
var nextItem: T? = null
@@ -402,7 +402,7 @@ internal class DropSequence (
override fun take(n: Int): Sequence = SubSequence(sequence, count, count + n)
override fun iterator(): Iterator = object : Iterator {
- val iterator = sequence.iterator();
+ val iterator = sequence.iterator()
var left = count
// Shouldn't be called from constructor to avoid premature iteration
@@ -435,7 +435,7 @@ internal class DropWhileSequence
) : Sequence {
override fun iterator(): Iterator = object : Iterator {
- val iterator = sequence.iterator();
+ val iterator = sequence.iterator()
var dropState: Int = -1 // -1 for not dropping, 1 for nextItem, 0 for normal iteration
var nextItem: T? = null
diff --git a/libraries/stdlib/src/kotlin/concurrent/Locks.kt b/libraries/stdlib/src/kotlin/concurrent/Locks.kt
index 61ce0dc663c..4d3578398a3 100644
--- a/libraries/stdlib/src/kotlin/concurrent/Locks.kt
+++ b/libraries/stdlib/src/kotlin/concurrent/Locks.kt
@@ -16,7 +16,7 @@ public inline fun Lock.withLock(action: () -> T): T {
try {
return action()
} finally {
- unlock();
+ unlock()
}
}
diff --git a/libraries/stdlib/src/kotlin/text/Strings.kt b/libraries/stdlib/src/kotlin/text/Strings.kt
index b4de54e6039..00e6bf085da 100644
--- a/libraries/stdlib/src/kotlin/text/Strings.kt
+++ b/libraries/stdlib/src/kotlin/text/Strings.kt
@@ -687,7 +687,7 @@ public inline fun CharSequence.matches(regex: Regex): Boolean = regex.matches(th
internal fun CharSequence.regionMatchesImpl(thisOffset: Int, other: CharSequence, otherOffset: Int, length: Int, ignoreCase: Boolean): Boolean {
if ((otherOffset < 0) || (thisOffset < 0) || (thisOffset > this.length - length)
|| (otherOffset > other.length - length)) {
- return false;
+ return false
}
for (index in 0..length-1) {
@@ -779,9 +779,9 @@ public fun CharSequence.commonSuffixWith(other: CharSequence, ignoreCase: Boolea
i++
}
if (this.hasSurrogatePairAt(thisLength - i - 1) || other.hasSurrogatePairAt(otherLength - i - 1)) {
- i--;
+ i--
}
- return subSequence(thisLength - i, thisLength).toString();
+ return subSequence(thisLength - i, thisLength).toString()
}
diff --git a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt
index 36e5f6ca674..6aa44db7486 100644
--- a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt
+++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt
@@ -45,7 +45,7 @@ abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() {
fun doTest(path: String?) {
getResourceDirs(path).forEach { myFixture.copyDirectoryToProject(it.name, it.name) }
- val virtualFile = myFixture.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
+ val virtualFile = myFixture.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt")
myFixture.configureFromExistingVirtualFile(virtualFile)
val fileText = FileUtil.loadFile(File(path + getTestName(true) + ".kt"), true)
testCompletion(fileText, JvmPlatform, { completionType, count -> myFixture.complete(completionType, count) })
diff --git a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt
index a0a1bc1de14..25dd0fe5c1e 100644
--- a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt
+++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt
@@ -27,7 +27,7 @@ abstract class AbstractAndroidFindUsagesTest : KotlinAndroidTestCase() {
val f = myFixture!!
getResourceDirs(path).forEach { myFixture.copyDirectoryToProject(it.name, it.name) }
- val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
+ val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt")
f.configureFromExistingVirtualFile(virtualFile)
val targetElement = TargetElementUtil.findTargetElement(
diff --git a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt
index cd6760b9116..4ee733c22f4 100644
--- a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt
+++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt
@@ -38,7 +38,7 @@ abstract class AbstractAndroidGotoTest : KotlinAndroidTestCase() {
fun doTest(path: String) {
val f = myFixture!!
getResourceDirs(path).forEach { myFixture.copyDirectoryToProject(it.name, it.name) }
- val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
+ val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt")
f.configureFromExistingVirtualFile(virtualFile)
val expression = TargetElementUtil.findReference(f.editor, f.caretOffset)!!.element as KtElement
diff --git a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidLayoutRenameTest.kt b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidLayoutRenameTest.kt
index 6cbda3a31b8..9e539ce04e7 100644
--- a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidLayoutRenameTest.kt
+++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidLayoutRenameTest.kt
@@ -31,7 +31,7 @@ abstract class AbstractAndroidLayoutRenameTest : KotlinAndroidTestCase() {
fun doTest(path: String) {
val f = myFixture!!
getResourceDirs(path).forEach { myFixture.copyDirectoryToProject(it.name, it.name) }
- val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
+ val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt")
f.configureFromExistingVirtualFile(virtualFile)
val completionEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(f.editor, f.file)
diff --git a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt
index 469f18c0677..24697a2978d 100644
--- a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt
+++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt
@@ -29,7 +29,7 @@ abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() {
fun doTest(path: String) {
val f = myFixture!!
getResourceDirs(path).forEach { myFixture.copyDirectoryToProject(it.name, it.name) }
- val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
+ val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt")
f.configureFromExistingVirtualFile(virtualFile)
val completionEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(f.editor, f.file)
diff --git a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.kt b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.kt
index a91b2a1e2f0..cd95e5a3d06 100755
--- a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.kt
+++ b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.kt
@@ -112,7 +112,7 @@ open class ApiDetector : Detector(), UastScanner {
if (methodSdkLevel != -1 && methodSdkLevel > buildSdk) {
val message = "This method is not overriding anything with the current build " +
"target, but will in API level $methodSdkLevel (current target is $buildSdk): `${node.name}`"
- context.report(OVERRIDE, node, context.getLocation(node.nameElement), message);
+ context.report(OVERRIDE, node, context.getLocation(node.nameElement), message)
}
}
}
@@ -225,17 +225,17 @@ open class ApiDetector : Detector(), UastScanner {
val value = (valueNode as ULiteralExpression).value as String
return SdkVersionInfo.getApiByBuildCode(value, true)
} else if (valueNode is UQualifiedExpression) {
- val codename = valueNode.getSelectorAsIdentifier() ?: return -1;
+ val codename = valueNode.getSelectorAsIdentifier() ?: return -1
return SdkVersionInfo.getApiByBuildCode(codename, true)
} else if (valueNode is USimpleReferenceExpression) {
- val codename = valueNode.identifier;
+ val codename = valueNode.identifier
return SdkVersionInfo.getApiByBuildCode(codename, true)
}
}
}
}
- return -1;
+ return -1
}
fun isCheckedExplicitly(context: UastAndroidContext, requiredVersion: Int, node: UElement): Boolean {
diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt
index 9ca315a8c4a..681d305b765 100644
--- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt
+++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt
@@ -86,7 +86,7 @@ abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() {
return true
}
})
- Collections.sort(files);
+ Collections.sort(files)
if (additionalFiles != null) {
files.addAll(additionalFiles)
}
@@ -95,6 +95,6 @@ abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() {
ArrayUtil.toStringArray(files),
KotlinTestUtils.getHomeDirectory() + "/plugins/android-extensions/android-extensions-compiler/testData"
)
- blackBox();
+ blackBox()
}
}
\ No newline at end of file
diff --git a/plugins/uast-java/src/org/jetbrains/uast/java/internal/javaInternalUastUtils.kt b/plugins/uast-java/src/org/jetbrains/uast/java/internal/javaInternalUastUtils.kt
index 1a1a654d8b5..d9c012cea05 100644
--- a/plugins/uast-java/src/org/jetbrains/uast/java/internal/javaInternalUastUtils.kt
+++ b/plugins/uast-java/src/org/jetbrains/uast/java/internal/javaInternalUastUtils.kt
@@ -28,7 +28,7 @@ private val MODIFIER_MAP = mapOf(
internal fun PsiModifierListOwner.hasModifier(modifier: UastModifier): Boolean {
if (modifier == UastModifier.JVM_FIELD && this is PsiField) {
- return true;
+ return true
}
if (modifier == UastModifier.OVERRIDE && this is PsiAnnotationOwner) {
return this.annotations.any { it.qualifiedName == "java.lang.Override" }
@@ -40,7 +40,7 @@ internal fun PsiModifierListOwner.hasModifier(modifier: UastModifier): Boolean {
return this.hasModifierProperty(PsiModifier.FINAL)
}
if (modifier == UastModifier.FINAL && this is PsiVariable) {
- return false;
+ return false
}
val javaModifier = MODIFIER_MAP[modifier] ?: return false
return hasModifierProperty(javaModifier)
diff --git a/plugins/uast-java/test/org/jetbrains/uast/AbstractStructureTest.kt b/plugins/uast-java/test/org/jetbrains/uast/AbstractStructureTest.kt
index ac2ccb1face..e190673d1ce 100644
--- a/plugins/uast-java/test/org/jetbrains/uast/AbstractStructureTest.kt
+++ b/plugins/uast-java/test/org/jetbrains/uast/AbstractStructureTest.kt
@@ -53,7 +53,7 @@ open class AbstractStructureTest : LightCodeInsightTestCase() {
file.writeText(text)
throw NoTestFileException(file)
} else {
- val lineSeparator = System.getProperty("line.separator") ?: "\n";
+ val lineSeparator = System.getProperty("line.separator") ?: "\n"
val expected = file.readLines().map { it.trimEnd() }.joinToString(lineSeparator).trim()
val actual = text.lines().map { it.trimEnd() }.joinToString(lineSeparator).trim()
assertEquals(expected, actual)
diff --git a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinStringTemplateUBinaryExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinStringTemplateUBinaryExpression.kt
index 03d32bc2caa..83fca4796c6 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinStringTemplateUBinaryExpression.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinStringTemplateUBinaryExpression.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.jetbrains.kotlin.uast;
+package org.jetbrains.kotlin.uast
import org.jetbrains.kotlin.psi.KtStringTemplateExpression
import org.jetbrains.uast.UBinaryExpression
diff --git a/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinLintTest.kt b/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinLintTest.kt
index 25750cb366a..0143a64466e 100644
--- a/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinLintTest.kt
+++ b/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinLintTest.kt
@@ -63,7 +63,7 @@ abstract class AbstractKotlinLintTest : KotlinAndroidTestCase() {
}
}
- val virtualFile = myFixture.copyFileToProject(ktFile.absolutePath, "src/" + getTestName(true) + ".kt");
+ val virtualFile = myFixture.copyFileToProject(ktFile.absolutePath, "src/" + getTestName(true) + ".kt")
myFixture.configureFromExistingVirtualFile(virtualFile)
myFixture.doHighlighting()