codetools: fixed crash in class completion searching ancestor

git-svn-id: trunk@33984 -
2025-08-08 19:35:59 +02:00 · 2011-12-05 23:28:12 +00:00 · 2011-12-05 23:28:12 +00:00 · 123e380712
commit 123e380712
parent cafb155a02
26 changed files with 169 additions and 5 deletions
--- a/components/codetools/codecompletiontool.pas
+++ b/components/codetools/codecompletiontool.pas
@ -7037,6 +7037,7 @@ var
  InclProcCall: Boolean;
  Beauty: TBeautifyCodeOptions;
  Params: TFindDeclarationParams;
+  Tool: TFindDeclarationTool;
 begin
  if not AddInheritedCodeToOverrideMethod then exit;
  {$IFDEF CTDEBUG}
@ -7052,15 +7053,16 @@ begin
    try
      ClassNode:=CodeCompleteClassNode;
      while FindAncestorOfClass(ClassNode,Params,True) do begin
+        Tool:=Params.NewCodeTool;
        ClassNode:=Params.NewNode;
        Params.ContextNode:=ClassNode;
-        Params.IdentifierTool:=Params.NewCodeTool;
+        Params.IdentifierTool:=Tool;
        // FirstChild skips keyword 'procedure' or 'function'
        Params.SetIdentifier(Self,@Src[ProcNode.FirstChild.StartPos],nil);
        // Found ancestor definition.
-        if FindIdentifierInContext(Params) then begin
+        if Tool.FindIdentifierInContext(Params) then begin
          if Params.NewNode<>nil then
-            InclProcCall:=not ProcNodeHasSpecifier(Params.NewNode,psABSTRACT);
+            InclProcCall:=not Tool.ProcNodeHasSpecifier(Params.NewNode,psABSTRACT);
          Break;
        end;
      end;
--- a/components/codetools/ide/codyidentifiersdlg.pas
+++ b/components/codetools/ide/codyidentifiersdlg.pas
@ -30,8 +30,6 @@
    -clean up old entries
      -When, How?
      -maximum number of units
-      -when package file not found delete package and all units only in this package
-      -when file not found delete unit
    -gzip? lot of cpu, may be faster on first load
 }
 unit CodyIdentifiersDlg;
--- a/components/synedit/languages/syndesignstringconstants.he.po
+++ b/components/synedit/languages/syndesignstringconstants.he.po
@ -31,6 +31,10 @@ msgstr "מספרי שורות"
 msgid "Line Overview"
 msgstr "סקירה של כל השורה"

+#: syndesignstringconstants.syndsresetmouseactions
+msgid "Reset mouse actions"
+msgstr ""
+
 #: syndesignstringconstants.syndsseparator
 msgid "Separator"
 msgstr "מפריד"
--- a/components/synedit/languages/syndesignstringconstants.it.po
+++ b/components/synedit/languages/syndesignstringconstants.it.po
@ -31,6 +31,10 @@ msgstr "Numeri di riga"
 msgid "Line Overview"
 msgstr "Sommario riga"

+#: syndesignstringconstants.syndsresetmouseactions
+msgid "Reset mouse actions"
+msgstr ""
+
 #: syndesignstringconstants.syndsseparator
 msgid "Separator"
 msgstr "Separatore"
--- a/components/synedit/languages/syndesignstringconstants.po
+++ b/components/synedit/languages/syndesignstringconstants.po
@ -21,6 +21,10 @@ msgstr ""
 msgid "Line Overview"
 msgstr ""

+#: syndesignstringconstants.syndsresetmouseactions
+msgid "Reset mouse actions"
+msgstr ""
+
 #: syndesignstringconstants.syndsseparator
 msgid "Separator"
 msgstr ""
--- a/components/synedit/languages/syndesignstringconstants.pt.po
+++ b/components/synedit/languages/syndesignstringconstants.pt.po
@ -29,6 +29,10 @@ msgstr "Números de Linha"
 msgid "Line Overview"
 msgstr "Resumo Linha"

+#: syndesignstringconstants.syndsresetmouseactions
+msgid "Reset mouse actions"
+msgstr ""
+
 #: syndesignstringconstants.syndsseparator
 msgid "Separator"
 msgstr "Separador"
--- a/components/synedit/languages/syndesignstringconstants.pt_BR.po
+++ b/components/synedit/languages/syndesignstringconstants.pt_BR.po
@ -29,6 +29,10 @@ msgstr "Números de Linha"
 msgid "Line Overview"
 msgstr "Resumo Linha"

+#: syndesignstringconstants.syndsresetmouseactions
+msgid "Reset mouse actions"
+msgstr ""
+
 #: syndesignstringconstants.syndsseparator
 msgid "Separator"
 msgstr "Separador"
--- a/components/synedit/languages/syndesignstringconstants.ru.po
+++ b/components/synedit/languages/syndesignstringconstants.ru.po
@ -29,6 +29,10 @@ msgstr "Номера строк"
 msgid "Line Overview"
 msgstr "Граница строк"

