diff --git a/java/execution/impl/src/com/intellij/execution/ui/DefaultJreSelector.kt b/java/execution/impl/src/com/intellij/execution/ui/DefaultJreSelector.kt index 35de9f67228b..fd56f230bfb9 100644 --- a/java/execution/impl/src/com/intellij/execution/ui/DefaultJreSelector.kt +++ b/java/execution/impl/src/com/intellij/execution/ui/DefaultJreSelector.kt @@ -68,7 +68,7 @@ abstract class DefaultJreSelector { class ProjectSdkSelector(val project: Project): DefaultJreSelector() { - override fun getNameAndDescription() = Pair.create(ProjectRootManager.getInstance(project).projectSdkName, "project SDK") + override fun getNameAndDescription(): Pair = Pair.create(ProjectRootManager.getInstance(project).projectSdkName, "project SDK") } open class SdkFromModuleDependencies>(val moduleComboBox: T, val getSelectedModule: (T) -> Module?, val productionOnly: () -> Boolean): DefaultJreSelector() { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ConvertProjectLibraryToRepositoryLibraryAction.kt b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ConvertProjectLibraryToRepositoryLibraryAction.kt index 6c244ab4babc..1c71cd60725d 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ConvertProjectLibraryToRepositoryLibraryAction.kt +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ConvertProjectLibraryToRepositoryLibraryAction.kt @@ -29,7 +29,7 @@ class ConvertProjectLibraryToRepositoryLibraryAction(private val librariesConfig context: StructureConfigurableContext) : ConvertToRepositoryLibraryActionBase(context) { - override fun getSelectedLibrary() = (librariesConfigurable.selectedElement as? LibraryProjectStructureElement)?.library as? LibraryEx + override fun getSelectedLibrary(): LibraryEx? = (librariesConfigurable.selectedElement as? LibraryProjectStructureElement)?.library as? LibraryEx override fun replaceLibrary(library: Library, configureNewLibrary: (LibraryEditorBase) -> Unit) { val name = library.name diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ConvertToRepositoryLibraryActionBase.kt b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ConvertToRepositoryLibraryActionBase.kt index 6c6d1e74cf3d..e5f16252a56e 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ConvertToRepositoryLibraryActionBase.kt +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ConvertToRepositoryLibraryActionBase.kt @@ -62,7 +62,7 @@ abstract class ConvertToRepositoryLibraryActionBase(protected val context: Struc "Convert to Repository Library...", "Convert a regular library to a repository library which additionally stores its Maven coordinates, so the IDE can automatically download the library JARs if they are missing", null) { - protected val project = context.project + protected val project: Project = context.project protected abstract fun getSelectedLibrary(): LibraryEx? @@ -298,7 +298,7 @@ private class ComparingJarFilesTask(project: Project, private val downloadedFile val len2 = input2.read(buffer2) if (len1 != len2) return false if (len1 <= 0) break - for (i in 0..len1 - 1) { + for (i in 0 until len1) { if (buffer1[i] != buffer2[i]) return false } } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryJarsDiffDialog.kt b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryJarsDiffDialog.kt index 16c311674c88..ef39720d05a2 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryJarsDiffDialog.kt +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryJarsDiffDialog.kt @@ -38,7 +38,7 @@ class LibraryJarsDiffDialog(libraryFile: VirtualFile, private val libraryName: String, project: Project) : DialogWrapper(project) { companion object { - val CHANGE_COORDINATES_CODE = 2; + val CHANGE_COORDINATES_CODE: Int = 2 } private val panel: DiffRequestPanel diff --git a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/AnnotationAttributeValueRequest.kt b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/AnnotationAttributeValueRequest.kt index 7ce7aad6bda8..59557baf1196 100644 --- a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/AnnotationAttributeValueRequest.kt +++ b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/AnnotationAttributeValueRequest.kt @@ -20,5 +20,5 @@ sealed class AnnotationAttributeValueRequest { data class AnnotationAttributeRequest(val name: String, val value: AnnotationAttributeValueRequest) -fun stringAttribute(name: String, value: String) = AnnotationAttributeRequest(name, AnnotationAttributeValueRequest.StringValue(value)) -fun intAttribute(name: String, value: Int) = AnnotationAttributeRequest(name, AnnotationAttributeValueRequest.PrimitiveValue(value)) +fun stringAttribute(name: String, value: String): AnnotationAttributeRequest = AnnotationAttributeRequest(name, AnnotationAttributeValueRequest.StringValue(value)) +fun intAttribute(name: String, value: Int): AnnotationAttributeRequest = AnnotationAttributeRequest(name, AnnotationAttributeValueRequest.PrimitiveValue(value)) diff --git a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/actions.kt b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/actions.kt index 492022ec506c..182ee4104894 100644 --- a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/actions.kt +++ b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/actions.kt @@ -12,7 +12,7 @@ import com.intellij.openapi.util.registry.Registry fun useInterlaguageActions(): Boolean = ApplicationManager.getApplication().isUnitTestMode || Registry.`is`("ide.interlanguage.fixes") -val EP_NAME = ExtensionPointName.create("com.intellij.lang.jvm.actions.jvmElementActionsFactory") +val EP_NAME: ExtensionPointName = ExtensionPointName.create("com.intellij.lang.jvm.actions.jvmElementActionsFactory") private inline fun createActions(crossinline actions: (JvmElementActionsFactory) -> List): List { return EP_NAME.extensions.flatMap { diff --git a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/annotationRequests.kt b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/annotationRequests.kt index 8585a508673a..34bbfc07e22c 100644 --- a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/annotationRequests.kt +++ b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/annotationRequests.kt @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.lang.jvm.actions -fun annotationRequest(fqn: String, vararg parameters: AnnotationAttributeRequest) = object : AnnotationRequest { +fun annotationRequest(fqn: String, vararg parameters: AnnotationAttributeRequest): AnnotationRequest = object : AnnotationRequest { override fun getQualifiedName(): String = fqn override fun getAttributes(): List = parameters.asList() diff --git a/java/java-analysis-api/src/com/intellij/openapi/roots/LanguageLevelState.kt b/java/java-analysis-api/src/com/intellij/openapi/roots/LanguageLevelState.kt index b2d946a8fd49..979b73667ace 100644 --- a/java/java-analysis-api/src/com/intellij/openapi/roots/LanguageLevelState.kt +++ b/java/java-analysis-api/src/com/intellij/openapi/roots/LanguageLevelState.kt @@ -9,5 +9,5 @@ import com.intellij.util.xmlb.annotations.Attribute class LanguageLevelState : BaseState() { @get:Attribute("LANGUAGE_LEVEL") - var languageLevel by property() + var languageLevel: LanguageLevel? by property() } \ No newline at end of file diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddModuleDirectiveFix.kt b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddModuleDirectiveFix.kt index c87df4242386..79694a1f0ebc 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddModuleDirectiveFix.kt +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddModuleDirectiveFix.kt @@ -9,19 +9,19 @@ import com.intellij.psi.* import com.intellij.psi.util.PsiUtil abstract class AddModuleDirectiveFix(module: PsiJavaModule) : LocalQuickFixAndIntentionActionOnPsiElement(module) { - override fun getFamilyName() = QuickFixBundle.message("module.info.add.directive.family.name") + override fun getFamilyName(): String = QuickFixBundle.message("module.info.add.directive.family.name") - override fun isAvailable(project: Project, file: PsiFile, startElement: PsiElement, endElement: PsiElement) = + override fun isAvailable(project: Project, file: PsiFile, startElement: PsiElement, endElement: PsiElement): Boolean = startElement is PsiJavaModule && PsiUtil.isLanguageLevel9OrHigher(file) && startElement.getManager().isInProject(startElement) - override fun invoke(project: Project, file: PsiFile, editor: Editor?, startElement: PsiElement, endElement: PsiElement) = + override fun invoke(project: Project, file: PsiFile, editor: Editor?, startElement: PsiElement, endElement: PsiElement): Unit = invoke(project, file, editor, startElement as PsiJavaModule) protected abstract fun invoke(project: Project, file: PsiFile, editor: Editor?, module: PsiJavaModule) } class AddRequiresDirectiveFix(module: PsiJavaModule, private val requiredName: String) : AddModuleDirectiveFix(module) { - override fun getText() = QuickFixBundle.message("module.info.add.requires.name", requiredName) + override fun getText(): String = QuickFixBundle.message("module.info.add.requires.name", requiredName) override fun invoke(project: Project, file: PsiFile, editor: Editor?, module: PsiJavaModule) { if (module.requires.find { requiredName == it.moduleName } == null) { @@ -33,7 +33,7 @@ class AddRequiresDirectiveFix(module: PsiJavaModule, private val requiredName: S class AddExportsDirectiveFix(module: PsiJavaModule, private val packageName: String, private val targetName: String) : AddModuleDirectiveFix(module) { - override fun getText() = QuickFixBundle.message("module.info.add.exports.name", packageName) + override fun getText(): String = QuickFixBundle.message("module.info.add.exports.name", packageName) override fun invoke(project: Project, file: PsiFile, editor: Editor?, module: PsiJavaModule) { val existing = module.exports.find { packageName == it.packageName } @@ -50,7 +50,7 @@ class AddExportsDirectiveFix(module: PsiJavaModule, } class AddUsesDirectiveFix(module: PsiJavaModule, private val svcName: String) : AddModuleDirectiveFix(module) { - override fun getText() = QuickFixBundle.message("module.info.add.uses.name", svcName) + override fun getText(): String = QuickFixBundle.message("module.info.add.uses.name", svcName) override fun invoke(project: Project, file: PsiFile, editor: Editor?, module: PsiJavaModule) { if (module.uses.find { svcName == it.classReference?.qualifiedName } == null) { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/controlTransfer.kt b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/controlTransfer.kt index bddd0fd92386..0ab732b53151 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/controlTransfer.kt +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/controlTransfer.kt @@ -33,8 +33,8 @@ import kotlin.collections.ArrayList class DfaControlTransferValue(factory: DfaValueFactory, val target: TransferTarget, val traps: FList) : DfaValue(factory) { - fun dispatch(state: DfaMemoryState, runner: DataFlowRunner) = ControlTransferHandler(state, runner, this).dispatch() - override fun toString() = target.toString() + (if (traps.isEmpty()) "" else " $traps") + fun dispatch(state: DfaMemoryState, runner: DataFlowRunner): List = ControlTransferHandler(state, runner, this).dispatch() + override fun toString(): String = target.toString() + (if (traps.isEmpty()) "" else " $traps") } interface TransferTarget { @@ -44,7 +44,7 @@ interface TransferTarget { fun dispatch(state: DfaMemoryState, runner: DataFlowRunner) : List = emptyList() } data class ExceptionTransfer(val throwable: DfaPsiType?) : TransferTarget { - override fun toString() = "Exception($throwable)" + override fun toString(): String = "Exception($throwable)" } data class InstructionTransfer(val offset: ControlFlow.ControlFlowOffset, private val toFlush: List) : TransferTarget { override fun dispatch(state: DfaMemoryState, runner: DataFlowRunner): List { @@ -52,18 +52,18 @@ data class InstructionTransfer(val offset: ControlFlow.ControlFlowOffset, privat return listOf(DfaInstructionState(runner.getInstruction(offset.instructionOffset), state)) } - override fun getPossibleTargets() = listOf(offset.instructionOffset) - override fun toString() = "-> $offset" + (if (toFlush.isEmpty()) "" else "; flushing $toFlush") + override fun getPossibleTargets(): List = listOf(offset.instructionOffset) + override fun toString(): String = "-> $offset" + (if (toFlush.isEmpty()) "" else "; flushing $toFlush") } data class ExitFinallyTransfer(private val enterFinally: Trap.EnterFinally) : TransferTarget { - override fun getPossibleTargets() = enterFinally.backLinks.asIterable().flatMap { it.getPossibleTargetIndices() } + override fun getPossibleTargets(): Set = enterFinally.backLinks.asIterable().flatMap { it.getPossibleTargetIndices() } .filter { index -> index != enterFinally.jumpOffset.instructionOffset }.toSet() override fun dispatch(state: DfaMemoryState, runner: DataFlowRunner): List { return (state.pop() as DfaControlTransferValue).dispatch(state, runner) } - override fun toString() = "ExitFinally" + override fun toString(): String = "ExitFinally" } object ReturnTransfer : TransferTarget { override fun toString(): String = "Return" @@ -74,7 +74,7 @@ sealed class Trap(val anchor: PsiElement) { internal abstract fun dispatch(handler: ControlTransferHandler): List internal open fun getPossibleTargets(): Collection = emptyList() - override fun toString() = javaClass.simpleName!! + override fun toString(): String = javaClass.simpleName!! class TryCatch(tryStatement: PsiTryStatement, val clauses: LinkedHashMap) : Trap(tryStatement) { @@ -84,7 +84,7 @@ sealed class Trap(val anchor: PsiElement) { } override fun getPossibleTargets() = clauses.values.map { it.instructionOffset } - override fun toString() = "${super.toString()} -> ${clauses.values}" + override fun toString(): String = "${super.toString()} -> ${clauses.values}" } abstract class EnterFinally(anchor: PsiElement, val jumpOffset: ControlFlow.ControlFlowOffset): Trap(anchor) { internal val backLinks = ArrayList() @@ -99,7 +99,7 @@ sealed class Trap(val anchor: PsiElement) { } override fun getPossibleTargets() = listOf(jumpOffset.instructionOffset) - override fun toString() = "${super.toString()} -> $jumpOffset" + override fun toString(): String = "${super.toString()} -> $jumpOffset" } class TryFinally(finallyBlock: PsiCodeBlock, jumpOffset: ControlFlow.ControlFlowOffset): EnterFinally(finallyBlock, jumpOffset) class TwrFinally(resourceList: PsiResourceList, jumpOffset: ControlFlow.ControlFlowOffset) : EnterFinally(resourceList, jumpOffset) { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inference/inferenceResults.kt b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inference/inferenceResults.kt index d97245291982..dfd25c938230 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inference/inferenceResults.kt +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inference/inferenceResults.kt @@ -24,7 +24,7 @@ data class ExpressionRange internal constructor (internal val startOffset: Int, companion object { @JvmStatic - fun create(expr: LighterASTNode, scopeStart: Int) = ExpressionRange( + fun create(expr: LighterASTNode, scopeStart: Int): ExpressionRange = ExpressionRange( expr.startOffset - scopeStart, expr.endOffset - scopeStart) } @@ -38,7 +38,7 @@ data class ExpressionRange internal constructor (internal val startOffset: Int, data class PurityInferenceResult(internal val mutatedRefs: List, internal val singleCall: ExpressionRange?) { - fun isPure(method: PsiMethod, body: () -> PsiCodeBlock) = !mutatesNonLocals(method, body) && callsOnlyPureMethods(body) + fun isPure(method: PsiMethod, body: () -> PsiCodeBlock): Boolean = !mutatesNonLocals(method, body) && callsOnlyPureMethods(body) private fun mutatesNonLocals(method: PsiMethod, body: () -> PsiCodeBlock): Boolean { return mutatedRefs.any { range -> !isLocalVarReference(range.restoreExpression(body()), method) } @@ -87,7 +87,7 @@ interface MethodReturnInferenceResult { @Suppress("EqualsOrHashCode") data class Predefined(internal val value: Nullness) : MethodReturnInferenceResult { override fun hashCode() = value.ordinal - override fun getNullness(method: PsiMethod, body: () -> PsiCodeBlock) = when { + override fun getNullness(method: PsiMethod, body: () -> PsiCodeBlock): Nullness = when { value == Nullness.NULLABLE && InferenceFromSourceUtil.suppressNullable( method) -> Nullness.UNKNOWN else -> value diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/instructions/ControlTransferInstruction.kt b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/instructions/ControlTransferInstruction.kt index d8668be90dba..34c146e26a2d 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/instructions/ControlTransferInstruction.kt +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/instructions/ControlTransferInstruction.kt @@ -18,7 +18,7 @@ open class ControlTransferInstruction(val transfer: DfaControlTransferValue) : I /** * Returns list of possible target instruction indices */ - fun getPossibleTargetIndices() = transfer.traps.flatMap(Trap::getPossibleTargets) + transfer.target.getPossibleTargets() + fun getPossibleTargetIndices(): List = transfer.traps.flatMap(Trap::getPossibleTargets) + transfer.target.getPossibleTargets() - override fun toString() = "TRANSFER $transfer [targets: ${getPossibleTargetIndices()}]" + override fun toString(): String = "TRANSFER $transfer [targets: ${getPossibleTargetIndices()}]" } \ No newline at end of file diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/inheritance/ImplicitSubclassProvider.kt b/java/java-analysis-impl/src/com/intellij/codeInspection/inheritance/ImplicitSubclassProvider.kt index 69e5ce65b8b6..9cb78b51bc20 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/inheritance/ImplicitSubclassProvider.kt +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/inheritance/ImplicitSubclassProvider.kt @@ -79,10 +79,10 @@ abstract class ImplicitSubclassProvider { companion object { @JvmField - val EP_NAME = ExtensionPointName.create("com.intellij.codeInsight.implicitSubclassProvider") + val EP_NAME: ExtensionPointName = ExtensionPointName.create("com.intellij.codeInsight.implicitSubclassProvider") @Deprecated("To be removed in 2018.2", ReplaceWith("ImplicitSubclassProvider.EP_NAME")) - fun getEP_NAME() = EP_NAME + fun getEP_NAME(): ExtensionPointName = EP_NAME } } diff --git a/java/java-analysis-impl/src/com/intellij/uast/UastSmartPointer.kt b/java/java-analysis-impl/src/com/intellij/uast/UastSmartPointer.kt index bf1a445fb03c..3fcdbe80ba32 100644 --- a/java/java-analysis-impl/src/com/intellij/uast/UastSmartPointer.kt +++ b/java/java-analysis-impl/src/com/intellij/uast/UastSmartPointer.kt @@ -16,5 +16,5 @@ class UastSmartPointer(uElement: T, val targetClass: Class) { } -inline fun T.createUastSmartPointer() = UastSmartPointer(this, T::class.java) +inline fun T.createUastSmartPointer(): UastSmartPointer = UastSmartPointer(this, T::class.java)