From 7a095b84c351d22dc933639a502346a9b5744ade Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 20 Dec 2019 15:33:38 +0100
Subject: [PATCH] Cleanup (warnings; minor optimization)

GitOrigin-RevId: 17adfdb304a61f2aca08a906bb3e5775f5156a05
---
 .../codeInspection/javaDoc/JavadocHtmlLintAnnotator.kt    | 8 +++-----
 .../codeInsight/daemon/JavadocHtmlLintInspectionTest.kt   | 4 +++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocHtmlLintAnnotator.kt b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocHtmlLintAnnotator.kt
index de1c4d762865..ef67e987a985 100644
--- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocHtmlLintAnnotator.kt
+++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocHtmlLintAnnotator.kt
@@ -46,10 +46,8 @@ class JavadocHtmlLintAnnotator : ExternalAnnotator<JavadocHtmlLintAnnotator.Info
     runReadAction { if (isJava8SourceFile(file) && "/**" in file.text) Info(file) else null }
 
   override fun doAnnotate(collectedInfo: Info): Result? {
-    val text = runReadAction { if (collectedInfo.file.isValid) collectedInfo.file.text else null }
-    if (text == null) return null
-
-    val file = collectedInfo.file.virtualFile!!
+    val text = runReadAction { if (collectedInfo.file.isValid) collectedInfo.file.text else null } ?: return null
+    val file = collectedInfo.file.virtualFile ?: return null
     val copy = createTempFile(text.toByteArray(file.charset))
 
     try {
@@ -157,7 +155,7 @@ class JavadocHtmlLintAnnotator : ExternalAnnotator<JavadocHtmlLintAnnotator.Info
     while (i.hasNext()) {
       val line = i.next()
       val matcher = lintPattern.matcher(line)
-      if (matcher.matches() && i.hasNext() && !i.next().isEmpty() && i.hasNext()) {
+      if (matcher.matches() && i.hasNext() && i.next().isNotEmpty() && i.hasNext()) {
         val row = matcher.group(1).toInt() - 1
         val col = i.next().indexOf('^')
         val error = matcher.group(2) == "error"
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/JavadocHtmlLintInspectionTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/JavadocHtmlLintInspectionTest.kt
index e37900463437..8a066512d8ac 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/JavadocHtmlLintInspectionTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/JavadocHtmlLintInspectionTest.kt
@@ -8,13 +8,14 @@ import com.intellij.openapi.projectRoots.impl.JavaSdkImpl
 import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
+import com.intellij.util.lang.JavaVersion
 import java.io.File
 
 private val DESCRIPTOR = object : DefaultLightProjectDescriptor() {
   override fun getSdk(): Sdk? {
     val jreHome = File(System.getProperty("java.home"))
     val jdkHome = if (jreHome.name == "jre") jreHome.parentFile else jreHome
-    return (JavaSdk.getInstance() as JavaSdkImpl).createMockJdk("java version \"1.8.0\"", jdkHome.path, false)
+    return (JavaSdk.getInstance() as JavaSdkImpl).createMockJdk("java version \"{${JavaVersion.current()}}\"", jdkHome.path, false)
   }
 }
 
@@ -25,6 +26,7 @@ class JavadocHtmlLintInspectionTest : LightJavaCodeInsightFixtureTestCase() {
 
   fun testEmptyComment() = doTest("/** */\nclass C { }")
 
+  @Suppress("GrazieInspection")
   fun testCommonErrors() = doTest("""
     package pkg;
     /**