MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[groovy] remove unneeded ConstructorCallHighlighter#argumentList

Browse Source 
GitOrigin-RevId: 0ac341ca2d8d02d2334ad14cba9eaeacadee9c8b
This commit is contained in:
Daniil Ovchinnikov
2019-12-27 14:07:55 +00:00
committed by intellij-monorepo-bot
parent 76bf5f5eb0
commit 7abb25cd4e
5 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/ConstructorCallHighlighter.kt
-3
View File
@@ -6,7 +6,6 @@ import com.intellij.psi.PsiType
import org.jetbrains.plugins.groovy.GroovyBundle
import org.jetbrains.plugins.groovy.highlighting.HighlightSink
import org.jetbrains.plugins.groovy.lang.psi.api.GroovyMethodResult
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.DefaultConstructor
import org.jetbrains.plugins.groovy.lang.resolve.api.Arguments
import org.jetbrains.plugins.groovy.lang.resolve.api.ExpressionArgument
@@ -14,8 +13,6 @@ import org.jetbrains.plugins.groovy.lang.resolve.api.GroovyCallReference
abstract class ConstructorCallHighlighter(reference: GroovyCallReference, sink: HighlightSink) : CallReferenceHighlighter(reference, sink) {
protected abstract val argumentList: GrArgumentList?
override fun getInapplicableMethodMessage(result: GroovyMethodResult, containingType: PsiType, arguments: Arguments): String {
val method = result.element
val methodName = method.name
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrConstructorInvocationHighlighter.kt
+1 -4
View File
@@ -9,16 +9,13 @@ import org.jetbrains.plugins.groovy.codeInspection.untypedUnresolvedAccess.reque
import org.jetbrains.plugins.groovy.highlighting.HighlightSink
import org.jetbrains.plugins.groovy.lang.psi.api.GroovyMethodResult
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrConstructorInvocation
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList
class GrConstructorInvocationHighlighter(
private val invocation: GrConstructorInvocation,
sink: HighlightSink
) : ConstructorCallHighlighter(invocation.constructorReference, sink) {
override val argumentList: GrArgumentList get() = invocation.argumentList
override val highlightElement: PsiElement get() = argumentList
override val highlightElement: PsiElement get() = invocation.argumentList
override fun generateFixes(results: Collection<GroovyMethodResult>): Array<LocalQuickFix> {
val fixes = super.generateFixes(results)
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrEnumConstantHighlighter.kt
+1 -4
View File
@@ -3,7 +3,6 @@ package org.jetbrains.plugins.groovy.codeInspection.type.highlighting
import com.intellij.psi.PsiElement
import org.jetbrains.plugins.groovy.highlighting.HighlightSink
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrEnumConstant
class GrEnumConstantHighlighter(
@@ -11,7 +10,5 @@ class GrEnumConstantHighlighter(
sink: HighlightSink
) : ConstructorCallHighlighter(enumConstant.constructorReference, sink) {
override val argumentList: GrArgumentList? get() = enumConstant.argumentList
override val highlightElement: PsiElement get() = argumentList ?: enumConstant.nameIdentifierGroovy
override val highlightElement: PsiElement get() = enumConstant.argumentList ?: enumConstant.nameIdentifierGroovy
}
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/GrNewExpressionHighlighter.kt
+1 -4
View File
@@ -10,7 +10,6 @@ import org.jetbrains.plugins.groovy.annotator.intentions.QuickfixUtil.intentions
import org.jetbrains.plugins.groovy.codeInspection.untypedUnresolvedAccess.requests.CreateConstructorFromGroovyUsageRequest
import org.jetbrains.plugins.groovy.highlighting.HighlightSink
import org.jetbrains.plugins.groovy.lang.psi.api.GroovyMethodResult
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrNewExpression
import org.jetbrains.plugins.groovy.lang.resolve.api.GroovyCallReference
@@ -20,10 +19,8 @@ class GrNewExpressionHighlighter(
sink: HighlightSink
) : ConstructorCallHighlighter(reference, sink) {
override val argumentList: GrArgumentList? get() = newExpression.argumentList
override val highlightElement: PsiElement
get() = requireNotNull(argumentList ?: newExpression.referenceElement) {
get() = requireNotNull(newExpression.argumentList ?: newExpression.referenceElement) {
"reference of new expression should exist if it is a constructor call"
}
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/highlighting/LiteralConstructorReferenceHighlighter.kt
-2
View File
@@ -6,7 +6,6 @@ import com.intellij.psi.PsiElement
import org.jetbrains.plugins.groovy.GroovyBundle
import org.jetbrains.plugins.groovy.highlighting.HighlightSink
import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList
import org.jetbrains.plugins.groovy.lang.resolve.api.GroovyConstructorReference
import org.jetbrains.plugins.groovy.lang.typing.GrCollectionConstructorConverter.Companion.hasCollectionApplicableConstructor
@@ -15,7 +14,6 @@ class LiteralConstructorReferenceHighlighter(
override val highlightElement: PsiElement,
sink: HighlightSink
) : ConstructorCallHighlighter(reference, sink) {
override val argumentList: GrArgumentList? = null
override fun shouldHighlightInapplicable(): Boolean {
val clazz = (reference as GroovyConstructorReference).resolveClass()?.element as? PsiClass