Updated dependencies. Tests work again. Cosmetics, fixed warnings.

src/main/java/de/platon42/intellij/plugins/m68k/asm/M68kIsa.kt

@@ -1074,12 +1074,14 @@ object M68kIsa {
         ),
 
         IsaData("reset", "Reset External Devices", machine = ALL_MACHINES, isPrivileged = true, hasOps = false, modes = NO_OPS_UNSIZED),
+
         IsaData(
             "rte", "Return from Exception",
             machine = ALL_MACHINES, isPrivileged = true, hasOps = false,
             modes = listOf(AllowedAdrMode(size = OP_UNSIZED, modInfo = RWM_MODIFY_STACK)),
             changesControlFlow = true
         ),
+
         IsaData(
             "stop", "Stop",
             machine = ALL_MACHINES, isPrivileged = true,
@@ -1095,6 +1097,7 @@ object M68kIsa {
         ),
 
         IsaData("illegal", "Take Illegal Instruction Trap", machine = ALL_MACHINES, hasOps = false, modes = NO_OPS_UNSIZED, changesControlFlow = true),
+
         IsaData(
             "trap",
             "Trap",
@@ -1203,8 +1206,7 @@ object M68kIsa {
         null
     }
 
-    private
-    val mnemonicLookupMap = isaData.asSequence()
+    private val mnemonicLookupMap = isaData.asSequence()
         .flatMap {
             (if (it.conditionCodes.isEmpty()) it.altMnemonics.plus(it.mnemonic) else it.altMnemonics.plus(it.conditionCodes
                 .map { cc ->

src/main/java/de/platon42/intellij/plugins/m68k/inspections/M68kUnresolvedReferenceInspection.kt

@@ -29,7 +29,7 @@ class M68kUnresolvedReferenceInspection : AbstractBaseM68kLocalInspectionTool()
             }
 
             override fun visitSymbolReference(symbolReference: M68kSymbolReference) {
-                val references = symbolReference.references ?: return
+                val references = symbolReference.references
                 if (references.isEmpty()) return
                 val resolve = references.mapNotNull { it as? PsiPolyVariantReference }
                     .firstNotNullOfOrNull { it.multiResolve(false).ifEmpty { null } }

src/test/java/de/platon42/intellij/jupiter/LightCodeInsightExtension.java

@@ -12,6 +12,7 @@ import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.extension.*;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
+import org.junit.runner.Description;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -34,8 +35,11 @@ public class LightCodeInsightExtension implements ParameterResolver, AfterTestEx
     public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
         LightCodeInsightFixtureTestCaseWrapper testCase = getWrapper(extensionContext);
         Parameter parameter = parameterContext.getParameter();
-        if (parameter.isAnnotationPresent(MyFixture.class)) return testCase.getMyFixture();
-        else if (parameter.isAnnotationPresent(MyTestCase.class)) return testCase;
+        if (parameter.isAnnotationPresent(MyFixture.class)) {
+            return testCase.getMyFixture();
+        } else if (parameter.isAnnotationPresent(MyTestCase.class)) {
+            return testCase;
+        }
         return null;
     }
 
@@ -68,14 +72,15 @@ public class LightCodeInsightExtension implements ParameterResolver, AfterTestEx
     @Override
     public void interceptTestMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
         Throwable[] throwables = new Throwable[1];
+        Description testDescription = Description.createTestDescription(extensionContext.getRequiredTestClass(), getWrapper(extensionContext).getName());
 
         Runnable runnable = () -> {
             try {
                 TestLoggerFactory.onTestStarted();
                 invocation.proceed();
-                TestLoggerFactory.onTestFinished(true);
+                TestLoggerFactory.onTestFinished(true, testDescription);
             } catch (Throwable e) {
-                TestLoggerFactory.onTestFinished(false);
+                TestLoggerFactory.onTestFinished(false, testDescription);
                 throwables[0] = e;
             }
         };

src/test/java/de/platon42/intellij/jupiter/ParsingTestExtension.java

@@ -6,14 +6,13 @@ import com.intellij.mock.MockProjectEx;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.psi.PsiFile;
-import com.intellij.testFramework.EdtTestUtilKt;
 import com.intellij.testFramework.ParsingTestCase;
 import com.intellij.testFramework.TestLoggerFactory;
-import com.intellij.testFramework.fixtures.IdeaTestExecutionPolicy;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.extension.*;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
+import org.junit.runner.Description;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
@@ -81,37 +80,22 @@ public class ParsingTestExtension implements ParameterResolver, AfterTestExecuti
     @Override
     public void interceptTestMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
         Throwable[] throwables = new Throwable[1];
+        Description testDescription = Description.createTestDescription(extensionContext.getRequiredTestClass(), getWrapper(extensionContext).getName());
 
-        Runnable runnable = () -> {
-            try {
-                TestLoggerFactory.onTestStarted();
-                invocation.proceed();
-                TestLoggerFactory.onTestFinished(true);
-            } catch (Throwable e) {
-                TestLoggerFactory.onTestFinished(false);
-                throwables[0] = e;
-            }
-        };
-
-        invokeTestRunnable(runnable);
+        try {
+            TestLoggerFactory.onTestStarted();
+            invocation.proceed();
+            TestLoggerFactory.onTestFinished(true, testDescription);
+        } catch (Throwable e) {
+            TestLoggerFactory.onTestFinished(false, testDescription);
+            throwables[0] = e;
+        }
 
         if (throwables[0] != null) {
             throw throwables[0];
         }
     }
 
-    private static void invokeTestRunnable(@NotNull Runnable runnable) {
-        IdeaTestExecutionPolicy policy = IdeaTestExecutionPolicy.current();
-        if (policy != null && !policy.runInDispatchThread()) {
-            runnable.run();
-        } else {
-            EdtTestUtilKt.runInEdtAndWait(() -> {
-                runnable.run();
-                return null;
-            });
-        }
-    }
-
     public interface IParsingTestCase {
 
         MockProjectEx getProject();

src/test/java/de/platon42/intellij/plugins/m68k/documentation/AbstractDocumentationProviderTest.kt

@@ -12,6 +12,7 @@ import org.junit.jupiter.api.extension.ExtendWith
 abstract class AbstractDocumentationProviderTest : AbstractM68kTest() {
 
     fun generateDocumentation(myFixture: CodeInsightTestFixture): String? {
+        // FIXME migrate to DocumentationTarget
         val docElement = DocumentationManager.getInstance(myFixture.project).findTargetElement(myFixture.editor, myFixture.file)
         val provider = DocumentationManager.getProviderFromElement(docElement)
 

src/test/java/de/platon42/intellij/plugins/m68k/inspections/M68kInspectionSuppressorTest.kt

@@ -63,7 +63,7 @@ internal class M68kInspectionSuppressorTest : AbstractInspectionTest() {
         val quickFixPair = highlightInfos[0].quickFixActionRanges[0]
         val intentionActionDescriptor = quickFixPair.first
         val element = myFixture.file.findElementAt(quickFixPair.second.startOffset)!!
-        val suppressQuickFix = intentionActionDescriptor.getOptions(element, myFixture.editor)!!
+        val suppressQuickFix = intentionActionDescriptor.getOptions(element, myFixture.editor)
             .first { it.text == suppressAction }
         myFixture.launchAction(suppressQuickFix)
     }

src/test/java/de/platon42/intellij/plugins/m68k/refs/M68kReferenceContributorTest.kt

@@ -103,7 +103,7 @@ internal class M68kReferenceContributorTest : AbstractM68kTest() {
         assertThat(otherfile.text).isEqualTo("; oh no!")
 
         myFixture.renameElementAtCaret("foobar.asm")
-        val files = FilenameIndex.getFilesByName(myFixture.project, "foobar.asm", GlobalSearchScope.allScope(myFixture.project))
+        val files = FilenameIndex.getVirtualFilesByName("foobar.asm", GlobalSearchScope.allScope(myFixture.project))
         assertThat(files).hasSize(1)
 
         assertThat(file.text).isEqualToIgnoringWhitespace("include \"foobar.asm\"")
@@ -123,7 +123,7 @@ internal class M68kReferenceContributorTest : AbstractM68kTest() {
         assertThat(otherfile.text).isEqualTo("; oh no!")
 
         myFixture.renameElementAtCaret("foobar.asm")
-        val files = FilenameIndex.getFilesByName(myFixture.project, "foobar.asm", GlobalSearchScope.allScope(myFixture.project))
+        val files = FilenameIndex.getVirtualFilesByName("foobar.asm", GlobalSearchScope.allScope(myFixture.project))
         assertThat(files).hasSize(1)
 
         assertThat(file.text).isEqualToIgnoringWhitespace("include \"foobar/foobar.asm\"")