From 83c73c3f8e4c0ff6999be5d1310f5a405d9f6715 Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 19 Feb 2006 21:44:01 +0000 Subject: [PATCH] fixed identifier completion comparing items without nodes git-svn-id: trunk@8776 - --- components/codetools/identcompletiontool.pas | 1 + ide/sourceeditprocs.pas | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/components/codetools/identcompletiontool.pas b/components/codetools/identcompletiontool.pas index 7a26d8d210..136403bace 100644 --- a/components/codetools/identcompletiontool.pas +++ b/components/codetools/identcompletiontool.pas @@ -1392,6 +1392,7 @@ begin Result:=0; if Self=CompareItem then exit; if (Node=CompareItem.Node) then exit; + if (Node=nil) or (CompareItem.Node=nil) then exit; if (Node.Desc<>ctnProcedure) or (CompareItem.Node.Desc<>ctnProcedure) then exit; {DbgOut('TIdentifierListItem.CompareParamList ',GetIdentifier(Identifier),'=',GetIdentifier(CompareItem.Identifier)); diff --git a/ide/sourceeditprocs.pas b/ide/sourceeditprocs.pas index 2b85ae3a40..a4a948211c 100644 --- a/ide/sourceeditprocs.pas +++ b/ide/sourceeditprocs.pas @@ -249,7 +249,12 @@ begin ctnConstDefinition: begin ANode:=IdentItem.Tool.FindTypeNodeOfDefinition(IdentItem.Node); - s:=' = '+IdentItem.Tool.ExtractNode(ANode,[]); + if ANode<>nil then + s:=' = '+IdentItem.Tool.ExtractNode(ANode,[]) + else begin + s:=IdentItem.Tool.ExtractCode(IdentItem.Node.StartPos+length(s), + IdentItem.Node.EndPos,[]); + end; end; else