paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-14 16:12:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

MG: fixed code completion: fixed long property proc splitting

Browse Source 
git-svn-id: trunk@1460 -
This commit is contained in:
lazarus 2002-02-25 19:09:07 +00:00
parent 386a8e08f4
commit 2ab00ee4f2
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/codetools/codecompletiontool.pas
View File

@ -690,9 +690,9 @@ begin
end;
CurCode:=ANodeExt.ExtTxt1;
CurCode:=ASourceChangeCache.BeautifyCodeOptions.BeautifyStatement(
CurCode,0);
CurCode,Indent);
ASourceChangeCache.Replace(gtNewLine,gtNewLine,InsertPos,InsertPos,
GetIndentStr(Indent)+CurCode);
CurCode);
end;
ANodeExt:=ANodeExt.Next;
end;

12
components/codetools/pascalparsertool.pas
View File

@ -2713,7 +2713,6 @@ begin
end;
function TPascalParserTool.KeyWordFuncTypeRecordCase: boolean;
var s: string;
begin
if not UpAtomIs('CASE') then
RaiseException('[TPascalParserTool.KeyWordFuncTypeRecordCase] '
@ -2722,8 +2721,6 @@ begin
CurNode.Desc:=ctnRecordCase;
ReadNextAtom; // read ordinal type
AtomIsIdentifier(true);
s:=GetAtom;
writeln('TPascalParserTool.KeyWordFuncTypeRecordCase ',s);
ReadNextAtom;
if AtomIsChar(':') then begin
ReadNextAtom;
@ -2735,7 +2732,6 @@ writeln('TPascalParserTool.KeyWordFuncTypeRecordCase ',s);
// read all variants
repeat
ReadNextAtom; // read constant (variant identifier)
writeln('%%%%% Variant=',GetAtom);
if AtomIsChar(')') or UpAtomIs('END') then break;
CreateChildNode;
CurNode.Desc:=ctnRecordVariant;
@ -2754,18 +2750,14 @@ writeln('%%%%% Variant=',GetAtom);
ReadNextAtom; // read first variable name
repeat
if AtomIsChar(')') then begin
writeln('%%%%% End of Variant ',GetAtom);
// end of variant record
break;
end else if UpAtomIs('CASE') then begin
// sub record variant
writeln('%%%%% SubCase ',GetAtom);
KeyWordFuncTypeRecordCase();
writeln('%%%%% Return from SubCase ',GetAtom);
break;
end else begin
// sub identifier
writeln('%%%%% SubIdentifier ',GetAtom);
repeat
AtomIsIdentifier(true);
CreateChildNode;
@ -2782,7 +2774,6 @@ writeln('%%%%% SubIdentifier ',GetAtom);
ReadNextAtom; // read type
Result:=TypeKeyWordFuncList.DoItUpperCase(UpperSrc,CurPos.StartPos,
CurPos.EndPos-CurPos.StartPos);
writeln('%%%%% End of Type ',GetAtom);
if not Result then exit;
CurNode.EndPos:=CurPos.EndPos;
EndChildNode; // close variable definition
@ -2791,12 +2782,10 @@ writeln('%%%%% End of Type ',GetAtom);
if not AtomIsChar(';') then
RaiseException('; expected, but '+GetAtom+' found');
ReadNextAtom;
writeln('%%%%% C ',GetAtom);
until false;
if not AtomIsChar(')') then
RaiseException(') expected, but '+GetAtom+' found');
ReadNextAtom;
writeln('%%%%% CloseVariant ',GetAtom);
if UpAtomIs('END') or AtomIsChar(')') then begin
CurNode.EndPos:=CurPos.StartPos;
EndChildNode; // close variant
@ -2810,7 +2799,6 @@ writeln('%%%%% CloseVariant ',GetAtom);
until false;
CurNode.EndPos:=CurPos.EndPos;
EndChildNode; // close case
writeln('TPascalParserTool.KeyWordFuncTypeRecordCase END ',s);
Result:=true;
end;

3
components/codetools/sourcechanger.pas
View File

@ -666,7 +666,8 @@ begin
end;
procedure TBeautifyCodeOptions.AddAtom(var s:string; NewAtom: string);
var RestLineLen, LastLineEndInAtom: integer;
var
RestLineLen, LastLineEndInAtom, LastIndent: integer;
begin
if NewAtom='' then exit;
//writeln('[TBeautifyCodeOptions.AddAtom] NewAtom=',NewAtom,' s="',s,'"');