From 31984f7a91db644b7847de6b03d16e257695a3b7 Mon Sep 17 00:00:00 2001
From: Ivan Magda <ivan.magda@hyperskill.org>
Date: Mon, 23 Sep 2024 14:45:51 +0900
Subject: [PATCH 1/2] Fix
 StepQuizCodeBlanksResolver.getSuggestionsForBlankCodeBlock

---
 .../presentation/StepQuizCodeBlanksResolver.kt              | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_code_blanks/presentation/StepQuizCodeBlanksResolver.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_code_blanks/presentation/StepQuizCodeBlanksResolver.kt
index ecc0a2a8b..f0b629948 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_code_blanks/presentation/StepQuizCodeBlanksResolver.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_code_blanks/presentation/StepQuizCodeBlanksResolver.kt
@@ -44,7 +44,11 @@ internal object StepQuizCodeBlanksResolver {
                 }
 
             else ->
-                listOf(Suggestion.Print)
+                if (availableConditions.contains(Suggestion.IfStatement.text)) {
+                    listOf(Suggestion.Print, Suggestion.IfStatement)
+                } else {
+                    listOf(Suggestion.Print)
+                }
         }
 
     fun areElifAndElseStatementsSuggestionsAvailable(

From 69e70c69d846d65d9ddfbe106aacbc886cc78c7c Mon Sep 17 00:00:00 2001
From: Ivan Magda <ivan.magda@hyperskill.org>
Date: Mon, 23 Sep 2024 14:46:21 +0900
Subject: [PATCH 2/2] Fix CodeBlanksTemplateMapper suggestions for blanks

---
 .../template/CodeBlanksTemplateMapper.kt      | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_code_blanks/domain/model/template/CodeBlanksTemplateMapper.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_code_blanks/domain/model/template/CodeBlanksTemplateMapper.kt
index ec0d157dd..cfc1d3bb7 100644
--- a/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_code_blanks/domain/model/template/CodeBlanksTemplateMapper.kt
+++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step_quiz_code_blanks/domain/model/template/CodeBlanksTemplateMapper.kt
@@ -30,14 +30,11 @@ internal object CodeBlanksTemplateMapper {
     private fun mapCodeBlanksTemplate(
         codeBlanksTemplate: List<CodeBlockTemplateEntry>,
         step: Step
-    ): List<CodeBlock> {
-        val supportedEntries = codeBlanksTemplate.filter { it.type != CodeBlockTemplateEntryType.UNKNOWN }
-        return if (supportedEntries.isEmpty()) {
-            emptyList()
-        } else {
-            supportedEntries.map { mapCodeBlockTemplateEntry(entry = it, step = step) }
-        }
-    }
+    ): List<CodeBlock> =
+        codeBlanksTemplate
+            .filter { it.type != CodeBlockTemplateEntryType.UNKNOWN }
+            .map { mapCodeBlockTemplateEntry(entry = it, step = step) }
+            .let { setSuggestionsForBlankCodeBlocks(codeBlocks = it, step = step) }
 
     private fun mapCodeBlockTemplateEntry(
         entry: CodeBlockTemplateEntry,
@@ -49,10 +46,7 @@ internal object CodeBlanksTemplateMapper {
                     isActive = entry.isActive,
                     indentLevel = entry.indentLevel,
                     isDeleteForbidden = entry.isDeleteForbidden,
-                    suggestions = StepQuizCodeBlanksResolver.getSuggestionsForBlankCodeBlock(
-                        isVariableSuggestionAvailable = StepQuizCodeBlanksResolver.isVariableSuggestionsAvailable(step),
-                        availableConditions = step.block.options.codeBlanksAvailableConditions ?: emptySet()
-                    )
+                    suggestions = emptyList()
                 )
             CodeBlockTemplateEntryType.PRINT ->
                 CodeBlock.Print(
@@ -140,6 +134,26 @@ internal object CodeBlanksTemplateMapper {
         }
     }
 
+    private fun setSuggestionsForBlankCodeBlocks(
+        codeBlocks: List<CodeBlock>,
+        step: Step
+    ): List<CodeBlock> =
+        codeBlocks.mapIndexed { index, codeBlock ->
+            if (codeBlock is CodeBlock.Blank) {
+                codeBlock.copy(
+                    suggestions = StepQuizCodeBlanksResolver.getSuggestionsForBlankCodeBlock(
+                        index = index,
+                        indentLevel = codeBlock.indentLevel,
+                        codeBlocks = codeBlocks,
+                        isVariableSuggestionAvailable = StepQuizCodeBlanksResolver.isVariableSuggestionsAvailable(step),
+                        availableConditions = step.block.options.codeBlanksAvailableConditions ?: emptySet()
+                    )
+                )
+            } else {
+                codeBlock
+            }
+        }
+
     private fun createMathExpressionsCodeBlocks(step: Step): List<CodeBlock> =
         listOf(
             CodeBlock.Variable(