SynEdit: clean up

git-svn-id: trunk@39851 -
This commit is contained in:
martin 2013-01-14 14:01:05 +00:00
parent afae3bdd95
commit 6a5c8b3c85
5 changed files with 13 additions and 11 deletions

View File

@ -1576,7 +1576,7 @@ end;
procedure TTestFoldedView.TestFoldStateDesc;
var
a1,a2, a3, a4: String;
a1,a2{, a3, a4}: String;
begin
(* - The values returned by GetFoldDescription can change in future versions
Therefore there is only a limited number of tests.
@ -1633,8 +1633,8 @@ begin
a1 := FoldedView.GetFoldDescription(0, 0, -1, -1, True, False);
a2 := FoldedView.GetFoldDescription(0, 0, -1, -1, False, False);
a3 := FoldedView.GetFoldDescription(0, 0, -1, -1, True, True);
a4 := FoldedView.GetFoldDescription(0, 0, -1, -1, False, True);
{a3 := }FoldedView.GetFoldDescription(0, 0, -1, -1, True, True);
{a4 := }FoldedView.GetFoldDescription(0, 0, -1, -1, False, True);
SetCaretAndSel(1,5, 2,6);
FoldedView.FoldAtTextIndex(4, 0, 1, False, 0);

View File

@ -819,6 +819,7 @@ if MultiHl.CurrentLines <> nil then DumpAll(MultiHl) else debugln('#');
end;
begin
Name := '';
form.Width := 700;
PushBaseName('SetupXmlLfmPas start empty');
@ -835,9 +836,9 @@ procedure TTestHighlightMulti.TestMultiHLEdit;
var
MultiHl: TSynMultiSyn;
XmlHl: TSynXMLSyn;
EmptyScheme, PasScheme: TSynHighlighterMultiScheme;
{EmptyScheme, }PasScheme: TSynHighlighterMultiScheme;
AtXmlEl, AtXmlSym, AtXmlTxt: TSynHighlighterAttributes;
AtPasMark, AtPasSym, AtPasId, AtPasKey, AtPasSp, AtPasCom: TSynHighlighterAttributes;
AtPasMark, AtPasSym, AtPasId, AtPasKey, {AtPasSp, }AtPasCom: TSynHighlighterAttributes;
PasHl: TSynPasSyn;
i, j: Integer;
@ -848,7 +849,8 @@ var
XmlHl.ElementAttri.Foreground := 255;
MultiHl.DefaultHighlighter := XmlHl;
EmptyScheme := TSynHighlighterMultiScheme(MultiHl.Schemes.Add);
//EmptyScheme := TSynHighlighterMultiScheme(MultiHl.Schemes.Add);
MultiHl.Schemes.Add; // EmptyScheme
AtXmlEl := XmlHl.ElementAttri;
AtXmlSym := XmlHl.SymbolAttri;
@ -890,7 +892,7 @@ var
AtPasSym := PasHl.SymbolAttri;
AtPasId := PasHl.IdentifierAttri;
AtPasKey := PasHl.KeyAttri;
AtPasSp := PasHl.SpaceAttri;
//AtPasSp := PasHl.SpaceAttri;
AtPasCom := PasHl.CommentAttri;
end;
procedure FinishMultiXmlPasHl;

View File

@ -444,7 +444,7 @@ procedure TTestSynNavigation.TestCaretLeftRight;
begin
if ExpCaretY < 0 then ExpCaretY := ALine;
EditorCommandToIdent(ACommand, s);
EditorCommandToIdent(ACommand, s{%H-});
AName := Format('%s (%s Y=%d, X=%d) ', [AName, s, ALine, AStartPhysX]);
{%region NO eoKeepCaretX}

View File

@ -34,7 +34,7 @@ type
FGotFirstLinePos, FGotLastLinePos: Integer;
FGotReason: TSynEditorCommand;
function GetIndentCallBack( Sender: TObject; // the beautifier
Editor: TObject; // the synedit
{%H-}Editor: TObject; // the synedit
LogCaret, OldLogCaret: TPoint;
FirstLinePos, LastLinePos: Integer;
Reason: TSynEditorCommand; // what caused the evnt

View File

@ -392,7 +392,7 @@ begin
test_undo('-newlin 3(r)', cr+' ab ', 6,2);
test_caret('no trim', 1,1, cr+' ab ', 1,1);
(*
{
(* *)
test_start('insert newline+indent before space', cr+' ab ');
test_cmd ('insert 5,2', 5,2, ecLineBreak, ' ', cr+' ab'+cr+' ', 3,3);
@ -453,7 +453,7 @@ begin
test_undo('-linebreak 2(r)', cr+' ab ', 5,2);
test_caret('no trim', 1,1, cr+' ab ', 1,1);
*)
*)
}
{ Join Lines }
(* *)