synedit-checkins — SourceForge CVS Checkin announcements

[Synedit-checkins] CVS: SynEdit/Source SynEditKeyCmds.pas,1.10,1.11

[Dean H. <har...@us...>]

Update of /cvsroot/synedit/SynEdit/Source
In directory usw-pr-cvs1:/tmp/cvs-serv9457

Modified Files:
	SynEditKeyCmds.pas 
Log Message:
Description: Adds Clear to the top of TSynEditKeyStrokes.LoadFromStream to be more consistant with component behavior
BugID: 503292 

Index: SynEditKeyCmds.pas
===================================================================
RCS file: /cvsroot/synedit/SynEdit/Source/SynEditKeyCmds.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- SynEditKeyCmds.pas	2001/11/09 07:48:58	1.10
+++ SynEditKeyCmds.pas	2002/02/04 13:21:19	1.11
@@ -738,6 +738,7 @@
 var
   Num: integer;
 begin
+  Clear;
   AStream.Read(Num, SizeOf(Num));
   while Num > 0 do begin
     with Add do

[Synedit-checkins] CVS: SynEdit/Source SynEdit.pas,1.92,1.93

[Dean H. <har...@us...>]

Update of /cvsroot/synedit/SynEdit/Source
In directory usw-pr-cvs1:/tmp/cvs-serv4821

Modified Files:
	SynEdit.pas 
Log Message:
Description: Fixes real tabs bug with TrimTrailingSpaces/SmartTab
BugID: 512504

Index: SynEdit.pas
===================================================================
RCS file: /cvsroot/synedit/SynEdit/Source/SynEdit.pas,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- SynEdit.pas	2002/01/22 14:26:43	1.92
+++ SynEdit.pas	2002/02/04 13:04:06	1.93
@@ -340,7 +340,7 @@
     fRightEdge: Integer;
     fRightEdgeColor: TColor;
     fScrollHintColor: TColor;
-    fScrollHintFormat: TScrollHintFormat; 
+    fScrollHintFormat: TScrollHintFormat;
     FScrollBars: TScrollStyle;
     fTextHeight: Integer;
     fTextOffset: Integer;
@@ -395,12 +395,13 @@
     fOnReplaceText: TReplaceTextEvent;
     fOnSpecialLineColors: TSpecialLineColorsEvent;
     fOnContextHelp: TContextHelpEvent;
-    fOnPaintTransient: TPaintTransient;                                         //GBN 2001-10-23     
+    fOnPaintTransient: TPaintTransient;                                         //GBN 2001-10-23
 
     fOnStatusChange: TStatusChangeEvent;
     fWordWrap: Boolean;                                                         //Fiala 2001-12-17
     fShowSpecChar: Boolean;                                                     //Fiala 2001-12-17
     fIsAltSetColumnMode: Boolean;                                               //Fiala 2001-12-17
+    fOverrideTrim: Boolean;                                                     //DDH 2002-02-04
 
 {$IFDEF SYN_CLX}
     FHScrollBar : TSynEditScrollBar;
@@ -1196,6 +1197,7 @@
   fScrollHintColor := clInfoBk;
   fScrollHintFormat := shfTopLineOnly;
   fIsAltSetColumnMode := False;                                                 //Fiala 2001-12-17
+  fOverrideTrim:= False;                                                        //DDH 2002-02-04        
 end;
 
 {$IFDEF SYN_CLX}
@@ -7717,12 +7719,14 @@
   StartOfBlock: TPoint;
   i, MinLen, iLine: integer;
   PrevLine,
-  Spaces: string;
+  Spaces,
+  CopyString: string;
   p: PChar;
   NewCaretX: integer;                                                           //mh 2000-10-01
   ChangeScroll: boolean;                                                        //mh 2000-10-01
 begin
   i := 0;
+  CopyString := '';
   if eoSmartTabs in fOptions then begin
     iLine := CaretY - 1;
     if (iLine > 0) and (iLine < Lines.Count) then begin
@@ -7744,17 +7748,20 @@
           p := @PrevLine[MinLen];
           // scan over non-whitespaces
           repeat
