[Synedit-checkins] SynEdit/Source SynHighlighterPas.pas, 1.27.2.9, 1.27.2.10 SynUnicode.pas, 1.1.2.44, 1.1.2.45

[Maël Hörz <ma...@us...>]

Update of /cvsroot/synedit/SynEdit/Source
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27246

Modified Files:
      Tag: Unicode_2004_08_31
	SynHighlighterPas.pas SynUnicode.pas 
Log Message:
Add changes by Erik Berry to read the color settings from recent IDE versions.

Index: SynUnicode.pas
===================================================================
RCS file: /cvsroot/synedit/SynEdit/Source/Attic/SynUnicode.pas,v
retrieving revision 1.1.2.44
retrieving revision 1.1.2.45
diff -u -d -r1.1.2.44 -r1.1.2.45
--- SynUnicode.pas	5 Oct 2008 19:51:53 -0000	1.1.2.44
+++ SynUnicode.pas	23 Feb 2009 15:43:50 -0000	1.1.2.45
@@ -855,15 +855,11 @@
 var
   Stream: TStream;
 begin
+  Stream := TFileStream.Create(FileName, fmOpenRead or fmShareDenyNone);
   try
-    Stream := TFileStream.Create(FileName, fmOpenRead or fmShareDenyNone);
-    try
-      LoadFromStream(Stream);
-    finally
-      Stream.Free;
-    end;
-  except
-    RaiseLastOSError;
+    LoadFromStream(Stream);
+  finally
+    Stream.Free;
   end;
 end;
 

Index: SynHighlighterPas.pas
===================================================================
RCS file: /cvsroot/synedit/SynEdit/Source/SynHighlighterPas.pas,v
retrieving revision 1.27.2.9
retrieving revision 1.27.2.10
diff -u -d -r1.27.2.9 -r1.27.2.10
--- SynHighlighterPas.pas	14 Sep 2008 16:25:01 -0000	1.27.2.9
+++ SynHighlighterPas.pas	23 Feb 2009 15:43:50 -0000	1.27.2.10
@@ -87,6 +87,7 @@
 
 const
   LastDelphiVersion = dvDelphi2005;
+  BDSVersionPrefix = 'BDS';
 
 type
   TSynPasSyn = class(TSynCustomHighlighter)
@@ -1085,25 +1086,44 @@
 end;
 
 procedure TSynPasSyn.EnumUserSettings(DelphiVersions: TStrings);
-begin
-  { returns the user settings that exist in the registry }
-{$IFNDEF SYN_CLX}
-  with TBetterRegistry.Create do
+
+  procedure LoadKeyVersions(const Key, Prefix: string);
+  var
+    Versions: TStringList;
+    i: Integer;
   begin
-    try
-      RootKey := HKEY_LOCAL_MACHINE;
-      if OpenKeyReadOnly('\SOFTWARE\Borland\Delphi') then
-      begin
-        try
-          GetKeyNames(DelphiVersions);
-        finally
-          CloseKey;
+    with TBetterRegistry.Create do
+    begin
+      try
+        RootKey := HKEY_LOCAL_MACHINE;
+        if OpenKeyReadOnly(Key) then
+        begin
+          try
+            Versions := TStringList.Create;
+            try
+              GetKeyNames(Versions);
+              for i := 0 to Versions.Count - 1 do
+                DelphiVersions.Add(Prefix + Versions[i]);
+            finally
+              FreeAndNil(Versions);
+            end;
+          finally
+            CloseKey;
+          end;
         end;
+      finally
+        Free;
       end;
-    finally
-      Free;
     end;
   end;
+
+begin
+  { returns the user settings that exist in the registry }
+{$IFNDEF SYN_CLX}
+  // See UseUserSettings below where these strings are used
+  LoadKeyVersions('\SOFTWARE\Borland\Delphi', '');
+  LoadKeyVersions('\SOFTWARE\Borland\BDS', BDSVersionPrefix);
+  LoadKeyVersions('\SOFTWARE\CodeGear\BDS', BDSVersionPrefix);
 {$ENDIF}
 end;
 
@@ -1115,10 +1135,13 @@
 //   False: problem reading settings or invalid version specified - old settings
 //          were preserved
 
-{$IFNDEF SYN_CLX} 
+{$IFNDEF SYN_CLX}
   function ReadDelphiSettings(settingIndex: Integer): Boolean;
 
     function ReadDelphiSetting(settingTag: string; attri: TSynHighlighterAttributes; key: string): Boolean;
+    var
+      Version: Currency;
+      VersionStr: string;
 
       function ReadDelphi2Or3(settingTag: string; attri: TSynHighlighterAttributes; name: string): Boolean;
       var
@@ -1136,11 +1159,39 @@
                '\Software\Borland\Delphi\'+settingTag+'\Editor\Highlight',key,False);
       end; { ReadDelphi4OrMore }
 
+      function ReadDelphi8To2007(settingTag: string; attri: TSynHighlighterAttributes; key: string): Boolean;
+      begin
+        Result := attri.LoadFromBorlandRegistry(HKEY_CURRENT_USER,
+               '\Software\Borland\BDS\'+settingTag+'\Editor\Highlight',key,False);
+      end; { ReadDelphi8OrMore }
+
+      function ReadDelphi2009OrMore(settingTag: string; attri: TSynHighlighterAttributes; key: string): Boolean;
+      begin
+        Result := attri.LoadFromBorlandRegistry(HKEY_CURRENT_USER,
+               '\Software\CodeGear\BDS\'+settingTag+'\Editor\Highlight',key,False);
+      end; { ReadDelphi2009OrMore }
+
     begin { ReadDelphiSetting }
       try
-        if (settingTag[1] = '2') or (settingTag[1] = '3')
-          then Result := ReadDelphi2Or3(settingTag, attri, key)
-          else Result := ReadDelphi4OrMore(settingTag, attri, key);
+        if Pos('BDS', settingTag) = 1 then // BDS product
+        begin
+          VersionStr := Copy(settingTag, Length(BDSVersionPrefix) + 1, 999);
+          Version := 0;
+          if not TryStrToCurr(StringReplace(VersionStr, '.', DecimalSeparator, []), Version) then
+          begin
+            Result := False;
+            Exit;
+          end;
+          if Version >= 6 then
+            Result := ReadDelphi2009OrMore(VersionStr, attri, key)
+          else
+            Result := ReadDelphi8To2007(VersionStr, attri, key);
+        end
+        else begin // Borland Delphi 7 or earlier
+          if (settingTag[1] = '2') or (settingTag[1] = '3')
+            then Result := ReadDelphi2Or3(settingTag, attri, key)
+            else Result := ReadDelphi4OrMore(settingTag, attri, key);
+        end;
       except Result := False; end;
     end; { ReadDelphiSetting }
 
@@ -1152,7 +1203,7 @@
   begin { ReadDelphiSettings }
     {$IFDEF SYN_COMPILER_7_UP}
     {$IFNDEF SYN_COMPILER_9_UP}
-    Result := False; // Silence the compiler warning 
+    Result := False; // Silence the compiler warning
     {$ENDIF}
     {$ENDIF}
     iVersions := TStringList.Create;