paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-16 06:09:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: partly fixed find declaration for members of default array property

Browse Source 
git-svn-id: trunk@65069 -
This commit is contained in:
pascal 2021-04-30 00:42:41 +00:00
parent 88eaecc93d
commit 4e21c34991
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/codetools/codecompletiontool.pas
View File

@ -1942,7 +1942,8 @@ begin
Params,Params.NewNode);
OrigExprContext:=ExprType.Context.Tool.FindBaseTypeOfNode(
Params,ExprType.Context.Node);
if (ResExprContext.Tool <> OrigExprContext.Tool) then // the "source" types are different -> add unit to the type
if (ResExprContext.Tool <> OrigExprContext.Tool)
and (ResExprContext.Tool.ExtractSourceName <> 'objpas') then // the "source" types are different -> add unit to the type
NewType := ExprType.Context.Tool.ExtractSourceName + '.' + NewType
else
begin // the "source" types are the same -> set ExprType to found Params.New* so that unit adding is avoided (with MissingUnit)

44
components/codetools/finddeclarationtool.pas
View File

@ -9778,22 +9778,30 @@ var
ReadNextAtom;
RaiseIdentExpected(20191003163224);
end;
ResolveChildren;
if ExprType.Desc in xtAllTypeHelperTypes then begin
// Lazarus supports record helpers for basic types (string) as well (with TYPEHELPERS modeswitch!).
end else if (ExprType.Context.Node=nil) then begin
MoveCursorToCleanPos(CurAtom.StartPos);
ReadNextAtom;
RaiseIllegalQualifierFound(20191003163056);
end else if ExprType.Context.Node.Desc in AllPointContexts then begin
// ok, allowed
end else begin
// not allowed
//debugln(['ResolvePoint ',ExprTypeToString(ExprType)]);
MoveCursorToCleanPos(CurAtom.StartPos);
ReadNextAtom;
RaiseIllegalQualifierFound(20191003163059);
end;
repeat
ResolveChildren;
if ExprType.Desc in xtAllTypeHelperTypes then begin
// Lazarus supports record helpers for basic types (string) as well (with TYPEHELPERS modeswitch!).
break;
end else if (ExprType.Context.Node=nil) then begin
MoveCursorToCleanPos(CurAtom.StartPos);
ReadNextAtom;
RaiseIllegalQualifierFound(20191003163056);
break;
end else if ExprType.Context.Node.Desc in AllPointContexts then begin
// ok, allowed
break;
end else if ExprType.Context.Node.Desc = ctnGenericParameter then begin
// ok, allowed
Params.UpdateContexWithGenParamValue(ExprType.Context);
end else begin
// not allowed
//debugln(['ResolvePoint ',ExprTypeToString(ExprType)]);
MoveCursorToCleanPos(CurAtom.StartPos);
ReadNextAtom;
RaiseIllegalQualifierFound(20191003163059);
end;
until False;
end;
procedure ResolveAs;
@ -14116,6 +14124,10 @@ var
lPNode, lVNode: TCodeTreeNode;
lPTool, lVTool: TFindDeclarationTool;
begin
if Assigned(Parent) then begin
Parent.UpdateContexWithGenParamValue(SpecializeParamContext);
exit;
end;
lMapping := GenParamValueMappings.FirstParamValueMapping;
while lMapping <> nil do begin
lPNode := lMapping.GenericParamNode;