Skip to content

origin/adkozlov/ALT-10982 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adkozlov wants to merge 3 commits into
base: main
Choose a base branch
from
Open

origin/adkozlov/ALT-10982 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3582710
ALT-10966 compilation fixed
adkozlov Feb 3, 2026
421a972
ALT-10982 read lock acquisition moved inside getFormattedTaskText
adkozlov Feb 11, 2026
7a214d7
ALT-10982 inner directory access removed
adkozlov Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions gradle-252.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ ideaVersion=IU-2025.2.4
clionVersion=CL-2025.2.4
pycharmVersion=PC-2025.2.4
riderVersion=RD-2025.2.4
# for running idea, pycharm, webstorm or android studio with plugins locally
# Path to pre-built plugin ZIP for runIde tasks (optional, overrides building from source)
localPluginPath=/Users/alexanderpetrov/Downloads/JetBrainsAcademy-2025.11-2025.2-994.zip
3 changes: 0 additions & 3 deletions gradle-253.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ ideaVersion=IU-2025.3
clionVersion=CL-2025.3
pycharmVersion=PC-2025.3
riderVersion=RD-2025.3
# for running idea, pycharm, webstorm or android studio with plugins locally
# Path to pre-built plugin ZIP for runIde tasks (optional, overrides building from source)
localPluginPath=/Users/alexanderpetrov/Downloads/JetBrainsAcademy-2025.11-2025.3-329.zip
3 changes: 2 additions & 1 deletion ...gin/hs-core/src/org/hyperskill/academy/coursecreator/validation/CourseValidationHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ class CourseValidationHelper(
}

private suspend fun TestSuiteBuilder.validateTaskDescriptionLinks(project: Project, task: Task) {
val text = readAction { task.getFormattedTaskText(project) } ?: return
val text = task.getFormattedTaskText(project)
?: return
val links = extractLinks(project, task, text)
// Don't create empty node if no links in the task description
if (links.isEmpty()) return
Expand Down
2 changes: 1 addition & 1 deletion intellij-plugin/hs-core/src/org/hyperskill/academy/learning/courseFormat/ext/StudyItemExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fun StudyItem.getDir(courseDir: VirtualFile): VirtualFile? {
lessonParent.getDir(courseDir)?.findFileByRelativePath(lessonParent.getPathToChildren())?.findChild(name)
}

is Task -> (parentOrNull as? Lesson)?.getDir(courseDir)?.let { findDir(it) }
is Task -> (parentOrNull as? Lesson)?.getDir(courseDir)?.findChild(name)
else -> error("Can't find directory for the item $itemType")
}
}
Expand Down
6 changes: 4 additions & 2 deletions intellij-plugin/hs-core/src/org/hyperskill/academy/learning/courseFormat/ext/TaskExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,11 @@ private fun VirtualFile.toDescriptionFormat(): DescriptionFormat =
DescriptionFormat.values().firstOrNull { it.extension == extension }
?: loadingError(EduCoreBundle.message("yaml.editor.invalid.description"))

@RequiresReadLock
fun Task.getFormattedTaskText(project: Project): String? {
var text = getTaskText(project) ?: return null
var text = runReadAction {
getTaskText(project)
} ?: return null

text = StringUtil.replace(text, "%IDE_NAME%", ApplicationNamesInfo.getInstance().fullProductName)
val textBuffer = StringBuffer(text)
replaceActionIDsWithShortcuts(textBuffer)
Expand Down
7 changes: 2 additions & 5 deletions ...ij-plugin/hs-core/src/org/hyperskill/academy/learning/taskToolWindow/ui/TaskToolWindow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package org.hyperskill.academy.learning.taskToolWindow.ui

import com.intellij.openapi.Disposable
import com.intellij.openapi.application.runReadAction
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.registry.Registry
import com.intellij.util.ui.update.MergingUpdateQueue
Expand Down Expand Up @@ -65,10 +64,8 @@ abstract class TaskToolWindow(protected val project: Project) : Disposable {
const val TASK_DESCRIPTION_UPDATE_DELAY_REGISTRY_KEY: String = "hyperskill.task.description.update.delay"

fun getTaskDescription(project: Project, task: Task?, uiMode: JavaUILibrary): String {
val openedTask = task ?: return EduCoreBundle.message("label.open.task")
val taskText = runReadAction {
openedTask.getFormattedTaskText(project)
} ?: return EduCoreBundle.message("label.open.task")
val taskText = task?.getFormattedTaskText(project)
?: return EduCoreBundle.message("label.open.task")
val transformerContext = HtmlTransformerContext(project, task, uiMode)
return TaskDescriptionTransformer.transform(taskText, transformerContext)
}
Expand Down
Loading