feat: auto-switch to dark or light SQL colors in sync with the app's dark mode

ansgarbecker · ansgarbecker · commit 8a08e77afd4f · 2026-01-25T13:25:14.000+01:00
diff --git a/heidisql.lpr b/heidisql.lpr
@@ -10,7 +10,7 @@
   SysUtils, Dialogs,
   Forms, printer4lazarus, datetimectrls, LCLTranslator, Translations,
   { you can add units after this }
-  main, apphelpers, dbconnection;
+  main, apphelpers, dbconnection, generic_types;
 
 {$R *.res}
 
@@ -67,11 +67,12 @@
 
   WasDarkMode := AppSettings.ReadBool(asCurrentThemeIsDark);
   if (not WasDarkMode) and IsDarkModeEnabled then begin
-    // todo: switch synedit colors and grid colors after current dark mode has changed
-    //       probably store a CurrentThemeIsDark=True/False in settings, then check here if that now changes and flip colors if so?
+    // switch synedit colors and grid colors after current dark mode has changed
+    SQLSynSchemes.ApplyScheme(SQLSynSchemes.SDarkScheme);
   end
   else if WasDarkMode and (not IsDarkModeEnabled) then begin
     // dito
+    SQLSynSchemes.ApplyScheme(SQLSynSchemes.SLightScheme);
   end;
   AppSettings.WriteBool(asCurrentThemeIsDark, IsDarkModeEnabled);
   {$ENDIF}
diff --git a/source/generic_types.pas b/source/generic_types.pas
@@ -4,7 +4,8 @@
 
 interface
 
-uses fpjson, jsonparser, SysUtils, RegExpr;
+uses fpjson, jsonparser, SysUtils, RegExpr, SynEditHighlighter, SynHighlighterSQL,
+  Generics.Collections, Graphics;
 
 type
   TThreeStateBoolean = (nbUnset, nbFalse, nbTrue);
@@ -20,6 +21,19 @@   TRegExprUmlauts = class(TRegExpr)
       constructor Create;
   end;
 
+  // Light and dark Color schemes for SynEdit SQL highlighter
+  TSynSQLSynList = specialize TObjectList<TSynSQLSyn>;
+  TSynSQLSynSchemes = class(TSynSQLSynList)
+    public
+      const SDarkScheme = 'Dark';
+      const SLightScheme = 'Light';
+      const SBlackScheme = 'Black';
+      const SWhiteScheme = 'White';
+      constructor Create(AOwnsObjects: Boolean = True); reintroduce; overload;
+      procedure ApplyScheme(Scheme: TSynSQLSyn); overload;
+      procedure ApplyScheme(SchemeName: String); overload;
+  end;
+
   TFileExtImageIndex = record
     Ext: String;
     ImageIndex: Integer;
@@ -47,9 +61,13 @@   TFileExtImageIndex = record
   (Ext: 'sqlite3';       ImageIndex: 196)
   );
 
+var
+  SQLSynSchemes: TSynSQLSynSchemes;
 
 implementation
 
+uses apphelpers;
+
 function GetFileExtImageIndex(Ext: String): Integer;
 var
   i: Integer;
@@ -91,8 +109,109 @@ constructor TRegExprUmlauts.Create;
   WordChars := WordChars + 'äÄöÖüÜÿŸáÁéÉíÍóÓúÚýÝćĆńŃŕŔśŚźŹĺĹàÀèÈìÌòÒùÙâÂêÊîÎôÔûÛãÃõÕñÑçÇşŞţŢåÅæÆœŒøØß';
 end;
 
