SynEdit, Highlighter: fix an issue with pchar (read only) to no longer allocated string

git-svn-id: trunk@30096 -

components/synedit/synedithighlighter.pp

@@ -1252,9 +1252,7 @@ begin
     ResetRange
   else
     SetRange(FCurrentRanges[LineNumber - 1]);
-  // Keep a copy of the line text, since some highlighters just use a PChar pointer to it.
+  SetLine(CurrentLines[LineNumber], LineNumber);
-  FLineText := CurrentLines[LineNumber];
-  SetLine(FLineText, LineNumber);
 end;
 
 procedure TSynCustomHighlighter.ResetRange;
@@ -1263,6 +1261,8 @@ end;
 
 procedure TSynCustomHighlighter.SetLine(const NewValue: String; LineNumber: Integer);
 begin
+  // Keep a copy of the line text, since some highlighters just use a PChar pointer to it.
+  FLineText := NewValue;
   FIsInNextToEOL := False;
   FLineIndex := LineNumber;
 end;

components/synedit/synhighlighterany.pas

@@ -468,6 +468,7 @@ end; { Destroy }
 
 procedure TSynAnySyn.SetLine(const NewValue: String; LineNumber:Integer);
 begin
+  inherited;
   fLine := PChar(NewValue);
   Run := 0;
   fLineNumber := LineNumber;

components/synedit/synhighlighterbat.pas

@@ -417,6 +417,7 @@ end;
 
 procedure TSynBatSyn.SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer);
 begin
+  inherited;
   fLine := PChar(NewValue);
   Run := 0;
   fEcho := False;

components/synedit/synhighlightercpp.pp

@@ -812,6 +812,7 @@ end; { Create }
 
 procedure TSynCppSyn.SetLine(const NewValue: String; LineNumber:Integer);
 begin
+  inherited;
   fLine := PChar(NewValue);
   Run := 0;
   fLineNumber := LineNumber;

components/synedit/synhighlightercss.pas

@@ -1473,6 +1473,7 @@ end;
 
 procedure TSynCssSyn.SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer);
 begin
+  inherited;
   fLine := PChar(NewValue);
   Run := 0;
   fLineNumber := LineNumber;

components/synedit/synhighlighterini.pas

@@ -193,6 +193,7 @@ end; { Create }
 
 procedure TSynIniSyn.SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber:Integer);
 begin
+  inherited;
   fLine := PChar(NewValue);
   Run := 0;
   fLineNumber := LineNumber;

components/synedit/synhighlighterjava.pas

@@ -693,6 +693,7 @@ end; { Create }
 procedure TSynJavaSyn.SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String;
   LineNumber:Integer);
 begin
+  inherited;
   fLine := PChar(NewValue);
   Run := 0;
   fEol := False;

components/synedit/synhighlighterjscript.pas

@@ -1537,6 +1537,7 @@ end;
 
 procedure TSynJScriptSyn.SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer);
 begin
+  inherited;
   fLine := PChar(NewValue);
   Run := 0;
   fLineNumber := LineNumber;

components/synedit/synhighlightermulti.pas

@@ -1488,6 +1488,7 @@ var
   i: Integer;
 begin
   if IsScanning then exit;
+  inherited;
 
   FCurLineIndex := LineNumber;
   FLine := NewValue;

components/synedit/synhighlighterperl.pas

@@ -2039,6 +2039,7 @@ end; { Create }
 procedure TSynPerlSyn.SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String;
   LineNumber:Integer);
 begin
+  inherited;
   fLine := PChar(NewValue);
   Run := 0;
   fLineNumber := LineNumber;

components/synedit/synhighlighterphp.pas

@@ -696,6 +696,7 @@ end;
 
 procedure TSynPHPSyn.SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer);
 begin
+  inherited;
   fLine := PChar(NewValue);
   {$IFDEF SYN_LAZARUS}
   fLineLen := length(NewValue);

components/synedit/synhighlighterposition.pas

@@ -263,6 +263,7 @@ procedure TSynPositionHighlighter.SetLine(const NewValue: string;
 var
   p: PPositionTokens;
 begin
+  inherited;
   fLine := NewValue;
   fLineLen := length(fLine);
   fLineNumber := LineNumber;

components/synedit/synhighlighterpython.pas

@@ -479,6 +479,7 @@ end;
 procedure TSynPythonSyn.SetLine({$IFDEF FPC}const {$ENDIF}NewValue: string;
   LineNumber: Integer);
 begin
+  inherited;
   fLine := PChar(NewValue);
   Run := 0;
   fLineNumber := LineNumber;

components/synedit/synhighlightersql.pas

@@ -1110,6 +1110,7 @@ end;
 
 procedure TSynSQLSyn.SetLine({$IFDEF FPC}const {$ENDIF}NewValue: string; LineNumber: Integer);
 begin
+  inherited;
   fLine := PChar(NewValue);
   Run := 0;
   fLineNumber := LineNumber;

components/synedit/synhighlightertex.pas

@@ -207,6 +207,7 @@ end;  { Create }
 
 procedure TSynTeXSyn.SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber:Integer);
 begin
+  inherited;
   fLine       := PChar(NewValue);
   Run         := 0;
   fLineNumber := LineNumber;

components/synedit/synhighlighterunixshellscript.pas

@@ -354,6 +354,7 @@ procedure TSynUNIXShellScriptSyn.SetLine(
   {$IFDEF FPC}const {$ENDIF}NewValue: String;
   LineNumber:Integer);
 begin
+  inherited;
   fLine := PChar(NewValue);
   Run := 0;
   fLineNumber := LineNumber;

components/synedit/synhighlightervb.pas

@@ -1053,6 +1053,7 @@ end;
 
 procedure TSynVBSyn.SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer);
 begin
+  inherited;
   fLine := PChar(NewValue);
   Run := 0;
   fLineNumber := LineNumber;