paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-14 22:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: local var completion: always check the identifier at cursor first

Browse Source 
git-svn-id: trunk@50053 -
This commit is contained in:
mattias 2015-10-14 10:51:53 +00:00
parent b5bbdbd323
commit d76225f6d7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/codetools/codecompletiontool.pas
View File

@ -9320,12 +9320,13 @@ begin
CodeCompleteSrcChgCache:=SourceChangeCache; CodeCompleteSrcChgCache:=SourceChangeCache;
CursorNode:=FindDeepestNodeAtPos(CleanCursorPos,true); CursorNode:=FindDeepestNodeAtPos(CleanCursorPos,true);
if TryComplete(CursorNode, CleanCursorPos, OrigCleanCursorPos) then
exit(true);
{ Find the first occurence of the (local) identifier at cursor in current { Find the first occurence of the (local) identifier at cursor in current
procedure body and try again. } procedure body and try again. }
Result:=TryFirstLocalIdentOccurence(CursorNode,OrigCleanCursorPos,CleanCursorPos); if TryFirstLocalIdentOccurence(CursorNode,OrigCleanCursorPos,CleanCursorPos) then
if Result then exit; exit(true);
if TryComplete(CursorNode, CleanCursorPos, OrigCleanCursorPos) then exit;
{$IFDEF CTDEBUG} {$IFDEF CTDEBUG}
DebugLn('TCodeCompletionCodeTool.CompleteCode nothing to complete ... '); DebugLn('TCodeCompletionCodeTool.CompleteCode nothing to complete ... ');