godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #91549 from magian1127/4.0ChangeHighlightingStartKey

Browse Source 
Resolve conflict between shader uniform tooltips `/**` and general annotation `/**/`.
This commit is contained in:
Rémi Verschelde
2024-05-17 11:13:48 +02:00
parent 096fb3ad7c 8a92615ba0
commit 9eff940a64
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/text_shader_editor.cpp
View File

@@ -318,6 +318,8 @@ void ShaderTextEditor::_load_theme_settings() {
const Color doc_comment_color = EDITOR_GET("text_editor/theme/highlighting/doc_comment_color");
syntax_highlighter->add_color_region("/**", "*/", doc_comment_color, false);
// "/**/" will be treated as the start of the "/**" region, this line is guaranteed to end the color_region.
syntax_highlighter->add_color_region("/**/", "", comment_color, true);
// Disabled preprocessor branches use translucent text color to be easier to distinguish from comments.
syntax_highlighter->set_disabled_branch_color(Color(EDITOR_GET("text_editor/theme/highlighting/text_color")) * Color(1, 1, 1, 0.5));