From 21e21aca1d4ad49355cb51b549d1454cb97741a7 Mon Sep 17 00:00:00 2001 From: Maxim Bachinsky Date: Thu, 20 Aug 2020 17:55:14 +0300 Subject: [PATCH] fix android lint bug with no file column errors --- .../src/main/java/static_analysis/errors/AndroidLintError.kt | 4 ++-- .../src/main/java/static_analysis/linters/AndroidLinter.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/plugins/src/main/java/static_analysis/errors/AndroidLintError.kt b/gradle/plugins/src/main/java/static_analysis/errors/AndroidLintError.kt index aee4a44..b7b850b 100644 --- a/gradle/plugins/src/main/java/static_analysis/errors/AndroidLintError.kt +++ b/gradle/plugins/src/main/java/static_analysis/errors/AndroidLintError.kt @@ -2,11 +2,11 @@ package static_analysis.errors class AndroidLintError( private val filePath: String, - private val fileLine: String, + private val fileLine: String?, private val errorId: String, private val description: String ) : StaticAnalysisError { - override fun print(count: Int): String = "\n$count. Android Lint. $description ($errorId)\n\tat [$filePath:$fileLine]" + override fun print(count: Int): String = "\n$count. Android Lint. $description ($errorId)\n\tat [$filePath${fileLine?.let { ":$it" }.orEmpty()}]" } diff --git a/gradle/plugins/src/main/java/static_analysis/linters/AndroidLinter.kt b/gradle/plugins/src/main/java/static_analysis/linters/AndroidLinter.kt index f299d22..3e19265 100644 --- a/gradle/plugins/src/main/java/static_analysis/linters/AndroidLinter.kt +++ b/gradle/plugins/src/main/java/static_analysis/linters/AndroidLinter.kt @@ -24,7 +24,7 @@ class AndroidLinter : Linter { .map { locationNode -> AndroidLintError( filePath = locationNode.attribute("file") as String, - fileLine = locationNode.attribute("line") as String, + fileLine = locationNode.attribute("line") as String?, errorId = errorNode.attribute("id") as String, description = errorNode.attribute("message") as String )