fix tests

Author: Tsyklop

intellij-plugin/hs-core/src/org/hyperskill/academy/learning/SolutionLoaderBase.kt

@@ -304,11 +304,13 @@ abstract class SolutionLoaderBase(protected val project: Project) : Disposable {
       // storeOriginalTemplateFiles uses task.taskFiles which may have stale disk content.
       frameworkLessonManager.ensureTemplateFilesCached(task)
 
-      val solutionMap = taskSolutions.visibleSolutions()
+      val solutionMap = taskSolutions.visibleSolutions(task)
       frameworkLessonManager.saveExternalChanges(task, solutionMap, taskSolutions.submissionId)
 
       var taskFilesChanged = false
       for ((path, solution) in taskSolutions.solutions) {
+        if (task.isSubmissionTestFile(path)) continue
+
         val taskFile = task.getTaskFile(path)
         if (taskFile == null) {
           if (!solution.isVisible) continue
@@ -333,6 +335,8 @@ abstract class SolutionLoaderBase(protected val project: Project) : Disposable {
     private fun applySolutionToCurrentTask(project: Project, task: Task, taskSolutions: TaskSolutions) {
       val taskDir = task.getDir(project.courseDir) ?: error("Directory for task `${task.name}` not found")
       for ((path, solution) in taskSolutions.solutions) {
+        if (task.isSubmissionTestFile(path)) continue
+
         val taskFile = task.getTaskFile(path)
 
         if (taskFile == null) {
@@ -368,15 +372,18 @@ abstract class SolutionLoaderBase(protected val project: Project) : Disposable {
       val lesson = task.lesson
       if (lesson is FrameworkLesson) {
         val frameworkLessonManager = FrameworkLessonManager.getInstance(project)
-        val solutionMap = taskSolutions.visibleSolutions()
+        val solutionMap = taskSolutions.visibleSolutions(task)
         frameworkLessonManager.saveExternalChanges(task, solutionMap, taskSolutions.submissionId)
       }
     }
 
-    private fun TaskSolutions.visibleSolutions(): Map<String, String> =
+    private fun TaskSolutions.visibleSolutions(task: Task): Map<String, String> =
       solutions
-        .filter { (_, solution) -> solution.isVisible }
+        .filter { (path, solution) -> solution.isVisible && !task.isSubmissionTestFile(path) }
         .mapValues { (_, solution) -> solution.text }
+
+    private fun Task.isSubmissionTestFile(path: String): Boolean =
+      getTaskFile(path)?.isTestFile ?: EduUtilsKt.isTestsFile(this, path)
   }
 
   protected data class Solution(val text: String, val isVisible: Boolean)

intellij-plugin/hs-core/src/org/hyperskill/academy/learning/actions/TaskNavigationAction.kt

@@ -5,6 +5,9 @@ import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.project.Project
 import org.hyperskill.academy.learning.EduUtilsKt.isEduProject
+import org.hyperskill.academy.learning.course
+import org.hyperskill.academy.learning.courseFormat.FrameworkLesson
+import org.hyperskill.academy.learning.courseFormat.ext.allTasks
 import org.hyperskill.academy.learning.courseFormat.tasks.Task
 import org.hyperskill.academy.learning.navigation.NavigationUtils
 import org.hyperskill.academy.learning.taskToolWindow.ui.TaskToolWindowView
@@ -23,7 +26,7 @@ abstract class TaskNavigationAction : DumbAwareAction() {
     e.presentation.isEnabled = false
     val project = e.project ?: return
     if (!project.isEduProject()) return
-    val currentTask = TaskToolWindowView.getInstance(project).currentTask ?: return
+    val currentTask = project.currentNavigationTask() ?: return
     if (getTargetTask(currentTask) != null || getCustomAction(currentTask) != null) {
       e.presentation.isEnabled = true
     }
@@ -32,7 +35,7 @@ abstract class TaskNavigationAction : DumbAwareAction() {
   override fun getActionUpdateThread() = ActionUpdateThread.BGT
 
   private fun navigateTask(project: Project, place: String) {
-    val currentTask = TaskToolWindowView.getInstance(project).currentTask ?: return
+    val currentTask = project.currentNavigationTask() ?: return
     val customAction = getCustomAction(currentTask)
     if (customAction != null) {
       customAction(project, currentTask)
@@ -43,5 +46,13 @@ abstract class TaskNavigationAction : DumbAwareAction() {
     NavigationUtils.navigateToTask(project, targetTask, currentTask)
   }
 
+  private fun Project.currentNavigationTask(): Task? {
+    TaskToolWindowView.getInstance(this).currentTask?.let { return it }
+    return course?.allTasks
+      ?.mapNotNull { it.lesson as? FrameworkLesson }
+      ?.distinct()
+      ?.firstNotNullOfOrNull { it.currentTask() }
+  }
+
   protected abstract fun getTargetTask(sourceTask: Task): Task?
 }

intellij-plugin/hs-core/src/org/hyperskill/academy/learning/framework/FrameworkLessonManager.kt

@@ -13,7 +13,7 @@ interface FrameworkLessonManager : EduTestAware {
   fun preparePrevTask(lesson: FrameworkLesson, taskDir: VirtualFile, showDialogIfConflict: Boolean)
 
   fun saveExternalChanges(task: Task, externalState: Map<String, String>, submissionId: Long? = null)
-  fun updateUserChanges(task: Task, newInitialState: Map<String, String>)
+  fun updateUserChanges(task: Task, newInitialState: Map<String, String>, newTaskFiles: Map<String, TaskFile> = emptyMap())
 
   /**
    * Adds new files to an existing snapshot without overwriting existing files.