[BUG] Highlights commands in tip (hedyorg#4235)

app.py

@@ -731,6 +731,7 @@ def translate_error(code, arguments, keyword_lang):
         'ask',
         'echo',
         'is',
+        'if',
         'repeat']
     arguments_that_require_highlighting = [
         'command',
@@ -744,6 +745,7 @@ def translate_error(code, arguments, keyword_lang):
         'ask',
         'echo',
         'is',
+        'if',
         'repeat']
 
     # Todo TB -> We have to find a more delicate way to fix this: returns some gettext() errors
@@ -766,6 +768,7 @@ def translate_error(code, arguments, keyword_lang):
     arguments["else"] = "else"
     arguments["repeat"] = "repeat"
     arguments["is"] = "is"
+    arguments["if"] = "if"
 
     # some arguments like allowed types or characters need to be translated in the error message
     for k, v in arguments.items():

hedy.py

@@ -2851,7 +2851,7 @@ def contains_any_of(commands, line):
 
                 # no else in next line?
                 # add a nop (like 'Pass' but we just insert a meaningless assign)
-                line = line + " else _ is x"
+                line = line + " else x__x__x__x is 5"
 
         processed_code.append(line)
     processed_code.append(lines[-1])  # always add the last line (if it has if and no else that is no problem)
@@ -2877,7 +2877,7 @@ def check_program_size_is_valid(input_string):
         raise exceptions.InputTooBigException(lines_of_code=number_of_lines, max_lines=MAX_LINES)
 
 
-def process_input_string(input_string, level, lang, escape_backslashes=True):
+def process_input_string(input_string, level, lang, escape_backslashes=True, preprocess_ifs_enabled=True):
     result = input_string.replace('\r\n', '\n')
 
     location = location_of_first_blank(result)
@@ -2887,8 +2887,8 @@ def process_input_string(input_string, level, lang, escape_backslashes=True):
     if escape_backslashes and level >= 4:
         result = result.replace("\\", "\\\\")
 
-    # In levels 5 to 8 we do not allow if without else, we add an empty print to make it possible in the parser
-    if level >= 5 and level <= 8:
+    # In levels 5 to 7 we do not allow if without else, we add an empty print to make it possible in the parser
+    if level >= 5 and level < 8 and preprocess_ifs_enabled:
         result = preprocess_ifs(result, lang)
 
     # In level 8 we add indent-dedent blocks to the code before parsing

hedy_translation.py

@@ -73,7 +73,7 @@ def translate_keywords(input_string_, from_lang="en", to_lang="nl", level=1):
     """ "Return code with keywords translated to language of choice in level of choice"""
     try:
         processed_input = hedy.process_input_string(
-            input_string_, level, from_lang, escape_backslashes=False
+            input_string_, level, from_lang, escape_backslashes=False, preprocess_ifs_enabled=False
         )
 
         parser = hedy.get_parser(level, from_lang, True)

tests/test_level/test_level_05.py

@@ -592,11 +592,11 @@ def test_consecutive_if_statements(self):
         if name == 'Hedy':
           print(f'nice!')
         else:
-          _ = 'x'
+          x__x__x__x = '5'
         if name in names:
           print(f'nice!')""")
 
-        self.single_level_tester(code=code, expected=expected, translate=False)
+        self.single_level_tester(code=code, expected=expected)
 
     def test_onno_3372(self):
         code = textwrap.dedent("""\
@@ -609,12 +609,11 @@ def test_onno_3372(self):
         if antw == 'schaar':
           print(f'gelijk spel!')
         else:
-          _ = 'x'
+          x__x__x__x = '5'
         print(f'test')""")
 
         self.single_level_tester(code=code,
-                                 expected=expected,
-                                 translate=False)
+                                 expected=expected)
 
     def test_restaurant_example(self):
         code = textwrap.dedent("""\
@@ -630,16 +629,15 @@ def test_restaurant_example(self):
         if eten == 'friet':
           saus = input(f'Welke saus wilt u bij de friet?')
         else:
