From 8bd083362e6e5c22bb928cc0bd6b8b650cf5f9df Mon Sep 17 00:00:00 2001 From: ondrej Date: Fri, 8 Jan 2016 12:42:27 +0000 Subject: [PATCH] merge r51107 #491df20f71,r51216: codetools * codetools: support static array helpers * codetools: support helpers for array types git-svn-id: branches/fixes_1_6@51230 - --- components/codetools/codetree.pas | 4 +++- components/codetools/finddeclarationtool.pas | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/codetools/codetree.pas b/components/codetools/codetree.pas index 5363587114..eaf3c4195f 100644 --- a/components/codetools/codetree.pas +++ b/components/codetools/codetree.pas @@ -197,7 +197,9 @@ const ctnInitialization,ctnFinalization]; AllFindContextDescs = AllIdentifierDefinitions + AllCodeSections + AllClasses + [ctnProcedure]; - AllPointContexts = AllClasses+AllSourceTypes+[ctnEnumerationType,ctnInterface,ctnImplementation,ctnTypeType,ctnUseUnitNamespace,ctnUseUnitClearName]; + AllPointContexts = AllClasses+AllSourceTypes+ + [ctnEnumerationType,ctnInterface,ctnImplementation,ctnTypeType, + ctnUseUnitNamespace,ctnUseUnitClearName,ctnRangedArrayType,ctnOpenArrayType]; // CodeTreeNodeSubDescriptors diff --git a/components/codetools/finddeclarationtool.pas b/components/codetools/finddeclarationtool.pas index cf57457d7e..73fa288642 100644 --- a/components/codetools/finddeclarationtool.pas +++ b/components/codetools/finddeclarationtool.pas @@ -4331,7 +4331,7 @@ begin // find class helper functions SearchInHelpersInTheEnd := False; if (fdfSearchInHelpers in Flags) - and (ContextNode.Desc in [ctnClass,ctnRecordType,ctnTypeType,ctnObjCClass,ctnEnumerationType]) + and (ContextNode.Desc in [ctnClass,ctnRecordType,ctnTypeType,ctnObjCClass,ctnEnumerationType,ctnRangedArrayType,ctnOpenArrayType]) and (ContextNode.Parent<>nil) and (ContextNode.Parent.Desc = ctnTypeDefinition) then begin if (fdfSearchInHelpersInTheEnd in Flags) then