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

codetools: fixed CreatePublishedMethod adding dotted unitnames

Browse Source
This commit is contained in:
mattias 2023-09-23 09:01:51 +02:00
parent 426ee9a730
commit 5eceb681ca
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/codetools/codecompletiontool.pas
View File

@ -1441,12 +1441,12 @@ var
s: String;
begin
if GetIdentLen(AnUnitName)=0 then exit;
if CompareIdentifiers(AnUnitName,'System')=0 then exit;
if (CompareIdentifiers(AnUnitName,'ObjPas')=0)
if CompareDottedIdentifiers(AnUnitName,'System')=0 then exit;
if (CompareDottedIdentifiers(AnUnitName,'ObjPas')=0)
and (Scanner.CompilerMode in [cmDELPHI,cmOBJFPC])
and (Scanner.PascalCompiler=pcFPC) then
exit;
if (CompareIdentifiers(AnUnitName,'MacPas')=0)
if (CompareDottedIdentifiers(AnUnitName,'MacPas')=0)
and (Scanner.CompilerMode=cmMacPas)
and (Scanner.PascalCompiler=pcFPC) then
exit;
@ -1456,6 +1456,7 @@ begin
//DebugLn(['TCodeCompletionCodeTool.AddNeededUnitToMainUsesSection AnUnitName="',AnUnitName,'"']);
if fNewMainUsesSectionUnits.Find(AnUnitName)<>nil then exit;
s:=StrPas(AnUnitName);
//debugln(['TCodeCompletionCodeTool.AddNeededUnitToMainUsesSection Unit="',s,'"']);
fNewMainUsesSectionUnits.Add(Pointer(s));
Pointer(s):=nil;
end;
@ -8263,7 +8264,7 @@ var
CurSourceName: String;
SectionNode: TCodeTreeNode;
NewUsesTerm: String;
NewUnitName: String;
NewUnitName, CurUnitName: String;
InsertPos: LongInt;
begin
Result:=true;
@ -8280,15 +8281,16 @@ begin
repeat
ReadNextAtom; // read name
if AtomIsChar(';') then break;
RemoveNewMainUsesSectionUnit(@Src[CurPos.StartPos]);
CurUnitName:=ExtractUsedUnitNameAtCursor();
RemoveNewMainUsesSectionUnit(PChar(CurUnitName));
if fNewMainUsesSectionUnits.Count=0 then exit;
ReadNextAtom;
if UpAtomIs('IN') then begin
while AtomIsChar('.') do
begin
ReadNextAtom;
ReadNextAtom;
end;
while AtomIsChar('.') do
begin
if UpAtomIs('IN') then begin
ReadNextAtom;
ReadNextAtom;
end;
@ -8303,7 +8305,7 @@ begin
while AVLNode<>nil do begin
if NewUsesTerm<>'' then
NewUsesTerm:=NewUsesTerm+', ';
NewUnitName:=GetIdentifier(PChar(AVLNode.Data));
NewUnitName:=GetDottedIdentifier(PChar(AVLNode.Data));
//DebugLn(['TCodeCompletionCodeTool.InsertAllNewUnitsToMainUsesSection NewUnitName=',NewUnitName]);
NewUsesTerm:=NewUsesTerm+NewUnitName;
AVLNode:=fNewMainUsesSectionUnits.FindSuccessor(AVLNode);

6
components/codetools/eventcodetool.pas
View File

@ -946,8 +946,10 @@ var
begin
Result:=false;
try
if (ClassNode=nil) or (not (ClassNode.Desc in [ctnClass,ctnObjCClass])) or (AMethodName='')
or (ATypeInfo=nil) or (SourceChangeCache=nil) or (Scanner=nil) then begin
if (ClassNode=nil) or (not (ClassNode.Desc in [ctnClass,ctnObjCClass]))
or (AMethodName='')
or (ATypeInfo=nil) or (SourceChangeCache=nil) or (Scanner=nil) then
begin
debugln(['TEventsCodeTool.CreateMethod failed, missing parameter']);
exit;
end;