+{ TSynSQLSynSchemes }
+
+constructor TSynSQLSynSchemes.Create(AOwnsObjects: Boolean = True);
+var
+  Scheme: TSynSQLSyn;
+begin
+  inherited Create(AOwnsObjects);
+
+  Scheme := TSynSQLSyn.Create(nil);
+  Scheme.Name := SDarkScheme;
+  Scheme.SQLDialect := sqlMySQL;
+  Scheme.CommentAttri.Foreground := 8710076;
+  Scheme.DataTypeAttri.Foreground := 11184895;
+  Scheme.FunctionAttri.Foreground := 15792639;
+  Scheme.IdentifierAttri.Foreground := 6460927;
+  Scheme.KeyAttri.Foreground := 15792639;
+  Scheme.NumberAttri.Foreground := 4610525;
+  Scheme.StringAttri.Foreground := 5293907;
+  Scheme.SymbolAttri.Foreground := 15792639;
+  Scheme.TableNameAttri.Foreground := 16755327;
+  Scheme.VariableAttri.Foreground := clPurple;
+  Add(Scheme);
+
+  Scheme := TSynSQLSyn.Create(nil);
+  Scheme.Name := SLightScheme;
+  Scheme.SQLDialect := sqlMySQL;
+  Scheme.CommentAttri.Foreground := clGray;
+  Scheme.DataTypeAttri.Foreground := clMaroon;
+  Scheme.FunctionAttri.Foreground := clNavy;
+  Scheme.IdentifierAttri.Foreground := clOlive;
+  Scheme.KeyAttri.Foreground := clBlue;
+  Scheme.NumberAttri.Foreground := clPurple;
+  Scheme.StringAttri.Foreground := clGreen;
+  Scheme.SymbolAttri.Foreground := clBlue;
+  Scheme.TableNameAttri.Foreground := clFuchsia;
+  Scheme.VariableAttri.Foreground := clPurple;
+  Add(Scheme);
+
+  Scheme := TSynSQLSyn.Create(nil);
+  Scheme.Name := SBlackScheme;
+  Scheme.SQLDialect := sqlMySQL;
+  Scheme.CommentAttri.Foreground := clBlack;
+  Scheme.DataTypeAttri.Foreground := clBlack;
+  Scheme.FunctionAttri.Foreground := clBlack;
+  Scheme.IdentifierAttri.Foreground := clBlack;
+  Scheme.KeyAttri.Foreground := clBlack;
+  Scheme.NumberAttri.Foreground := clBlack;
+  Scheme.StringAttri.Foreground := clBlack;
+  Scheme.SymbolAttri.Foreground := clBlack;
+  Scheme.TableNameAttri.Foreground := clBlack;
+  Scheme.VariableAttri.Foreground := clBlack;
+  Add(Scheme);
+
+  Scheme := TSynSQLSyn.Create(nil);
+  Scheme.Name := SWhiteScheme;
+  Scheme.SQLDialect := sqlMySQL;
+  Scheme.CommentAttri.Foreground := clWhite;
+  Scheme.DataTypeAttri.Foreground := clWhite;
+  Scheme.FunctionAttri.Foreground := clWhite;
+  Scheme.IdentifierAttri.Foreground := clWhite;
+  Scheme.KeyAttri.Foreground := clWhite;
+  Scheme.NumberAttri.Foreground := clWhite;
+  Scheme.StringAttri.Foreground := clWhite;
+  Scheme.SymbolAttri.Foreground := clWhite;
+  Scheme.TableNameAttri.Foreground := clWhite;
+  Scheme.VariableAttri.Foreground := clWhite;
+  Add(Scheme);
+end;
+
+procedure TSynSQLSynSchemes.ApplyScheme(Scheme: TSynSQLSyn);
+var
+  i: Integer;
+  Attri: TSynHighlighterAttributes;
+begin
+  for i:=0 to Scheme.AttrCount - 1 do begin
+    Attri := Scheme.Attribute[i];
+    AppSettings.WriteInt(asHighlighterForeground, Attri.Foreground, Attri.Name);
+    AppSettings.WriteInt(asHighlighterBackground, Attri.Background, Attri.Name);
+    AppSettings.WriteInt(asHighlighterStyle, Attri.IntegerStyle, Attri.Name);
+  end;
+end;
+
+procedure TSynSQLSynSchemes.ApplyScheme(SchemeName: String);
+var
+  Scheme: TSynSQLSyn;
+  Found: Boolean;
+begin
+  Found := False;
+  for Scheme in Self do begin
+    if Scheme.Name = SchemeName then begin
+      ApplyScheme(Scheme);
+      Found := True;
+      Break;
+    end;
+  end;
+  if not Found then
+    raise Exception.Create('SQL scheme not found: '+SchemeName);
+end;
+
 initialization
 
 SetJSONInstanceType(jitNumberFloat, TJSONFloatNumberUntouched);
 
