fix: assign no Syn highlighter by default and call it "Text", in texteditor

ansgarbecker · ansgarbecker · commit 446d78c295dd · 2025-12-16T16:12:20.000+01:00
diff --git a/source/apphelpers.pas b/source/apphelpers.pas
@@ -3812,7 +3812,7 @@ constructor TAppSettings.Create;
   InitSetting(asMemoEditorHeight,                 'MemoEditorHeight',                      200);
   InitSetting(asMemoEditorMaximized,              'MemoEditorMaximized',                   0, False);
   InitSetting(asMemoEditorWrap,                   'MemoEditorWrap',                        0, False);
-  InitSetting(asMemoEditorHighlighter,            'MemoEditorHighlighter_%s',              0, False, 'General', True);
+  InitSetting(asMemoEditorHighlighter,            'MemoEditorHighlighter_%s',              0, False, 'Text', True);
   InitSetting(asMemoEditorAlwaysFormatCode,       'MemoEditorAlwaysFormatCode',            0, False);
   InitSetting(asDelimiter,                        'Delimiter',                             0, False, ';');
   InitSetting(asSQLHelpWindowLeft,                'SQLHelp_WindowLeft',                    0);
diff --git a/source/texteditor.pas b/source/texteditor.pas
@@ -251,6 +251,7 @@ procedure TfrmTextEditor.FormCreate(Sender: TObject);
   menuMixedLB.Tag := Integer(lbsMixed);
 
   Highlighters := SynEditHighlighter.GetPlaceableHighlighters;
+  comboHighlighter.Items.Add(_('Text'));
   for i:=0 to Highlighters.Count-1 do begin
     comboHighlighter.Items.Add(Highlighters[i].GetLanguageName);
   end;
@@ -385,6 +386,7 @@ procedure TfrmTextEditor.comboHighlighterSelect(Sender: TObject);
   SelLength := MemoText.SelEnd - MemoText.SelStart;
   MemoText.Highlighter := nil;
   FHighlighter.Free;
+  FHighlighter := nil;
   Highlighters := SynEditHighlighter.GetPlaceableHighlighters;
   for i:=0 to Highlighters.Count-1 do begin
     if comboHighlighter.Text = Highlighters[i].GetLanguageName then begin
@@ -393,21 +395,18 @@ procedure TfrmTextEditor.comboHighlighterSelect(Sender: TObject);
       Break;
     end;
   end;
-  // In case the combobox is empty:
-  if MemoText.Highlighter = nil then begin
-    FHighlighter := TSynSQLSyn.Create(Self);
-    MemoText.Highlighter := FHighlighter;
-  end;
 
-  menuFormatCodeOnce.Enabled := FHighlighterFormatters.IndexOf(FHighlighter.ClassName) > -1;
+  menuFormatCodeOnce.Enabled := Assigned(FHighlighter) and (FHighlighterFormatters.IndexOf(FHighlighter.ClassName) > -1);
   if menuAlwaysFormatCode.Checked and menuFormatCodeOnce.Enabled then begin
     menuFormatCodeOnce.OnClick(Sender);
     SelStart := 0;
     SelLength := 0;
   end;
 
-  // Load custom highlighter settings from ini file, if exists:
-  MemoText.Highlighter.LoadFromFile(AppSettings.DirnameHighlighters + MemoText.Highlighter.LanguageName + '.ini');
+  if Assigned(FHighlighter) then begin
+    // Load custom highlighter settings from ini file, if exists:
+    MemoText.Highlighter.LoadFromFile(AppSettings.DirnameHighlighters + MemoText.Highlighter.LanguageName + '.ini');
+  end;
 
   MemoText.SelStart := SelStart;
   MemoText.SelEnd := SelStart + SelLength;
