From 164ad4178b22d4eb4fad8f2567508d8f730d9952 Mon Sep 17 00:00:00 2001
From: Dmitry Kichinsky <dmitry.kichinsky@jetbrains.com>
Date: Thu, 4 Jan 2024 09:27:55 +0100
Subject: [PATCH] [maven] tests: inline doCheckHighlighting()

GitOrigin-RevId: 5a53aba3915fa275b66b1b5e74bde190733e3a4f
---
 .../maven/testFramework/MavenDomTestCase.kt   | 58 +++++++++----------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenDomTestCase.kt b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenDomTestCase.kt
index 7c2452d65b3b..1ac25e095529 100644
--- a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenDomTestCase.kt
+++ b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenDomTestCase.kt
@@ -359,22 +359,14 @@ abstract class MavenDomTestCase : MavenMultiVersionImportingTestCase() {
     withContext(Dispatchers.EDT) {
       dispatchAllInvocationEventsInIdeEventQueue()
       FileDocumentManager.getInstance().saveAllDocuments()
-      doCheckHighlighting(f)
-      FileDocumentManager.getInstance().saveAllDocuments()
-    }
-  }
 
-  private fun doCheckHighlighting(f: VirtualFile) {
-    MavenLog.LOG.warn("checkHighlighting started")
+      MavenLog.LOG.warn("checkHighlighting started")
 
-    VirtualFileManager.getInstance().syncRefresh()
-    MavenLog.LOG.warn("checkHighlighting: VFS refreshed")
+      VirtualFileManager.getInstance().syncRefresh()
+      MavenLog.LOG.warn("checkHighlighting: VFS refreshed")
+
+      val psiFile = findPsiFile(f)
 
-    val psiFile = findPsiFile(f)
-    if (null == psiFile) {
-      MavenLog.LOG.warn("checkHighlighting: psi file is null")
-    }
-    else {
       val document = myFixture!!.getDocument(psiFile)
       if (null == document) {
         MavenLog.LOG.warn("checkHighlighting: document is null")
@@ -383,28 +375,30 @@ abstract class MavenDomTestCase : MavenMultiVersionImportingTestCase() {
         FileDocumentManager.getInstance().reloadFromDisk(document)
         MavenLog.LOG.warn("checkHighlighting: document reloaded from disk")
       }
-    }
 
-    configTest(f)
-    MavenLog.LOG.warn("checkHighlighting: test configured")
+      configTest(f)
+      MavenLog.LOG.warn("checkHighlighting: test configured")
 
-    try {
-      myFixture!!.testHighlighting(true, false, true, f)
-    }
-    catch (throwable: Throwable) {
-      MavenLog.LOG.error("Exception during highlighting", throwable)
-      val cause1 = throwable.cause
-      if (null != cause1) {
-        MavenLog.LOG.error("Cause 1", cause1)
-        val cause2 = cause1.cause
-        if (null != cause2) {
-          MavenLog.LOG.error("Cause 2", cause2)
-        }
+      try {
+        myFixture!!.testHighlighting(true, false, true, f)
       }
-      throw RuntimeException(throwable)
-    }
-    finally {
-      MavenLog.LOG.warn("checkHighlighting finished")
+      catch (throwable: Throwable) {
+        MavenLog.LOG.error("Exception during highlighting", throwable)
+        val cause1 = throwable.cause
+        if (null != cause1) {
+          MavenLog.LOG.error("Cause 1", cause1)
+          val cause2 = cause1.cause
+          if (null != cause2) {
+            MavenLog.LOG.error("Cause 2", cause2)
+          }
+        }
+        throw RuntimeException(throwable)
+      }
+      finally {
+        MavenLog.LOG.warn("checkHighlighting finished")
+      }
+
+      FileDocumentManager.getInstance().saveAllDocuments()
     }
   }