Prechádzať zdrojové kódy

Merge pull request #89332 from Riteo/werror-never-changes

Fix compiler warning when highlighting codeblocks in editor help
Rémi Verschelde 1 rok pred
rodič
commit
7d6ae138fa
1 zmenil súbory, kde vykonal 12 pridanie a 7 odobranie
  1. 12 7
      editor/editor_help.cpp

+ 12 - 7
editor/editor_help.cpp

@@ -2622,20 +2622,25 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, Control
 			p_rt->set_cell_padding(Rect2(10 * EDSCALE, 10 * EDSCALE, 10 * EDSCALE, 10 * EDSCALE));
 			p_rt->set_cell_padding(Rect2(10 * EDSCALE, 10 * EDSCALE, 10 * EDSCALE, 10 * EDSCALE));
 			p_rt->push_color(code_dark_color);
 			p_rt->push_color(code_dark_color);
 
 
-			if (lang.is_empty() || lang == "gdscript") {
+			bool codeblock_printed = false;
+
 #ifdef MODULE_GDSCRIPT_ENABLED
 #ifdef MODULE_GDSCRIPT_ENABLED
+			if (!codeblock_printed && (lang.is_empty() || lang == "gdscript")) {
 				EditorHelpHighlighter::get_singleton()->highlight(p_rt, EditorHelpHighlighter::LANGUAGE_GDSCRIPT, codeblock_text, is_native);
 				EditorHelpHighlighter::get_singleton()->highlight(p_rt, EditorHelpHighlighter::LANGUAGE_GDSCRIPT, codeblock_text, is_native);
-#else
-				p_rt->add_text(codeblock_text);
+				codeblock_printed = true;
+			}
 #endif
 #endif
-			} else if (lang == "csharp") {
+
 #ifdef MODULE_MONO_ENABLED
 #ifdef MODULE_MONO_ENABLED
+			if (!codeblock_printed && lang == "csharp") {
 				EditorHelpHighlighter::get_singleton()->highlight(p_rt, EditorHelpHighlighter::LANGUAGE_CSHARP, codeblock_text, is_native);
 				EditorHelpHighlighter::get_singleton()->highlight(p_rt, EditorHelpHighlighter::LANGUAGE_CSHARP, codeblock_text, is_native);
-#else
-				p_rt->add_text(codeblock_text);
+				codeblock_printed = true;
+			}
 #endif
 #endif
-			} else {
+
+			if (!codeblock_printed) {
 				p_rt->add_text(codeblock_text);
 				p_rt->add_text(codeblock_text);
+				codeblock_printed = true;
 			}
 			}
 
 
 			p_rt->pop(); // color
 			p_rt->pop(); // color