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

codetools: identifier completion: fixed keywords when cursor on a word

Browse Source 
git-svn-id: trunk@58147 -
This commit is contained in:
mattias 2018-06-05 21:37:41 +00:00
parent 317bc74ea3
commit 75417ff3a2
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/codetools/identcompletiontool.pas
View File

@ -1837,21 +1837,30 @@ var
Node: TCodeTreeNode;
SubNode: TCodeTreeNode;
NodeInFront: TCodeTreeNode;
p: Integer;
p, AtomStartPos: Integer;
NodeBehind, LastChild: TCodeTreeNode;
begin
try
Node:=Context.Node;
//debugln(['TIdentCompletionTool.GatherContextKeywords ',Node.DescAsString]);
if Node<>nil then begin
MoveCursorToNearestAtom(CleanPos);
AtomStartPos:=CurPos.StartPos;
if (AtomStartPos=Node.StartPos) and (Node.Parent<>nil) then
// at the start of the node -> the node is created by the atom at cursor
// use parent as context
Node:=Node.Parent;
end else
AtomStartPos:=CleanPos;
//debugln(['TIdentCompletionTool.GatherContextKeywords Node=',Node.DescAsString]);
ReadPriorAtomSafe(CleanPos);
//debugln(['TIdentCompletionTool.GatherContextKeywords prioratom=',CleanPosToStr(CurPos.StartPos),'=',GetAtom(CurPos)]);
ReadPriorAtomSafe(AtomStartPos);
//debugln(['TIdentCompletionTool.GatherContextKeywords prioratom=',CleanPosToStr(CurPos.StartPos),'="',GetAtom(CurPos),'"']);
NodeInFront:=nil;
if CurPos.StartPos>0 then
NodeInFront:=FindDeepestNodeAtPos(CurPos.StartPos,false);
NodeBehind:=nil;
MoveCursorToCleanPos(CleanPos);
MoveCursorToCleanPos(AtomStartPos);
ReadNextAtom;
//debugln(['TIdentCompletionTool.GatherContextKeywords nextatom=',CleanPosToStr(CurPos.StartPos),'=',GetAtom(CurPos)]);
if CurPos.StartPos>CleanPos then