From 3dc7502b0b093e74d50b9362c5c24bb13fbef1d6 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 23 Nov 2017 21:49:17 +0900 Subject: [PATCH] Kapt, minor: Remove kaptError with location, it doesn't do anything reasonable now anyway --- .../src/org/jetbrains/kotlin/kapt3/javac/KaptJavaLog.kt | 5 ----- .../org/jetbrains/kotlin/kapt3/stubs/ErrorTypeCorrector.kt | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaLog.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaLog.kt index 757ceeacb6f..8e184122611 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaLog.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaLog.kt @@ -231,11 +231,6 @@ fun KaptContext<*>.kaptError(text: String): JCDiagnostic { return JCDiagnostic.Factory.instance(context).errorJava9Aware(null, null, "proc.messager", text) } -fun KaptContext<*>.kaptError(text: String, target: PsiElement): JCDiagnostic { - //TODO provide source binding - return JCDiagnostic.Factory.instance(context).errorJava9Aware(null, null, "proc.messager", text) -} - private fun JCDiagnostic.Factory.errorJava9Aware( source: DiagnosticSource?, pos: JCDiagnostic.DiagnosticPosition?, diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ErrorTypeCorrector.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ErrorTypeCorrector.kt index b34a07ce1c1..977edfd0d46 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ErrorTypeCorrector.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ErrorTypeCorrector.kt @@ -201,7 +201,7 @@ class ErrorTypeCorrector( if (typeParameters.size != arguments.size) { val kaptContext = converter.kaptContext kaptContext.compiler.log.report( - kaptContext.kaptError("${typeParameters.size} parameters are expected but ${arguments.size} passed", actualType)) + kaptContext.kaptError("${typeParameters.size} parameters are expected but ${arguments.size} passed")) return emptyMap() }