+#: syndesignstringconstants.syndsresetmouseactions
+msgid "Reset mouse actions"
+msgstr ""
+
 #: syndesignstringconstants.syndsseparator
 msgid "Separator"
 msgstr "Линия отделения поля (лев)"
--- a/components/synedit/languages/syndesignstringconstants.uk.po
+++ b/components/synedit/languages/syndesignstringconstants.uk.po
@ -29,6 +29,10 @@ msgstr "Номери Рядків"
 msgid "Line Overview"
 msgstr "Огляд Ліній"

+#: syndesignstringconstants.syndsresetmouseactions
+msgid "Reset mouse actions"
+msgstr ""
+
 #: syndesignstringconstants.syndsseparator
 msgid "Separator"
 msgstr "Роздільник"
--- a/components/synedit/languages/syneditstrconst.ca.po
+++ b/components/synedit/languages/syneditstrconst.ca.po
@ -499,6 +499,14 @@ msgstr ""
 msgid "IDE Command"
 msgstr ""

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.cs.po
+++ b/components/synedit/languages/syneditstrconst.cs.po
@ -498,6 +498,14 @@ msgstr "Výběr"
 msgid "IDE Command"
 msgstr "Příkaz IDE"

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.de.po
+++ b/components/synedit/languages/syneditstrconst.de.po
@ -505,6 +505,14 @@ msgstr "Auswahl"
 msgid "IDE Command"
 msgstr "IDE-Kommando"

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.fi.po
+++ b/components/synedit/languages/syneditstrconst.fi.po
@ -492,6 +492,14 @@ msgstr ""
 msgid "IDE Command"
 msgstr ""

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr ""
--- a/components/synedit/languages/syneditstrconst.fr.po
+++ b/components/synedit/languages/syneditstrconst.fr.po
@ -494,6 +494,14 @@ msgstr ""
 msgid "IDE Command"
 msgstr ""

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.he.po
+++ b/components/synedit/languages/syneditstrconst.he.po
@ -497,6 +497,14 @@ msgstr "בחירה"
 msgid "IDE Command"
 msgstr "פקודת IDE"

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.id.po
+++ b/components/synedit/languages/syneditstrconst.id.po
@ -502,6 +502,14 @@ msgstr ""
 msgid "IDE Command"
 msgstr ""

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.it.po
+++ b/components/synedit/languages/syneditstrconst.it.po
@ -502,6 +502,14 @@ msgstr "Selezione"
 msgid "IDE Command"
 msgstr "Comando IDE"

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.lt.po
+++ b/components/synedit/languages/syneditstrconst.lt.po
@ -500,6 +500,14 @@ msgstr "Žymėjimas"
 msgid "IDE Command"
 msgstr "IKA komanda"

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.nl.po
+++ b/components/synedit/languages/syneditstrconst.nl.po
@ -499,6 +499,14 @@ msgstr ""
 msgid "IDE Command"
 msgstr ""

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.pl.po
+++ b/components/synedit/languages/syneditstrconst.pl.po
@ -503,6 +503,14 @@ msgstr "Zaznaczenie"
 msgid "IDE Command"
 msgstr "Polecenie IDE"

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.po
+++ b/components/synedit/languages/syneditstrconst.po
@ -489,6 +489,14 @@ msgstr ""
 msgid "IDE Command"
 msgstr ""

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr ""
--- a/components/synedit/languages/syneditstrconst.pt.po
+++ b/components/synedit/languages/syneditstrconst.pt.po
@ -497,6 +497,14 @@ msgstr "Seleção"
 msgid "IDE Command"
 msgstr "Comando IDE"

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.pt_BR.po
+++ b/components/synedit/languages/syneditstrconst.pt_BR.po
@ -497,6 +497,14 @@ msgstr "Seleção"
 msgid "IDE Command"
 msgstr "Comando IDE"

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.ru.po
+++ b/components/synedit/languages/syneditstrconst.ru.po
@ -498,6 +498,14 @@ msgstr "Выделение"
 msgid "IDE Command"
 msgstr "Команда IDE"

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.uk.po
+++ b/components/synedit/languages/syneditstrconst.uk.po
@ -497,6 +497,14 @@ msgstr "Вибір"
 msgid "IDE Command"
 msgstr "Команда IDE"

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"
--- a/components/synedit/languages/syneditstrconst.zh_CN.po
+++ b/components/synedit/languages/syneditstrconst.zh_CN.po
@ -502,6 +502,14 @@ msgstr ""
 msgid "IDE Command"
 msgstr ""

+#: syneditstrconst.syns_emcwheelscrolldown
+msgid "Wheel scroll down"
+msgstr ""
+
+#: syneditstrconst.syns_emcwheelscrollup
+msgid "Wheel scroll up"
+msgstr ""
+
 #: syneditstrconst.syns_exporterformathtml
 msgid "HTML"
 msgstr "HTML"