-          _ = 'x'
+          x__x__x__x = '5'
         if eten == 'pizza':
           topping = input(f'Welke topping wilt u op de pizza?')
         else:
-          _ = 'x'
+          x__x__x__x = '5'
         print(f'{eten}')""")
 
         self.single_level_tester(code=code,
-                                 expected=expected,
-                                 translate=False)
+                                 expected=expected, translate=False)
 
     def test_onno_3372_else(self):
         code = textwrap.dedent("""\
@@ -656,8 +654,7 @@ def test_onno_3372_else(self):
         print(f'test')""")
 
         self.single_level_tester(code=code,
-                                 expected=expected,
-                                 translate=False)
+                                 expected=expected)
 
     def test_consecutive_if_and_if_else_statements(self):
         code = textwrap.dedent("""\
@@ -671,15 +668,14 @@ def test_consecutive_if_and_if_else_statements(self):
         if naam == 'Hedy':
           print(f'leuk')
         else:
-          _ = 'x'
+          x__x__x__x = '5'
         if naam == 'Python':
           print(f'ook leuk')
         else:
           print(f'minder leuk!')""")
 
         self.single_level_tester(code=code,
-                                 expected=expected,
-                                 translate=False)
+                                 expected=expected)
 
     def test_consecutive_if_else_statements(self):
         code = textwrap.dedent("""\
@@ -700,7 +696,7 @@ def test_consecutive_if_else_statements(self):
         else:
           print(f'meh')""")
 
-        self.single_level_tester(code=code, expected=expected, translate=False)
+        self.single_level_tester(code=code, expected=expected)
 
     def test_turn_if_forward(self):
         code = textwrap.dedent("""\
@@ -842,7 +838,7 @@ def test_if_fix_nl(self):
         if naam == '5':
           print(f'leuk')
         else:
-          _ = 'x'
+          x__x__x__x = '5'
         print(f'minder leuk!')""")
 
         self.multi_level_tester(
@@ -946,7 +942,7 @@ def test_double_if_pressed(self):
               break
             # End of PyGame Event Handler""")
 
-        self.multi_level_tester(code=code, expected=expected, max_level=7, translate=False)
+        self.multi_level_tester(code=code, expected=expected, max_level=7)
 
     def test_if_pressed_has_enter_after_pressed(self):
         code = textwrap.dedent("""\
@@ -1242,7 +1238,7 @@ def test_if_pressed_non_latin(self):
               break
             # End of PyGame Event Handler""")
 
-        self.multi_level_tester(code=code, expected=expected, max_level=7, translate=False)
+        self.multi_level_tester(code=code, expected=expected, max_level=7)
 
     def test_if_pressed_missing_else_gives_error(self):
         code = textwrap.dedent("""\

tests/test_level/test_level_06.py

@@ -828,11 +828,11 @@ def test_consecutive_if_statements(self):
         if convert_numerals('Latin', name) == convert_numerals('Latin', 'Hedy'):
           print(f'nice!')
         else:
-          _ = 'x'
+          x__x__x__x = '5'
         if name in names:
           print(f'nice!')""")
 
-        self.multi_level_tester(max_level=7, code=code, expected=expected, translate=False)
+        self.multi_level_tester(max_level=7, code=code, expected=expected)
 
     def test_consecutive_if_and_if_else_statements(self):
         code = textwrap.dedent("""\
@@ -846,13 +846,13 @@ def test_consecutive_if_and_if_else_statements(self):
         if convert_numerals('Latin', naam) == convert_numerals('Latin', 'Hedy'):
           print(f'leuk')
         else:
-          _ = 'x'
+          x__x__x__x = '5'
         if convert_numerals('Latin', naam) == convert_numerals('Latin', 'Python'):
           print(f'ook leuk')
         else:
           print(f'minder leuk!')""")
 
