From 96fe227e194b90a5e851fa50219121f48d68b6d5 Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Fri, 16 Feb 2018 18:29:43 +0300 Subject: [PATCH] [jvm-lang] inline kotlin typealiases --- .../src/com/intellij/lang/jvm/actions/methodRequests.kt | 5 +++-- .../src/com/intellij/lang/jvm/actions/parameters.kt | 5 +---- .../src/com/intellij/lang/java/actions/templates.kt | 4 ++-- .../java/request/CreateExecutableFromJavaUsageRequest.kt | 5 +++-- .../fxml/refs/JavaFxEventHandlerReferenceQuickFixProvider.kt | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/methodRequests.kt b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/methodRequests.kt index 6c581e8f6f5a..d47d6b3cf072 100644 --- a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/methodRequests.kt +++ b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/methodRequests.kt @@ -9,6 +9,7 @@ import com.intellij.openapi.util.Pair import com.intellij.psi.PsiJvmSubstitutor import com.intellij.psi.PsiSubstitutor import com.intellij.psi.PsiType +import com.intellij.psi.codeStyle.SuggestedNameInfo private class SimpleMethodRequest( private val methodName: String, @@ -21,12 +22,12 @@ private class SimpleMethodRequest( override fun getModifiers() = modifiers override fun getReturnType() = returnType override fun getAnnotations() = emptyList() - override fun getParameters() = emptyList() + override fun getParameters() = emptyList>() override fun getTargetSubstitutor() = targetSubstitutor } private class SimpleConstructorRequest( - private val parameters: ExpectedParameters, + private val parameters: List>, private val targetSubstitutor: JvmSubstitutor ) : CreateConstructorRequest { override fun isValid(): Boolean = true diff --git a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/parameters.kt b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/parameters.kt index 78d368eeb5fd..3c6f333e4655 100644 --- a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/parameters.kt +++ b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/parameters.kt @@ -1,9 +1,6 @@ -// Copyright 2000-2017 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. +// 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 import com.intellij.psi.codeStyle.SuggestedNameInfo -typealias ExpectedParameter = Pair -typealias ExpectedParameters = List - fun nameInfo(vararg names: String): SuggestedNameInfo = object : SuggestedNameInfo(names) {} diff --git a/java/java-impl/src/com/intellij/lang/java/actions/templates.kt b/java/java-impl/src/com/intellij/lang/java/actions/templates.kt index 5ac94445e5ca..689053fa8423 100644 --- a/java/java-impl/src/com/intellij/lang/java/actions/templates.kt +++ b/java/java-impl/src/com/intellij/lang/java/actions/templates.kt @@ -5,11 +5,11 @@ import com.intellij.codeInsight.ExpectedTypeInfo import com.intellij.codeInsight.daemon.impl.quickfix.CreateFromUsageUtils import com.intellij.codeInsight.daemon.impl.quickfix.GuessTypeParameters import com.intellij.codeInsight.template.TemplateBuilder -import com.intellij.lang.jvm.actions.ExpectedParameters import com.intellij.lang.jvm.actions.ExpectedTypes import com.intellij.openapi.project.Project import com.intellij.openapi.util.Computable import com.intellij.psi.* +import com.intellij.psi.codeStyle.SuggestedNameInfo import com.intellij.psi.impl.source.PostprocessReformattingAspect import com.intellij.psi.util.PsiUtil @@ -22,7 +22,7 @@ internal class TemplateContext( val guesserContext: PsiElement? ) -internal fun TemplateContext.setupParameters(method: PsiMethod, parameters: ExpectedParameters) { +internal fun TemplateContext.setupParameters(method: PsiMethod, parameters: List>) { if (parameters.isEmpty()) return val postprocessReformattingAspect = PostprocessReformattingAspect.getInstance(project) val parameterList = method.parameterList diff --git a/java/java-impl/src/com/intellij/lang/java/request/CreateExecutableFromJavaUsageRequest.kt b/java/java-impl/src/com/intellij/lang/java/request/CreateExecutableFromJavaUsageRequest.kt index 3d74563c48f4..fab0f9464231 100644 --- a/java/java-impl/src/com/intellij/lang/java/request/CreateExecutableFromJavaUsageRequest.kt +++ b/java/java-impl/src/com/intellij/lang/java/request/CreateExecutableFromJavaUsageRequest.kt @@ -7,6 +7,7 @@ import com.intellij.lang.jvm.actions.* import com.intellij.openapi.components.service import com.intellij.psi.* import com.intellij.psi.codeStyle.JavaCodeStyleManager +import com.intellij.psi.codeStyle.SuggestedNameInfo import com.intellij.psi.codeStyle.VariableKind import com.intellij.psi.util.createSmartPointer import com.intellij.psi.util.parentOfType @@ -30,7 +31,7 @@ internal abstract class CreateExecutableFromJavaUsageRequest( override fun getTargetSubstitutor() = PsiJvmSubstitutor(project, getTargetSubstitutor(call)) - override fun getParameters(): List { + override fun getParameters(): List> { val argumentList = call.argumentList ?: return emptyList() val scope = call.resolveScope val codeStyleManager: JavaCodeStyleManager = project.service() @@ -48,7 +49,7 @@ internal abstract class CreateExecutableFromJavaUsageRequest( } val expectedTypeInfo = argType?.let { expectedType(it, ExpectedType.Kind.SUPERTYPE) } val expectedTypes = expectedTypeInfo?.let { listOf(it) } ?: emptyList() - ExpectedParameter(names, expectedTypes) + Pair(names, expectedTypes) } } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReferenceQuickFixProvider.kt b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReferenceQuickFixProvider.kt index a508f4ebbcae..e6d314e6b6d4 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReferenceQuickFixProvider.kt +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReferenceQuickFixProvider.kt @@ -50,11 +50,11 @@ class CreateEventHandlerRequest(element: XmlAttributeValue) : CreateMethodReques override fun getReturnType() = listOf(expectedType(PsiType.VOID, ExpectedType.Kind.EXACT)) - override fun getParameters(): List { + override fun getParameters(): List> { val eventType = getEventType(myElement) val expectedType = expectedType(eventType, ExpectedType.Kind.EXACT) val nameInfo = suggestParamName(myProject, eventType) - val parameter = ExpectedParameter(nameInfo, listOf(expectedType)) + val parameter = Pair(nameInfo, listOf(expectedType)) return listOf(parameter) }