[JVCL-Checkins] dev/JVCL3/run JvHLEditor.pas,1.14,1.15 JvUnicodeHLEditor.pas,1.6,1.7 - Fixed pre-processor lines bug

[Andreas H. <ah...@pr...>]

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16242/run

Modified Files:
	JvHLEditor.pas JvUnicodeHLEditor.pas 
Log Message:
Fixed pre-processor lines bug


Index: JvUnicodeHLEditor.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUnicodeHLEditor.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JvUnicodeHLEditor.pas	26 Jan 2004 08:58:24 -0000	1.6
--- JvUnicodeHLEditor.pas	27 Jan 2004 20:30:23 -0000	1.7
***************
*** 1497,1500 ****
--- 1497,1501 ----
  var
    S: WideString;
+   L: Integer;
  {  LP, i: Integer;
    P: PChar;
***************
*** 1546,1553 ****
       // comment <-> preproc
        S := Lines[ACaretY];
!       if ((ACaretX > 1) and (S[ACaretX - 1] = '{')) or
!          ((ACaretX > 2) and (S[ACaretX - 2] = '(') and (S[ACaretX - 1] = '*')) or
!          ((ACaretX > 1) and (S[ACaretX] = '{')) or
!          ((ACaretX > 2) and (S[ACaretX - 1] = '(') and (S[ACaretX] = '*')) then
        begin
          if RescanLong(ACaretY) then
--- 1547,1557 ----
       // comment <-> preproc
        S := Lines[ACaretY];
!       L := Length(S);
!          // [Backspace, "insert"]
!       if ((ACaretX > 1) and (ACaretX <= L + 1) and (S[ACaretX - 1] = '{')) or
!          ((ACaretX > 2) and (ACaretX <= L + 2) and (S[ACaretX - 2] = '(') and (S[ACaretX - 1] = '*')) or
!          // [Delete]
!          ((ACaretX > 0) and (ACaretX <= L) and (S[ACaretX] = '{')) or
!          ((ACaretX > 1) and (ACaretX <= L + 1) and (S[ACaretX - 1] = '(') and (S[ACaretX] = '*')) then
        begin
          if RescanLong(ACaretY) then

Index: JvHLEditor.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvHLEditor.pas,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** JvHLEditor.pas	27 Jan 2004 12:51:54 -0000	1.14
--- JvHLEditor.pas	27 Jan 2004 20:30:23 -0000	1.15
***************
*** 1554,1558 ****
  var
    S: string;
!   L:integer;
  {  LP, i: Integer;
    P: PChar;
--- 1554,1558 ----
  var
    S: string;
!   L: Integer;
  {  LP, i: Integer;
    P: PChar;
***************
*** 1606,1613 ****
        S := Lines[ACaretY];
        L := Length(S);
!       if ((L > 1) and (S[ACaretX - 1] = '{')) or
!          ((L > 2) and (S[ACaretX - 2] = '(') and (S[ACaretX - 1] = '*')) or
!          ((L > 1) and (S[ACaretX] = '{')) or
!          ((L > 2) and (S[ACaretX - 1] = '(') and (S[ACaretX] = '*')) then
        begin
          if RescanLong(ACaretY) then
--- 1606,1615 ----
        S := Lines[ACaretY];
        L := Length(S);
!          // [Backspace, "insert"]
!       if ((ACaretX > 1) and (ACaretX <= L + 1) and (S[ACaretX - 1] = '{')) or
!          ((ACaretX > 2) and (ACaretX <= L + 2) and (S[ACaretX - 2] = '(') and (S[ACaretX - 1] = '*')) or
!          // [Delete]
!          ((ACaretX > 0) and (ACaretX <= L) and (S[ACaretX] = '{')) or
!          ((ACaretX > 1) and (ACaretX <= L + 1) and (S[ACaretX - 1] = '(') and (S[ACaretX] = '*')) then
        begin
          if RescanLong(ACaretY) then