From 00cef252c5defc312feb7449a7ebb3ec6f99b459 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Fri, 13 Dec 2024 14:32:28 +0100
Subject: [PATCH] Editor: add text style for diagnostic info

Fixes: QTCREATORBUG-32163
Change-Id: Ifc066c7845afa3374f97c278e4481d81bfcc67c2
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 share/qtcreator/styles/creator-dark.xml          |  2 ++
 share/qtcreator/styles/dark-2024.xml             |  2 ++
 share/qtcreator/styles/dark.xml                  |  2 ++
 share/qtcreator/styles/default_classic.xml       |  2 ++
 share/qtcreator/styles/grayscale.xml             |  2 ++
 share/qtcreator/styles/mabakor.xml               |  2 ++
 share/qtcreator/styles/solarized-dark.xml        |  2 ++
 share/qtcreator/styles/solarized-light.xml       |  2 ++
 src/plugins/languageclient/diagnosticmanager.cpp |  2 ++
 src/plugins/texteditor/texteditorconstants.cpp   |  2 ++
 src/plugins/texteditor/texteditorconstants.h     |  2 ++
 src/plugins/texteditor/texteditorsettings.cpp    | 12 ++++++++++++
 12 files changed, 34 insertions(+)

diff --git a/share/qtcreator/styles/creator-dark.xml b/share/qtcreator/styles/creator-dark.xml
index 088feb7a2ed..275290c4319 100644
--- a/share/qtcreator/styles/creator-dark.xml
+++ b/share/qtcreator/styles/creator-dark.xml
@@ -68,6 +68,8 @@
   <style name="LogCommitHash" foreground="#ff0000"/>
   <style name="LogCommitSubject" foreground="#d6cf9a"/>
   <style name="LogDecoration" foreground="#ff00ff"/>
+  <style name="Info" underlineColor="#b6aef1" underlineStyle="DashUnderline"/>
+  <style name="InfoContext" underlineColor="#b6aef1" underlineStyle="Dotline"/>
   <style name="Warning" underlineColor="#d6c545" underlineStyle="SingleUnderline"/>
   <style name="WarningContext" underlineColor="#d6c545" underlineStyle="DotLine"/>
   <style name="Error" underlineColor="#d65645" underlineStyle="SingleUnderline"/>
diff --git a/share/qtcreator/styles/dark-2024.xml b/share/qtcreator/styles/dark-2024.xml
index b576eb4fb81..dde321edc5b 100644
--- a/share/qtcreator/styles/dark-2024.xml
+++ b/share/qtcreator/styles/dark-2024.xml
@@ -68,6 +68,8 @@
   <style name="LogCommitHash" foreground="#ff0000"/>
   <style name="LogCommitSubject" foreground="#d6cf9a"/>
   <style name="LogDecoration" foreground="#ff00ff"/>
+  <style name="Info" underlineColor="#b6aef1" underlineStyle="DashUnderline"/>
+  <style name="InfoContext" underlineColor="#b6aef1" underlineStyle="DotLine"/>
   <style name="Warning" underlineColor="#d6c545" underlineStyle="SingleUnderline"/>
   <style name="WarningContext" underlineColor="#d6c545" underlineStyle="DotLine"/>
   <style name="Error" underlineColor="#d65645" underlineStyle="SingleUnderline"/>
diff --git a/share/qtcreator/styles/dark.xml b/share/qtcreator/styles/dark.xml
index db26e1467ef..a49e021cab7 100644
--- a/share/qtcreator/styles/dark.xml
+++ b/share/qtcreator/styles/dark.xml
@@ -70,4 +70,6 @@
   <style name="LogCommitHash" foreground="#ff0000"/>
   <style name="LogCommitSubject" foreground="#d6cf9a"/>
   <style name="LogDecoration" foreground="#ff00ff"/>
+  <style name="Info" underlineColor="#b6aef1" underlineStyle="DashUnderline"/>
+  <style name="InfoContext" underlineColor="#b6aef1" underlineStyle="DotLine"/>
 </style-scheme>