-            if p^ = #32 then break;
+            if p^ in [#32, #9] then break;
             Inc(i);
             Inc(p);
           until p^ = #0;
           // scan over whitespaces
           if p^ <> #0 then
+          begin
             repeat
-              if p^ <> #32 then break;
+              if not(p^ in [#32, #9]) then break;
               Inc(i);
               Inc(p);
             until p^ = #0;
+            CopyString := Copy(PrevLine, 1, i);
+          end;
           break;
         end;
         Dec(iLine);
@@ -7762,8 +7769,11 @@
     end;
   end;
   if i = 0 then begin
-    i := TabWidth - (CaretX - 1) mod TabWidth;
-    if i = 0 then i := TabWidth;
+    if (eoTabsToSpaces in fOptions) then
+    begin
+      i := TabWidth - (CaretX - 1) mod TabWidth;
+      if i = 0 then i := TabWidth;
+    end else i := 1;
   end;
 
   fUndoList.BeginBlock;
@@ -7776,13 +7786,20 @@
     StartOfBlock := CaretXY;
 {begin}                                                                         //Fiala
     //Spaces := StringOfChar(' ', i)
-    if (eoTabsToSpaces in fOptions)
-    then Spaces := StringOfChar(' ', i)
-      else Spaces := TSynTabChar;
+    if CopyString = '' then
+    begin
+      if (eoTabsToSpaces in fOptions)
+      then Spaces := StringOfChar(' ', i)
+        else Spaces := TSynTabChar;
+    end else begin
+      Spaces := CopyString;  //To account for mixed spaces and tabs above, just set it to the previous line
+    end;
 {end}                                                                           //Fiala
     NewCaretX := StartOfBlock.X + length(Spaces);
 
+    fOverrideTrim := Pos(TSynTabChar, Spaces) <> 0;
     SetSelText(Spaces);
+    fOverrideTrim := True;
     fUndoList.AddChange( crInsert, StartOfBlock, CaretXY, GetSelText,
       SelectionMode );
   finally
@@ -8638,7 +8655,7 @@
 
 procedure TCustomSynEdit.TrimmedSetLine(ALine: integer; ALineText: string);
 begin
-  if eoTrimTrailingSpaces in Options then
+  if (eoTrimTrailingSpaces in Options) and not(fOverrideTrim) then
     Lines[ALine] := TrimRight(ALineText)
   else
     Lines[ALine] := ALineText;
@@ -8896,4 +8913,3 @@
   SynEditClipboardFormat := RegisterClipboardFormat(SYNEDIT_CLIPBOARD_FORMAT);
 {$ENDIF}  
 end.
-

[Synedit-checkins] CVS: SynEdit/Source SynHighlighterJava.pas,1.12,1.13

[Dean H. <har...@us...>]

Update of /cvsroot/synedit/SynEdit/Source
In directory usw-pr-cvs1:/tmp/cvs-serv31165

Modified Files:
	SynHighlighterJava.pas 
Log Message:
Fixes backslash overrun problem with Java Highlighter

Index: SynHighlighterJava.pas
===================================================================
RCS file: /cvsroot/synedit/SynEdit/Source/SynHighlighterJava.pas,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- SynHighlighterJava.pas	2002/01/06 05:24:57	1.12
+++ SynHighlighterJava.pas	2002/01/29 13:20:58	1.13
@@ -755,9 +755,10 @@
   repeat
     case FLine[Run] of
       #0, #10, #13: break;
+      #92: Inc(Run); // backslash, if we have an escaped single character, skip to the next
     end;
-    inc(Run);
-  until (FLine[Run] = #39) and (FLine[Pred(Run)] <> #92);
+    if FLine[Run] <> #0 then inc(Run); //Add check here to prevent overrun from backslash being last char
+  until FLine[Run] = #39;
   if FLine[Run] <> #0 then inc(Run);
 end;
 
@@ -1197,9 +1198,10 @@
   repeat
     case FLine[Run] of
       #0, #10, #13: break;
+      #92: Inc(Run);  // Backslash, if we have an escaped charcter it can be skipped
     end;
-    inc(Run);
-  until (FLine[Run] = #34) and (FLine[Pred(Run)] <> #92);
+    if FLine[Run] <> #0 then inc(Run); //Add check here to prevent overrun from backslash being last char
+  until FLine[Run] = #34;
   if FLine[Run] <> #0 then inc(Run);
 end;
 

[Synedit-checkins] CVS: SynEdit/Source SynHighlighterPHP.pas,1.9,1.10

[Jordan R. <jr...@us...>]

Update of /cvsroot/synedit/SynEdit/Source
In directory usw-pr-cvs1:/tmp/cvs-serv25025

Modified Files:
	SynHighlighterPHP.pas 
Log Message:
\' inside a single-quoted string now highlights correctly.


Index: SynHighlighterPHP.pas
===================================================================
RCS file: /cvsroot/synedit/SynEdit/Source/SynHighlighterPHP.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- SynHighlighterPHP.pas	2001/11/09 07:46:17	1.9
+++ SynHighlighterPHP.pas	2002/01/23 04:20:24	1.10
@@ -706,6 +706,7 @@
   repeat
     case FLine[Run] of
       #0, #10, #13: break;
+      '\': if FLine[Run + 1] in [#39, '\'] then inc(Run);
     end;
     inc(Run);
   until FLine[Run] = #39;