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

MG: fixed find declaration of forward def class

Browse Source 
git-svn-id: trunk@1617 -
This commit is contained in:
lazarus 2002-04-18 07:53:08 +00:00
parent 4409ebfe2d
commit d02846cc88
3 changed files with 99 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/codetools/finddeclarationtool.pas
View File

@ -570,10 +570,25 @@ function TFindDeclarationTool.FindDeclaration(CursorPos: TCodeXYPosition;
var CleanCursorPos: integer; var CleanCursorPos: integer;
CursorNode, ClassNode: TCodeTreeNode; CursorNode, ClassNode: TCodeTreeNode;
Params: TFindDeclarationParams; Params: TFindDeclarationParams;
DirectSearch: boolean; DirectSearch, SkipChecks, SearchForward: boolean;
procedure CheckIfCursorOnAForwardDefinedClass;
begin
if SkipChecks then exit;
if CursorNode.Desc=ctnTypeDefinition then begin
if (CursorNode.FirstChild<>nil) and (CursorNode.FirstChild.Desc=ctnClass)
and ((CursorNode.FirstChild.SubDesc and ctnsForwardDeclaration)>0) then
begin
DirectSearch:=true;
SearchForward:=true;
SkipChecks:=true;
end;
end;
end;
procedure CheckIfCursorInClassNode; procedure CheckIfCursorInClassNode;
begin begin
if SkipChecks then exit;
ClassNode:=CursorNode.GetNodeOfType(ctnClass); ClassNode:=CursorNode.GetNodeOfType(ctnClass);
if ClassNode<>nil then begin if ClassNode<>nil then begin
// cursor is in class/object definition // cursor is in class/object definition
@ -585,6 +600,7 @@ var CleanCursorPos: integer;
and (CleanCursorPos<ClassNode.FirstChild.StartPos) then begin and (CleanCursorPos<ClassNode.FirstChild.StartPos) then begin
// identifier is an ancestor/interface identifier // identifier is an ancestor/interface identifier
DirectSearch:=true; DirectSearch:=true;
SkipChecks:=true;
end; end;
end; end;
end; end;
@ -592,6 +608,7 @@ var CleanCursorPos: integer;
procedure CheckIfCursorInBeginNode; procedure CheckIfCursorInBeginNode;
begin begin
if SkipChecks then exit;
if CursorNode.Desc=ctnBeginBlock then begin if CursorNode.Desc=ctnBeginBlock then begin
BuildSubTreeForBeginBlock(CursorNode); BuildSubTreeForBeginBlock(CursorNode);
CursorNode:=FindDeepestNodeAtPos(CleanCursorPos,true); CursorNode:=FindDeepestNodeAtPos(CleanCursorPos,true);
@ -601,6 +618,7 @@ var CleanCursorPos: integer;
procedure CheckIfCursorInProcNode; procedure CheckIfCursorInProcNode;
var IsMethod: boolean; var IsMethod: boolean;
begin begin
if SkipChecks then exit;
if CursorNode.Desc=ctnProcedureHead then if CursorNode.Desc=ctnProcedureHead then
CursorNode:=CursorNode.Parent; CursorNode:=CursorNode.Parent;
if CursorNode.Desc=ctnProcedure then begin if CursorNode.Desc=ctnProcedure then begin
@ -624,6 +642,7 @@ var CleanCursorPos: integer;
// cursor on proc name // cursor on proc name
// -> ignore proc name and search overloaded identifier // -> ignore proc name and search overloaded identifier
DirectSearch:=true; DirectSearch:=true;
SkipChecks:=true;
end; end;
end; end;
if CursorNode.Desc=ctnProcedureHead then if CursorNode.Desc=ctnProcedureHead then
@ -633,17 +652,21 @@ var CleanCursorPos: integer;
procedure CheckIfCursorInPropertyNode; procedure CheckIfCursorInPropertyNode;
begin begin
if SkipChecks then exit;
if CursorNode.Desc=ctnProperty then begin if CursorNode.Desc=ctnProperty then begin
MoveCursorToNodeStart(CursorNode); MoveCursorToNodeStart(CursorNode);
ReadNextAtom; // read 'property' ReadNextAtom; // read 'property'
ReadNextAtom; // read property name ReadNextAtom; // read property name
if CleanCursorPos<CurPos.EndPos then if CleanCursorPos<CurPos.EndPos then begin
DirectSearch:=true; DirectSearch:=true;
SkipChecks:=true;
end;
end; end;
end; end;
begin begin
Result:=false; Result:=false;
SkipChecks:=false;
ActivateGlobalWriteLock; ActivateGlobalWriteLock;
try try
// build code tree // build code tree
@ -673,6 +696,8 @@ begin
NewPos,NewTopLine); NewPos,NewTopLine);
end else begin end else begin
DirectSearch:=false; DirectSearch:=false;
SearchForward:=false;
CheckIfCursorOnAForwardDefinedClass;
CheckIfCursorInClassNode; CheckIfCursorInClassNode;
CheckIfCursorInBeginNode; CheckIfCursorInBeginNode;
CheckIfCursorInProcNode; CheckIfCursorInProcNode;
@ -693,13 +718,14 @@ begin
Params.ContextNode:=CursorNode; Params.ContextNode:=CursorNode;
Params.SetIdentifier(Self,@Src[CurPos.StartPos],@CheckSrcIdentifier); Params.SetIdentifier(Self,@Src[CurPos.StartPos],@CheckSrcIdentifier);
Params.Flags:=[fdfSearchInParentNodes,fdfExceptionOnNotFound, Params.Flags:=[fdfSearchInParentNodes,fdfExceptionOnNotFound,
fdfTopLvlResolving]; fdfTopLvlResolving,fdfSearchInAncestors]
Params.Flags:=Params.Flags +fdfAllClassVisibilities;
+[fdfSearchInAncestors]+fdfAllClassVisibilities;
if not DirectSearch then begin if not DirectSearch then begin
Result:=FindDeclarationOfIdentAtCursor(Params); Result:=FindDeclarationOfIdentAtCursor(Params);
end else begin end else begin
Include(Params.Flags,fdfIgnoreCurContextNode); Include(Params.Flags,fdfIgnoreCurContextNode);
if SearchForward then
Include(Params.Flags,fdfSearchForward);
Result:=FindIdentifierInContext(Params); Result:=FindIdentifierInContext(Params);
end; end;
if Result then begin if Result then begin

