diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-17 11:13:48 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-17 11:13:48 +0200 |
| commit | 9eff940a64b406b57b4d4d8fc9a8e5dad6a7d871 (patch) | |
| tree | 3d8b3fadff25c8bf8b2fb9c50e1a92f0b5afcbbb /editor/plugins/text_shader_editor.cpp | |
| parent | 096fb3ad7cc517e401eb2aa6b29dbc213e0bf200 (diff) | |
| parent | 8a92615ba0456844e6368f31be42ecf738ae88e7 (diff) | |
| download | redot-engine-9eff940a64b406b57b4d4d8fc9a8e5dad6a7d871.tar.gz | |
Merge pull request #91549 from magian1127/4.0ChangeHighlightingStartKey
Resolve conflict between shader uniform tooltips `/**` and general annotation `/**/`.
Diffstat (limited to 'editor/plugins/text_shader_editor.cpp')
| -rw-r--r-- | editor/plugins/text_shader_editor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/editor/plugins/text_shader_editor.cpp b/editor/plugins/text_shader_editor.cpp index 637547062c..bb74bf8d1f 100644 --- a/editor/plugins/text_shader_editor.cpp +++ b/editor/plugins/text_shader_editor.cpp @@ -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)); |