diff --git a/share/qtcreator/styles/default_classic.xml b/share/qtcreator/styles/default_classic.xml
index 3d7f8f04a65..36a5d9f99b6 100644
--- a/share/qtcreator/styles/default_classic.xml
+++ b/share/qtcreator/styles/default_classic.xml
@@ -59,6 +59,8 @@
   <style name="DiffDestLine" background="#dfffdf"/>
   <style name="DiffDestChar" background="#afffaf"/>
   <style name="LogChangeLine" foreground="#c00000"/>
+  <style name="Info" underlineColor="#262088" underlineStyle="DashUnderline"/>
+  <style name="InfoContext" underlineColor="#262088" underlineStyle="DotLine"/>
   <style name="Warning" underlineColor="#ffbe00" underlineStyle="SingleUnderline"/>
   <style name="WarningContext" underlineColor="#ffbe00" underlineStyle="DotLine"/>
   <style name="Error" underlineColor="#ff0000" underlineStyle="SingleUnderline"/>
diff --git a/share/qtcreator/styles/grayscale.xml b/share/qtcreator/styles/grayscale.xml
index 3d0e41936a5..3c9c5b29af6 100644
--- a/share/qtcreator/styles/grayscale.xml
+++ b/share/qtcreator/styles/grayscale.xml
@@ -40,6 +40,8 @@
   <style name="Namespace"/>
   <style name="VirtualMethod" italic="true"/>
   <style name="Occurrences.Unused" underlineColor="#8F8F8F" underlineStyle="SingleUnderline"/>
+  <style name="Info" underlineColor="#707070" underlineStyle="DashUnderline"/>
+  <style name="InfoContext" underlineColor="#707070" underlineStyle="DotLine"/>
   <style name="Warning" underlineColor="#505050" underlineStyle="SingleUnderline"/>
   <style name="WarningContext" underlineColor="#505050" underlineStyle="DotLine"/>
   <style name="Error" underlineColor="#000000" underlineStyle="WaveUnderline"/>
diff --git a/share/qtcreator/styles/mabakor.xml b/share/qtcreator/styles/mabakor.xml
index 91488f70ea7..19826d7d00f 100644
--- a/share/qtcreator/styles/mabakor.xml
+++ b/share/qtcreator/styles/mabakor.xml
@@ -68,6 +68,8 @@
   <style name="LogCommitHash" foreground="#c06060"/>
   <style name="LogCommitSubject" foreground="#d6cf9a"/>
   <style name="LogDecoration" foreground="#c060c0"/>
+  <style name="Info" underlineColor="#b6aef1" underlineStyle="DashUnderline"/>
+  <style name="InfoContext" underlineColor="#b6aef1" underlineStyle="DotLine"/>
   <style name="Warning" underlineColor="#d6c545" underlineStyle="SingleUnderline"/>
   <style name="WarningContext" underlineColor="#d6c545" underlineStyle="DotLine"/>
   <style name="Error" underlineColor="#d65645" underlineStyle="SingleUnderline"/>
diff --git a/share/qtcreator/styles/solarized-dark.xml b/share/qtcreator/styles/solarized-dark.xml
index ade9f227d07..5deb45e2b8e 100644
--- a/share/qtcreator/styles/solarized-dark.xml
+++ b/share/qtcreator/styles/solarized-dark.xml
@@ -74,6 +74,8 @@
   <style name="LogCommitHash" foreground="#ff0000"/>
   <style name="LogCommitSubject" foreground="#d6cf9a"/>
   <style name="LogDecoration" foreground="#ff00ff"/>
+  <style name="Info" underlineColor="#268bd2" underlineStyle="DashUnderline"/>
+  <style name="InfoContext" underlineColor="#268bd2" underlineStyle="DotLine"/>
   <style name="Warning" underlineColor="#b58900" underlineStyle="SingleUnderline"/>
   <style name="WarningContext" underlineColor="#b58900" underlineStyle="DotLine"/>
   <style name="Error" underlineColor="#dc322f" underlineStyle="SingleUnderline"/>