2
components/codetools/keywordfunclists.pas
View File

@ -606,12 +606,10 @@ begin
Add('ARRAY',{$ifdef FPC}@{$endif}AllwaysTrue); Add('ARRAY',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('ASM',{$ifdef FPC}@{$endif}AllwaysTrue); Add('ASM',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('BEGIN',{$ifdef FPC}@{$endif}AllwaysTrue); Add('BEGIN',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('BREAK',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('CASE',{$ifdef FPC}@{$endif}AllwaysTrue); Add('CASE',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('CLASS',{$ifdef FPC}@{$endif}AllwaysTrue); Add('CLASS',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('CONST',{$ifdef FPC}@{$endif}AllwaysTrue); Add('CONST',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('CONSTRUCTOR',{$ifdef FPC}@{$endif}AllwaysTrue); Add('CONSTRUCTOR',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('CONTINUE',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('DESTRUCTOR',{$ifdef FPC}@{$endif}AllwaysTrue); Add('DESTRUCTOR',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('DIV',{$ifdef FPC}@{$endif}AllwaysTrue); Add('DIV',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('DO',{$ifdef FPC}@{$endif}AllwaysTrue); Add('DO',{$ifdef FPC}@{$endif}AllwaysTrue);

131
lcl/stdctrls.pp
View File

@ -113,74 +113,76 @@ type
TCustomGroupBox = class (TWinControl) {class(TCustomControl) } TCustomGroupBox = class (TWinControl) {class(TCustomControl) }
public public
constructor Create(AOwner : TComponent); Override; constructor Create(AOwner : TComponent); Override;
end; end;
TGroupBox = class(TCustomGroupBox) TGroupBox = class(TCustomGroupBox)
published published
property Caption; property Caption;
property Visible; property Visible;
end; end;
TComboBoxStyle = (csDropDown, csSimple, csDropDownList, csOwnerDrawFixed,
csOwnerDrawVariable);
TComboBoxStyle = (csDropDown, csSimple, csDropDownList, csOwnerDrawFixed, csOwnerDrawVariable);
TCustomComboBox = class(TWinControl) TCustomComboBox = class(TWinControl)
private private
FItems: TStrings; FItems: TStrings;
FStyle : TComboBoxStyle; FStyle : TComboBoxStyle;
FOnChange : TNotifyEvent; FOnChange : TNotifyEvent;
FSorted : boolean; FSorted : boolean;
procedure SetItems(Value : TStrings); procedure SetItems(Value : TStrings);
procedure CNDrawItems(var Message : TLMDrawItems) ; message CN_DrawItem; procedure CNDrawItems(var Message : TLMDrawItems) ; message CN_DrawItem;
protected protected
procedure CreateHandle; override; procedure CreateHandle; override;
procedure DestroyHandle; override; procedure DestroyHandle; override;
procedure DoChange(var msg); message LM_CHANGED; procedure DoChange(var msg); message LM_CHANGED;
function GetSelLength : integer; function GetSelLength : integer;
function GetSelStart : integer; function GetSelStart : integer;
function GetSelText : string; function GetSelText : string;
function GetItemIndex : integer; virtual; function GetItemIndex : integer; virtual;
function GetMaxLength : integer; virtual; function GetMaxLength : integer; virtual;
procedure SetItemIndex(Val : integer); virtual; procedure SetItemIndex(Val : integer); virtual;
procedure SetMaxLength(Val : integer); virtual; procedure SetMaxLength(Val : integer); virtual;
procedure SetSelLength(Val : integer); procedure SetSelLength(Val : integer);
procedure SetSelStart(Val : integer); procedure SetSelStart(Val : integer);
procedure SetSelText(Val : string); procedure SetSelText(Val : string);
procedure SetSorted(Val : boolean); virtual; procedure SetSorted(Val : boolean); virtual;
procedure SetStyle(Val : TComboBoxStyle); virtual; procedure SetStyle(Val : TComboBoxStyle); virtual;
property Items : TStrings read FItems write SetItems; property Items : TStrings read FItems write SetItems;
property ItemIndex : integer read GetItemIndex write SetItemIndex; property ItemIndex : integer read GetItemIndex write SetItemIndex;
property MaxLength : integer read GetMaxLength write SetMaxLength; property MaxLength : integer read GetMaxLength write SetMaxLength;
property Sorted : boolean read FSorted write SetSorted; property Sorted : boolean read FSorted write SetSorted;
property Style : TComboBoxStyle read FStyle write SetStyle; property Style : TComboBoxStyle read FStyle write SetStyle;
property OnChange : TNotifyEvent read FOnChange write FOnChange; property OnChange : TNotifyEvent read FOnChange write FOnChange;
public public
constructor Create(AOwner : TComponent); Override; constructor Create(AOwner : TComponent); Override;
destructor Destroy; override; destructor Destroy; override;
property SelLength : integer read GetSelLength write SetSelLength; property SelLength : integer read GetSelLength write SetSelLength;
property SelStart : integer read GetSelStart write SetSelStart; property SelStart : integer read GetSelStart write SetSelStart;
property SelText : String read GetSelText write SetSelText; property SelText : String read GetSelText write SetSelText;
end; end;
TComboBox = class(TCustomComboBox) TComboBox = class(TCustomComboBox)
public public
property ItemIndex; property ItemIndex;
published published
property Enabled; property Enabled;
property Items; property Items;
property MaxLength; property MaxLength;
property Sorted; property Sorted;
property Style; property Style;
property Text; property Text;
property Visible; property Visible;
property OnChange; property OnChange;
property OnClick; property OnClick;
property OnEnter; property OnEnter;
property OnExit; property OnExit;
property OnKeyPress; property OnKeyPress;
end; end;
TListBoxStyle = (lbStandard, lbOwnerDrawFixed, lbOwnerDrawVariable); TListBoxStyle = (lbStandard, lbOwnerDrawFixed, lbOwnerDrawVariable);
@ -579,6 +581,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.23 2002/04/18 07:53:08 lazarus
MG: fixed find declaration of forward def class
Revision 1.22 2002/03/25 17:59:19 lazarus Revision 1.22 2002/03/25 17:59:19 lazarus
GTK Cleanup GTK Cleanup
Shane Shane