paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-02 09:59:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Codetools: formatting

Browse Source 
git-svn-id: trunk@33954 -
This commit is contained in:
juha 2011-12-04 16:44:42 +00:00
parent 92bed066d7
commit 6012289532
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/codetools/basiccodetools.pas
View File

@ -97,8 +97,7 @@ procedure GetIdentStartEndAtPosition(const Source:string; Position:integer;
function GetIdentStartPosition(const Source:string; Position:integer): integer;
function GetIdentLen(Identifier: PChar): integer;
function GetIdentifier(Identifier: PChar): string;
function FindNextIdentifier(const Source: string; StartPos, MaxPos: integer
): integer;
function FindNextIdentifier(const Source: string; StartPos, MaxPos: integer): integer;
function FindNextIdentifierSkipStrings(const Source: string;
StartPos, MaxPos: integer): integer;
function IsValidIdentPair(const NamePair: string): boolean;
@ -3206,8 +3205,7 @@ begin
end;
end;
function CompareAnsiStringIgnoringSpaceIgnoreCase(Txt1, Txt2: pointer
): integer;
function CompareAnsiStringIgnoringSpaceIgnoreCase(Txt1, Txt2: pointer): integer;
// Txt1, Txt2 are type casted AnsiString
begin
Result:=CompareTextIgnoringSpace(Txt1,length(AnsiString(Txt1)),

12
components/codetools/codecompletiontool.pas
View File

@ -133,8 +133,7 @@ type
fNewMainUsesSectionUnits: TAVLTree; // tree of AnsiString
procedure AddNewPropertyAccessMethodsToClassProcs(ClassProcs: TAVLTree;
const TheClassName: string);
procedure CheckForOverrideAndAddInheritedCode(
ANodeExt: TCodeTreeNodeExtension);
procedure CheckForOverrideAndAddInheritedCode(ANodeExt: TCodeTreeNodeExtension);
function CompleteProperty(PropNode: TCodeTreeNode): boolean;
procedure SetCodeCompleteClassNode(const AClassNode: TCodeTreeNode);
procedure SetCodeCompleteSrcChgCache(const AValue: TSourceChangeCache);
@ -412,8 +411,7 @@ begin
end;
end;
procedure TCodeCompletionCodeTool.SetCodeCompleteClassNode(
const AClassNode: TCodeTreeNode);
procedure TCodeCompletionCodeTool.SetCodeCompleteClassNode(const AClassNode: TCodeTreeNode);
const
Identifiers = AllIdentifierDefinitions+[ctnProperty,ctnProcedure,ctnClassGUID];
begin
@ -7093,8 +7091,7 @@ var
{$ENDIF}
ProcCode:=ASourceChangeCache.BeautifyCodeOptions.BeautifyProc(
ProcCode,Indent,ANodeExt.ExtTxt3='');
ASourceChangeCache.Replace(gtEmptyLine,gtEmptyLine,InsertPos,InsertPos,
ProcCode);
ASourceChangeCache.Replace(gtEmptyLine,gtEmptyLine,InsertPos,InsertPos,ProcCode);
if FJumpToProcName='' then begin
// remember one proc body to jump to after the completion
FJumpToProcName:=ANodeExt.Txt;
@ -7717,8 +7714,7 @@ begin
FCodeCompleteClassNode:=FindClassNode(CursorNode,CurClassName,true,false);
if CodeCompleteClassNode=nil then
RaiseException('oops, I lost your class');
ProcNode:=FindProcNode(CursorNode,FJumpToProcName,
[phpInUpperCase,phpIgnoreForwards]);
ProcNode:=FindProcNode(CursorNode,FJumpToProcName,[phpInUpperCase,phpIgnoreForwards]);
if ProcNode=nil then
RaiseException(ctsNewProcBodyNotFound);
Result:=FindJumpPointInProcNode(ProcNode,NewPos,NewTopLine);