diff --git a/share/qtcreator/styles/solarized-light.xml b/share/qtcreator/styles/solarized-light.xml
index 348d89f4453..b0917e714ef 100644
--- a/share/qtcreator/styles/solarized-light.xml
+++ b/share/qtcreator/styles/solarized-light.xml
@@ -71,6 +71,8 @@
   <style name="LogChangeLine" foreground="#c00000"/>
   <style name="Warning" underlineColor="#b58900" underlineStyle="SingleUnderline"/>
   <style name="WarningContext" underlineColor="#b58900" underlineStyle="DotLine"/>
+  <style name="Info" underlineColor="#268bd2" underlineStyle="DashUnderline"/>
+  <style name="InfoContext" underlineColor="#268bd2" underlineStyle="DotLine"/>
   <style name="Error" underlineColor="#dc322f" underlineStyle="SingleUnderline"/>
   <style name="ErrorContext" underlineColor="#dc322f" underlineStyle="DotLine"/>
   <style name="Declaration"/>
diff --git a/src/plugins/languageclient/diagnosticmanager.cpp b/src/plugins/languageclient/diagnosticmanager.cpp
index 6b658edfcc4..cc5e4a01f4d 100644
--- a/src/plugins/languageclient/diagnosticmanager.cpp
+++ b/src/plugins/languageclient/diagnosticmanager.cpp
@@ -269,6 +269,8 @@ QTextEdit::ExtraSelection DiagnosticManager::createDiagnosticSelection(
         style = C_ERROR;
     else if (severity == DiagnosticSeverity::Warning)
         style = C_WARNING;
+    else if (severity == DiagnosticSeverity::Information)
+        style = C_INFO;
     else
         return {};
 
diff --git a/src/plugins/texteditor/texteditorconstants.cpp b/src/plugins/texteditor/texteditorconstants.cpp
index 32e0be34271..c2116846a32 100644
--- a/src/plugins/texteditor/texteditorconstants.cpp
+++ b/src/plugins/texteditor/texteditorconstants.cpp
@@ -93,6 +93,8 @@ const char *nameForStyle(TextStyle style)
     case C_ERROR_CONTEXT:       return "ErrorContext";
     case C_WARNING:             return "Warning";
     case C_WARNING_CONTEXT:     return "WarningContext";
+    case C_INFO:                return "Info";
+    case C_INFO_CONTEXT:        return "InfoContext";
 
     case C_DECLARATION:         return "Declaration";
     case C_FUNCTION_DEFINITION: return "FunctionDefinition";
diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h
index a7e54971224..c927529759a 100644
--- a/src/plugins/texteditor/texteditorconstants.h
+++ b/src/plugins/texteditor/texteditorconstants.h
@@ -88,6 +88,8 @@ enum TextStyle : quint8 {
     C_LOG_COMMIT_SUBJECT,
     C_LOG_DECORATION,
 
+    C_INFO,
+    C_INFO_CONTEXT,
     C_WARNING,
     C_WARNING_CONTEXT,
     C_ERROR,
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index 9b756b7c2dd..3e36dc66998 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -346,6 +346,18 @@ FormatDescriptions TextEditorSettingsPrivate::initialFormats()
                              QColor(255, 190, 0),
                              QTextCharFormat::DotLine,
                              FormatDescription::ShowAllControls);
+    formatDescr.emplace_back(C_INFO,
+                             Tr::tr("Info"),
+                             Tr::tr("Underline color of info diagnostics."),
+                             QColor(38, 32, 136),
+                             QTextCharFormat::DashUnderline,
+                             FormatDescription::ShowAllControls);
+    formatDescr.emplace_back(C_INFO_CONTEXT,
+                             Tr::tr("Info Context"),
+                             Tr::tr("Underline color of the contexts of info diagnostics."),
+                             QColor(38, 32, 136),
+                             QTextCharFormat::DotLine,
+                             FormatDescription::ShowAllControls);
     Format outputArgumentFormat;
     outputArgumentFormat.setItalic(true);
     formatDescr.emplace_back(C_OUTPUT_ARGUMENT,