azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UnimplementedKotlinInterfaceMemberAnnotator: cleanup code

Browse Source
This commit is contained in:
Dmitry Gridin
2019-07-23 13:13:19 +03:00
parent ad1b795a69
commit cf07585b11
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/java/UnimplementedKotlinInterfaceMemberAnnotator.kt
+7 -16
View File
@@ -1,17 +1,6 @@
/*
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.java
@@ -64,8 +53,10 @@ class UnimplementedKotlinInterfaceMemberAnnotator : Annotator {
private fun report(method: KtLightMethod, holder: AnnotationHolder, psiClass: PsiClass) {
val key = if (psiClass is PsiEnumConstantInitializer) "enum.constant.should.implement.method" else "class.must.be.abstract"
val message = JavaErrorMessages.message(key, HighlightUtil.formatClass(psiClass, false), JavaHighlightUtil.formatMethod(method),
HighlightUtil.formatClass(method.containingClass, false))
val message = JavaErrorMessages.message(
key, HighlightUtil.formatClass(psiClass, false), JavaHighlightUtil.formatMethod(method),
HighlightUtil.formatClass(method.containingClass, false)
)
val errorAnnotation = holder.createErrorAnnotation(getClassDeclarationTextRange(psiClass), message)
registerFixes(errorAnnotation, psiClass)
}
@@ -75,7 +66,7 @@ class UnimplementedKotlinInterfaceMemberAnnotator : Annotator {
// this code is untested
// see com.intellij.codeInsight.daemon.impl.analysis.HighlightClassUtil.checkClassWithAbstractMethods
errorAnnotation.registerFix(quickFixFactory.createImplementMethodsFix(psiClass))
if (psiClass !is PsiAnonymousClass && !(psiClass.modifierList?.hasExplicitModifier(PsiModifier.FINAL) ?: false)) {
if (psiClass !is PsiAnonymousClass && psiClass.modifierList?.hasExplicitModifier(PsiModifier.FINAL) != true) {
errorAnnotation.registerFix(quickFixFactory.createModifierListFix(psiClass, PsiModifier.ABSTRACT, true, false))
}
}