+SQLSynSchemes := TSynSQLSynSchemes.Create(True);
+
 end.
diff --git a/source/preferences.lfm b/source/preferences.lfm
@@ -2049,72 +2049,4 @@ object frmPreferences: TfrmPreferences
     Left = 730
     Top = 490
   end
-  object SynSQLSyn_Dark: TSynSQLSyn
-    DefaultFilter = 'SQL Files (*.sql)|*.sql'
-    Enabled = False
-    CommentAttri.Foreground = 8710076
-    DataTypeAttri.Foreground = 11184895
-    FunctionAttri.Foreground = 15792639
-    IdentifierAttri.Foreground = 6460927
-    KeyAttri.Foreground = 15792639
-    NumberAttri.Foreground = 4610525
-    StringAttri.Foreground = 5293907
-    SymbolAttri.Foreground = 15792639
-    TableNameAttri.Foreground = 16755327
-    VariableAttri.Foreground = clPurple
-    SQLDialect = sqlMySQL
-    Left = 740
-    Top = 210
-  end
-  object SynSQLSyn_Light: TSynSQLSyn
-    DefaultFilter = 'SQL Files (*.sql)|*.sql'
-    Enabled = False
-    CommentAttri.Foreground = clGray
-    DataTypeAttri.Foreground = clMaroon
-    FunctionAttri.Foreground = clNavy
-    IdentifierAttri.Foreground = clOlive
-    KeyAttri.Foreground = clBlue
-    NumberAttri.Foreground = clPurple
-    StringAttri.Foreground = clGreen
-    SymbolAttri.Foreground = clBlue
-    TableNameAttri.Foreground = clFuchsia
-    VariableAttri.Foreground = clPurple
-    SQLDialect = sqlMySQL
-    Left = 740
-    Top = 140
-  end
-  object SynSQLSyn_Black: TSynSQLSyn
-    DefaultFilter = 'SQL Files (*.sql)|*.sql'
-    Enabled = False
-    CommentAttri.Foreground = clBlack
-    DataTypeAttri.Foreground = clBlack
-    FunctionAttri.Foreground = clBlack
-    IdentifierAttri.Foreground = clBlack
-    KeyAttri.Foreground = clBlack
-    NumberAttri.Foreground = clBlack
-    StringAttri.Foreground = clBlack
-    SymbolAttri.Foreground = clBlack
-    TableNameAttri.Foreground = clBlack
-    VariableAttri.Foreground = clBlack
-    SQLDialect = sqlMySQL
-    Left = 735
-    Top = 285
-  end
-  object SynSQLSyn_White: TSynSQLSyn
-    DefaultFilter = 'SQL Files (*.sql)|*.sql'
-    Enabled = False
-    CommentAttri.Foreground = clWhite
-    DataTypeAttri.Foreground = clWhite
-    FunctionAttri.Foreground = clWhite
-    IdentifierAttri.Foreground = clWhite
-    KeyAttri.Foreground = clWhite
-    NumberAttri.Foreground = clWhite
-    StringAttri.Foreground = clWhite
-    SymbolAttri.Foreground = clWhite
-    TableNameAttri.Foreground = clWhite
-    VariableAttri.Foreground = clWhite
-    SQLDialect = sqlMySQL
-    Left = 735
-    Top = 355
-  end
 end
diff --git a/source/preferences.pas b/source/preferences.pas
@@ -154,10 +154,6 @@   TfrmPreferences = class(TExtForm)
     comboTheme: TComboBox;
     lblEditorColorsPreset: TLabel;
     comboEditorColorsPreset: TComboBox;
