Merge pull request #516 from alex999990009/alex99999/fixes

Mini fixes Arend Actions and typechecking Test.ard
JetBrains · Jun 17, 2024 · 5353fa0 · 5353fa0
2 parents c3281a7 + ef0e3ea
commit 5353fa0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/kotlin/org/arend/actions/ArendActions.kt b/src/main/kotlin/org/arend/actions/ArendActions.kt
@@ -3,6 +3,6 @@ package org.arend.actions
 import com.intellij.openapi.actionSystem.DefaultActionGroup
 import org.arend.ArendIcons.AREND
 
-class ArendActions : DefaultActionGroup("Arend Actions", "Show Arend Actions", AREND) {
+class ArendActions : DefaultActionGroup("Arend", "Show Arend Actions", AREND) {
     override fun isPopup(): Boolean = true
 }
diff --git a/src/main/kotlin/org/arend/typechecking/execution/TypeCheckProcessHandler.kt b/src/main/kotlin/org/arend/typechecking/execution/TypeCheckProcessHandler.kt
@@ -41,6 +41,7 @@ import org.arend.typechecking.error.TypecheckingErrorReporter
 import org.arend.typechecking.execution.TypecheckRunConfigurationProducer.Companion.TEST_PREFIX
 import org.arend.typechecking.order.Ordering
 import org.arend.typechecking.order.listener.CollectingOrderingListener
+import org.arend.util.FileUtils.EXTENSION
 import org.arend.util.afterTypechecking
 import org.jetbrains.ide.PooledThreadExecutor
 import java.io.OutputStream
@@ -122,7 +123,7 @@ class TypeCheckProcessHandler(
                         val modulePaths = if (modulePath == null) library.loadedModules else listOf(modulePath)
                         val modules = modulePaths.flatMap {
                             var newModulePath = it
-                            val isTest = newModulePath.firstName == TEST_PREFIX ||
+                            val isTest = (newModulePath.firstName == TEST_PREFIX && newModulePath.toList().getOrNull(1) != EXTENSION.drop(1)) ||
                                     (newModulePath.size() == 1 && newModulePath.firstName == library.config.testsDirFile?.name)
                             val isSource = newModulePath.firstName == library.config.sourcesDirFile?.name
                             if (isTest || isSource) {