-        self.multi_level_tester(max_level=7, code=code, expected=expected, translate=False)
+        self.multi_level_tester(max_level=7, code=code, expected=expected)
 
     def test_consecutive_if_else_statements(self):
         code = textwrap.dedent("""\

tests/test_level/test_level_07.py

@@ -419,7 +419,7 @@ def test_repeat_if_multiple(self):
           if convert_numerals('Latin', aan) == convert_numerals('Latin', 'ja'):
             print(f'Hedy is leuk!')
           else:
-            _ = 'x'
+            x__x__x__x = '5'
           time.sleep(0.1)
         for __i__ in range(int('3')):
           if convert_numerals('Latin', aan) == convert_numerals('Latin', 'ja'):
@@ -437,5 +437,4 @@ def test_repeat_if_multiple(self):
         self.single_level_tester(
             code=code,
             expected=expected,
-            output=output,
-            translate=False)
+            output=output)

translations/bg/LC_MESSAGES/messages.po

@@ -1162,7 +1162,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 msgid "no_programs"
 msgstr "Нямаш програми."

translations/bn/LC_MESSAGES/messages.po

@@ -1212,7 +1212,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 #, fuzzy
 msgid "no_programs"

translations/ca/LC_MESSAGES/messages.po

@@ -1170,7 +1170,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 #, fuzzy
 msgid "no_programs"

translations/cs/LC_MESSAGES/messages.po

@@ -1160,7 +1160,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 #, fuzzy
 msgid "no_programs"

translations/cy/LC_MESSAGES/messages.po

@@ -1231,7 +1231,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 #, fuzzy
 msgid "no_programs"

translations/da/LC_MESSAGES/messages.po

@@ -1231,7 +1231,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 #, fuzzy
 msgid "no_programs"

translations/en/LC_MESSAGES/messages.po

@@ -935,7 +935,7 @@ msgid "no_certificate"
 msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 msgid "no_programs"
 msgstr "You have no programs yet."

translations/eo/LC_MESSAGES/messages.po

@@ -1070,7 +1070,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 msgid "no_programs"
 msgstr "Vi ankoraŭ ne havas programojn."

translations/et/LC_MESSAGES/messages.po

@@ -1197,7 +1197,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 #, fuzzy
 msgid "no_programs"

translations/fa/LC_MESSAGES/messages.po

@@ -1208,7 +1208,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 #, fuzzy
 msgid "no_programs"

translations/fi/LC_MESSAGES/messages.po

@@ -1231,7 +1231,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 #, fuzzy
 msgid "no_programs"

translations/fr/LC_MESSAGES/messages.po

@@ -1001,7 +1001,7 @@ msgstr "Cet utilisateur n'a pas reçu le certificat de complétion de Hedy"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 msgid "no_programs"
 msgstr "Vous n'avez pas encore de programme."

translations/fy/LC_MESSAGES/messages.po

@@ -1145,7 +1145,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 msgid "no_programs"
 msgstr "Noch gjin programma's."

translations/he/LC_MESSAGES/messages.po

@@ -1185,7 +1185,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 #, fuzzy
 msgid "no_programs"

translations/id/LC_MESSAGES/messages.po

@@ -1138,7 +1138,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 msgid "no_programs"
 msgstr "Kamu belum memiliki program"

translations/it/LC_MESSAGES/messages.po

@@ -1169,7 +1169,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 msgid "no_programs"
 msgstr "Non hai ancora nessun programma."

translations/ja/LC_MESSAGES/messages.po

@@ -1223,7 +1223,7 @@ msgstr "このユーザはHedy修了証を得ていません"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 #, fuzzy
 msgid "no_programs"

translations/kmr/LC_MESSAGES/messages.po

@@ -1231,7 +1231,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 #, fuzzy
 msgid "no_programs"

translations/ko/LC_MESSAGES/messages.po

@@ -1226,7 +1226,7 @@ msgstr "This user hasn't earned the Hedy Certificate of Completion"
 
 #, fuzzy
 msgid "no_more_flat_if"
-msgstr "Starting in level 8, the line after {if} needs to start with 4 spaces."
+msgstr msgstr "Starting in level 8, the code after {if} needs to be placed on the next line and start with 4 spaces."
 
 #, fuzzy
 msgid "no_programs"