-    SynSQLSyn_Dark: TSynSQLSyn;
-    SynSQLSyn_Light: TSynSQLSyn;
-    SynSQLSyn_Black: TSynSQLSyn;
-    SynSQLSyn_White: TSynSQLSyn;
     comboGridTextColorsPreset: TComboBox;
     lblIconPack: TLabel;
     comboIconPack: TComboBox;
@@ -259,7 +255,7 @@   TfrmPreferences = class(TExtForm)
 
 implementation
 
-uses main, apphelpers, extfiledialog;
+uses main, apphelpers, extfiledialog, generic_types;
 
 {$R *.lfm}
 
@@ -297,8 +293,6 @@ procedure TfrmPreferences.pagecontrolMainChange(Sender: TObject);
 }
 procedure TfrmPreferences.Apply(Sender: TObject);
 var
-  i: Integer;
-  Attri: TSynHighlighterAttributes;
   CatNode, ItemNode: PVirtualNode;
   Data: PShortcutItemData;
   LangCode: String;
@@ -325,12 +319,7 @@ procedure TfrmPreferences.Apply(Sender: TObject);
   AppSettings.WriteInt(asQueryHistoryKeepDays, MakeInt(editQueryHistoryKeepDays.Text));
   AppSettings.WriteBool(asLogHorizontalScrollbar, chkHorizontalScrollbar.Checked);
   AppSettings.WriteBool(asLogTimestamp, chkLogTimestamp.Checked);
-  for i:=0 to SynSQLSynSQLSample.AttrCount - 1 do begin
-    Attri := SynSQLSynSQLSample.Attribute[i];
-    AppSettings.WriteInt(asHighlighterForeground, Attri.Foreground, Attri.Name);
-    AppSettings.WriteInt(asHighlighterBackground, Attri.Background, Attri.Name);
-    AppSettings.WriteInt(asHighlighterStyle, Attri.IntegerStyle, Attri.Name);
-  end;
+  SQLSynSchemes.ApplyScheme(SynSQLSynSQLSample);
   AppSettings.WriteString(asSQLColActiveLine, ColorToString(SynMemoSQLSample.LineHighlightColor.Background));
   AppSettings.WriteString(asSQLColMatchingBraceForeground, ColorToString(MainForm.MatchingBraceForegroundColor));
   AppSettings.WriteString(asSQLColMatchingBraceBackground, ColorToString(MainForm.MatchingBraceBackgroundColor));
@@ -537,7 +526,6 @@ procedure TfrmPreferences.FormCreate(Sender: TObject);
   dtc: TDBDatatypeCategoryIndex;
   //Styles: TArray<String>;
   Highlighter: TSynSQLSyn;
-  Name: String;
   GridColorsPreset: TGridColorsPreset;
   IconPack: String;
   Reformatter: TfrmReformatter;
@@ -605,17 +593,8 @@ procedure TfrmPreferences.FormCreate(Sender: TObject);
   comboSQLColElement.Items.Add(_('Brace matching color'));
   comboSQLColElement.ItemIndex := 0;
   // Enumerate highlighter presets
-  for i:=0 to ComponentCount-1 do begin
-    if (Components[i] is TSynSQLSyn)
-      and (Components[i] <> SynMemoSQLSample.Highlighter)
-      then begin
-      Highlighter := Components[i] as TSynSQLSyn;
-      Name := Highlighter.Name;
-      Name := RegExprGetMatch('_([^_]+)$', Name, 1);
-      if Name <> '' then begin
-        comboEditorColorsPreset.Items.Add(_(Name));
-      end;
-    end;
+  for Highlighter in SQLSynSchemes do begin
+    comboEditorColorsPreset.Items.Add(_(Highlighter.Name));
   end;
 
   // Grid formatting
@@ -970,40 +949,29 @@ procedure TfrmPreferences.comboEditorColorsPresetChange(Sender: TObject);
   i, j: Integer;
   Highlighter: TSynSQLSyn;
   FoundHighlighter: Boolean;
