paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-27 16:40:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: identifier completion: fixed when cursor outside of code, e.g. beyond end of line

Browse Source 
git-svn-id: trunk@40920 -
This commit is contained in:
mattias 2013-04-28 22:40:44 +00:00
parent ca340b95bb
commit 6c82fdfde1
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/codetools/identcompletiontool.pas
View File

@ -1393,13 +1393,14 @@ procedure TIdentCompletionTool.GatherUsefulIdentifiers(CleanPos: integer;
var
PropertyName: String;
begin
while (CleanPos>1) and (IsIdentChar[Src[CleanPos-1]]) do dec(CleanPos);
//debugln(['TIdentCompletionTool.GatherUsefulIdentifiers ',CleanPosToStr(CleanPos),' ',dbgsFC(Context)]);
GatherPredefinedIdentifiers(CleanPos,Context);
if Context.Node.Desc=ctnProperty then begin
PropertyName:=ExtractPropName(Context.Node,false);
//debugln('TIdentCompletionTool.GatherUsefulIdentifiers Property ',PropertyName);
MoveCursorToCleanPos(CleanPos);
ReadPriorAtom;
//debugln(['TIdentCompletionTool.GatherUsefulIdentifiers Atom=',GetAtom]);
if UpAtomIs('READ') then begin
// add the default class completion 'read' specifier function
AddPropertyProc(Beautifier.PropertyReadIdentPrefix+PropertyName);
@ -1853,8 +1854,13 @@ begin
end;
// get identifier position
GetIdentStartEndAtPosition(Src,CleanCursorPos,IdentStartPos,IdentEndPos);
//DebugLn(['TIdentCompletionTool.ParseSourceTillCollectionStart ',dbgstr(copy(Src,IdentStartPos,10)),' CursorPos.X=',CursorPos.X,' LineLen=',CursorPos.Code.GetLineLength(CursorPos.Y-1),' ',CursorPos.Code.getline(CursorPos.Y-1)]);
if CursorPos.Code.LineColIsOutside(CursorPos.Y,CursorPos.X) then begin
IdentStartPos:=CleanCursorPos;
IdentEndPos:=CleanCursorPos;
end else begin
GetIdentStartEndAtPosition(Src,CleanCursorPos,IdentStartPos,IdentEndPos);
end;
//DebugLn(['TIdentCompletionTool.ParseSourceTillCollectionStart ',dbgstr(copy(Src,IdentStartPos,10)),' CursorPos.X=',CursorPos.X,' LineLen=',CursorPos.Code.GetLineLength(CursorPos.Y-1),' ',CursorPos.Code.GetLine(CursorPos.Y-1)]);
if CursorPos.X>CursorPos.Code.GetLineLength(CursorPos.Y-1)+1 then
IdentStartPos:=IdentEndPos;
end;
@ -2419,8 +2425,8 @@ begin
// find context
{$IFDEF CTDEBUG}
DebugLn('TIdentCompletionTool.GatherIdentifiers B',
' CleanCursorPos=',dbgs(CleanCursorPos),
' IdentStartPos=',dbgs(IdentStartPos),' IdentEndPos=',dbgs(IdentEndPos),
' CleanCursorPos=',CleanPosToStr(CleanCursorPos),
' IdentStartPos=',CleanPosToStr(IdentStartPos),' IdentEndPos=',CleanPosToStr(IdentEndPos),
' Ident=',copy(Src,IdentStartPos,IdentEndPos-IdentStartPos));
{$ENDIF}
GatherContext:=CreateFindContext(Self,CursorNode);