fixing things that I missed

Author: Torwent

Source/ide/simba.form_output.pas

@@ -257,9 +257,9 @@ procedure TSimbaOutputBox.DoSpecialLineMarkup(Sender: TObject; Line: Integer; va
     Exit;
   end;
 
-  if EDebugLn.BACKGROUND_COLOR in lineData.Flags then
+  if EDebugLn.BACKGROUND_COLOR in lineData^.Flags then
   begin
-    AMarkup.Background := lineData.Color;
+    AMarkup.Background := lineData^.Color;
     AMarkup.BackAlpha  := 115;
     AMarkup.Foreground := clNone;
     Special := True;
@@ -319,7 +319,7 @@ destructor TSimbaOutputBox.Destroy;
   if (FBuffer <> nil) then
   begin
     for i := 0 to FBuffer.Count - 1 do
-      Dispose(PLineFlagsData(FBuffer.Objects[i]))
+      Dispose(PLineFlagsData(FBuffer.Objects[i]));
     FreeAndNil(FBuffer);
   end;
   if (FLock <> nil) then
@@ -401,7 +401,7 @@ function TSimbaOutputBox.Add(const S: String): String;
   Arr: TStringArray;
   I: Integer;
   Line: String;
-  lineData: PLineData;
+  lineData: PLineFlagsData;
 begin
   Arr := S.Split(LineEnding, False);
   if (Length(Arr) = 0) then
@@ -419,7 +419,7 @@ function TSimbaOutputBox.Add(const S: String): String;
         Line  := Arr[I];
         New(lineData);
         lineData^.Flags := FlagsFromString(Line, lineData^.Color);
-        FBuffer.AddObject(Line, TObject(data));
+        FBuffer.AddObject(Line, TObject(lineData));
       end;
     end else
     begin
@@ -430,7 +430,7 @@ function TSimbaOutputBox.Add(const S: String): String;
         Line  := Arr[I];
         New(lineData);
         lineData^.Flags := FlagsFromString(Line, lineData^.Color);
-        FBuffer.AddObject(Line, TObject(data));
+        FBuffer.AddObject(Line, TObject(lineData));
       end;
     end;
 
@@ -447,7 +447,7 @@ procedure TSimbaOutputBox.AddLine(Flags: EDebugLnFlags; const S: String);
 
 procedure TSimbaOutputBox.Empty;
 begin
-  Add(FlagsToString([EDebugLn.CLEAR]) + LineEnding);
+  Add(FlagsToString([EDebugLn.CLEAR], $0) + LineEnding);
 end;
 
 procedure TSimbaOutputBox.Flush;

Source/ide/simba.ide_package_autoupdater.pas

@@ -228,7 +228,7 @@ procedure TPackageUpdater.Execute;
 
     if Package.HasUpdate() and Package.AutoUpdateEnabled then
     begin
-      DebugLn([EDebugLn.FOCUS, EDebugLn.YELLOW], 'Automatically updating %s', [Package.Name]);
+      DebugLn([EDebugLn.FOCUS, EDebugLn.BACKGROUND_COLOR], GetLineColor(EDebugLnColor.YELLOW), 'Automatically updating %s', [Package.Name]);
       Sleep(750); // whatever, let above flush... TSimbaPackageInstaller directly writes to the synedit.
 
       try
@@ -247,16 +247,16 @@ procedure TPackageUpdater.Execute;
 
           if Install(InstallOpts) then
           begin
-            DebugLn([EDebugLn.FOCUS, EDebugLn.GREEN], 'Succesfully updated "%s"', [Package.Name]);
-            DebugLn([EDebugLn.FOCUS, EDebugLn.GREEN], 'Now at version: %s', [Package.InstalledVersion]);
+            DebugLn([EDebugLn.FOCUS, EDebugLn.BACKGROUND_COLOR], GetLineColor(EDebugLnColor.GREEN), 'Succesfully updated "%s"', [Package.Name]);
+            DebugLn([EDebugLn.FOCUS, EDebugLn.BACKGROUND_COLOR], GetLineColor(EDebugLnColor.GREEN), 'Now at version: %s', [Package.InstalledVersion]);
           end else
-            DebugLn([EDebugLn.FOCUS, EDebugLn.RED], 'Failed to update: %s', [Package.Name]);
+            DebugLn([EDebugLn.FOCUS, EDebugLn.BACKGROUND_COLOR], GetLineColor(EDebugLnColor.RED), 'Failed to update: %s', [Package.Name]);
         finally
           Free();
         end;
       except
         on E: Exception do
-          DebugLn([EDebugLn.FOCUS, EDebugLn.RED], 'Failed to update: %s (%s)', [Package.Name, E.Message]);
+          DebugLn([EDebugLn.FOCUS, EDebugLn.BACKGROUND_COLOR], GetLineColor(EDebugLnColor.RED), 'Failed to update: %s (%s)', [Package.Name, E.Message]);
       end;
     end;
   end;

Source/simba.base.pas

@@ -298,8 +298,9 @@ procedure DebugLn(const Flags: EDebugLnFlags; bgColor: TColor; const Msg: String
 
 function GetLineColor(const color: EDebugLnColor): TColor;
 
+function FlagsToByte(const flags: EDebugLnFlags): Byte;
 function FlagsToString(const flags: EDebugLnFlags; const bgColor: TColor): String;
-function FlagsFromString(var Str: String; out bgColor: Int32): EDebugLnFlags;
+function FlagsFromString(var Str: String; out bgColor: TColor): EDebugLnFlags;
 
 function InRange(const AValue, AMin, AMax: Integer): Boolean; inline; overload;
 function InRange(const AValue, AMin, AMax: Int64): Boolean; inline; overload;
@@ -448,30 +449,34 @@ procedure SimbaException(Message: String);
 
 function GetLineColor(const color: EDebugLnColor): TColor; inline;
 const
-  DEBUG_LINE_COLORS: array [EDebugLnColor] of TColor = [
-    $00BFFF, $0000A5, $228B22
-  ];
+  DEBUG_LINE_COLORS: TColorArray = ($00BFFF, $0000A5, $228B22);
 begin
-  Result := DEBUG_LINE_COLORS[color];
+  Result := DEBUG_LINE_COLORS[Ord(color)];
 end;
 
 const
   DebugLnFlagsHeader       = String(#0#0);
   DebugLnFlagsHeaderLength = Length(DebugLnFlagsHeader) + 6;
 
+function FlagsToByte(const flags: EDebugLnFlags): Byte; inline;
+begin
+  Result := 0;
+  if EDebugLn.CLEAR           in flags then Result := Result or 1;
+  if EDebugLn.FOCUS           in flags then Result := Result or 2;
+  if EDebugLn.BACKGROUND_COLOR in flags then Result := Result or 4;
+end;
+
 function FlagsToString(const flags: EDebugLnFlags; const bgColor: TColor): String; inline;
 begin
   Result := DebugLnFlagsHeader;
-  Result := Result + Chr(Byte(flags));
+  Result := Result + Chr(FlagsToByte(flags));
   if (EDebugLn.BACKGROUND_COLOR in flags) then
-  begin
     Result := Result + Chr((bgColor shr 16) and $FF) +
                        Chr((bgColor shr 8) and $FF) +
                        Chr(bgColor and $FF);
-  end;
 end;
 
-function FlagsFromString(var str: String; out bgColor: Int32): EDebugLnFlags;
+function FlagsFromString(var str: String; out bgColor: TColor): EDebugLnFlags;
 var
   flagsByte: Byte;
   idx: Integer;