-  rx: TRegExpr;
   TranslatedHighlighterName: String;
 begin
   // Color preset selected
   FoundHighlighter := False;
-  rx := TRegExpr.Create;
-  rx.Expression := '.+_([a-zA-Z0-9]+)$';
-  for i:=0 to ComponentCount-1 do begin
-    if (Components[i] is TSynSQLSyn) and (Components[i] <> SynMemoSQLSample.Highlighter) then begin
-      Highlighter := Components[i] as TSynSQLSyn;
-
-      // Translate highlighter postfix after last underscore: SynSQLSyn_White, SynSQLSyn_Black, ...
-      TranslatedHighlighterName := '';
-      if rx.Exec(Highlighter.Name) then begin
-        TranslatedHighlighterName := _(rx.Match[1]);
+  for Highlighter in SQLSynSchemes do begin
+    TranslatedHighlighterName := _(Highlighter.Name);
+    // ... so we can compare that with the selected dropdown text
+    if TranslatedHighlighterName = comboEditorColorsPreset.Text then begin
+      FoundHighlighter := True;
+      for j:=0 to SynSQLSynSQLSample.AttrCount - 1 do begin
+        SynSQLSynSQLSample.Attribute[j].AssignColorAndStyle(Highlighter.Attribute[j]);
       end;
-      // ... so we can compare that with the selected dropdown text
-      if TranslatedHighlighterName = comboEditorColorsPreset.Text then begin
-        FoundHighlighter := True;
-        for j:=0 to SynSQLSynSQLSample.AttrCount - 1 do begin
-          SynSQLSynSQLSample.Attribute[j].AssignColorAndStyle(Highlighter.Attribute[j]);
-        end;
-        // Use 3 hardcoded default values for additional colors, which are not part
-        // of the highlighter's attributes
-        SynMemoSQLSample.LineHighlightColor.Background := StringToColor(AppSettings.GetDefaultString(asSQLColActiveLine));
-        if IsDarkModeEnabled then begin // This is yet wrong, and should be based on the selected but not yet saved theme setting
-          MainForm.MatchingBraceForegroundColor := $0028EFFF;
-          MainForm.MatchingBraceBackgroundColor := $004D513B;
-        end else begin
-          MainForm.MatchingBraceForegroundColor := StringToColor(AppSettings.GetDefaultString(asSQLColMatchingBraceForeground));
-          MainForm.MatchingBraceBackgroundColor := StringToColor(AppSettings.GetDefaultString(asSQLColMatchingBraceBackground));
-        end;
-        Break;
+      // Use 3 hardcoded default values for additional colors, which are not part
+      // of the highlighter's attributes
+      SynMemoSQLSample.LineHighlightColor.Background := StringToColor(AppSettings.GetDefaultString(asSQLColActiveLine));
+      if IsDarkModeEnabled then begin // This is yet wrong, and should be based on the selected but not yet saved theme setting
+        MainForm.MatchingBraceForegroundColor := $0028EFFF;
+        MainForm.MatchingBraceBackgroundColor := $004D513B;
+      end else begin
+        MainForm.MatchingBraceForegroundColor := StringToColor(AppSettings.GetDefaultString(asSQLColMatchingBraceForeground));
+        MainForm.MatchingBraceBackgroundColor := StringToColor(AppSettings.GetDefaultString(asSQLColMatchingBraceBackground));
       end;
+      Break;
     end;
   end;
   if not FoundHighlighter then begin
diff --git a/source/texteditor.pas b/source/texteditor.pas
@@ -10,7 +10,7 @@ interface
   apphelpers, ActnList, extra_controls,
   ExtCtrls, dbconnection, SynEdit, SynEditHighlighter, customize_highlighter,
   Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite,
-  reformatter, jsonparser, extfiledialog, generic_types, lazaruscompat,
+  reformatter, jsonparser, extfiledialog, lazaruscompat,
 
   SynHighlighterBat,
   SynHighlighterCpp, SynHighlighterCss,
