From 59077ba01624719d344aeac466466286028d5b6f Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Thu, 31 Jan 2008 13:53:10 +0000
Subject: [PATCH] codetools: fixed code completion for semicolons after procs 
 bugs #10741

git-svn-id: trunk@13937 -
---
 components/codetools/codecompletiontool.pas | 13 +++++++++++--
 components/codetools/pascalreadertool.pas   | 14 +++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/components/codetools/codecompletiontool.pas b/components/codetools/codecompletiontool.pas
index 0d97c157eb..36aeb43e10 100644
--- a/components/codetools/codecompletiontool.pas
+++ b/components/codetools/codecompletiontool.pas
@@ -4955,9 +4955,18 @@ begin
       ProcCode:=ExtractProcHead(ANode,[phpWithStart,
                   phpWithoutClassKeyword,
                   phpWithVarModifiers,phpWithParameterNames,phpWithResultType,
-                  phpWithCallingSpecs,phpDoNotAddSemicolon]);
+                  phpWithProcModifiers,phpDoNotAddSemicolon]);
       if ProcCode[length(ProcCode)]<>';' then begin
-        // add missing semicolon
+        // add missing semicolon at end of procedure head
+        UndoReadNextAtom;
+        if not ASourceChangeCache.Replace(gtNone,gtNone,
+          CurPos.EndPos,CurPos.EndPos,';') then
+            RaiseException('InsertMissingClassSemicolons: unable to insert semicolon');
+      end;
+      MoveCursorToFirstProcSpecifier(ANode);
+      if (CurPos.Flag<>cafSemicolon) and (CurPos.EndPos<ANode.FirstChild.EndPos)
+      then begin
+        // add missing semicolon in front of proc modifiers
         UndoReadNextAtom;
         if not ASourceChangeCache.Replace(gtNone,gtNone,
           CurPos.EndPos,CurPos.EndPos,';') then
diff --git a/components/codetools/pascalreadertool.pas b/components/codetools/pascalreadertool.pas
index 567966c8b2..360be7ab3f 100644
--- a/components/codetools/pascalreadertool.pas
+++ b/components/codetools/pascalreadertool.pas
@@ -423,6 +423,11 @@ begin
     ExtractNextAtom(phpWithResultType in Attr,Attr);
     if not AtomIsIdentifier(false) then exit;
     ExtractNextAtom(phpWithResultType in Attr,Attr);
+    if CurPos.Flag=cafPoint then begin
+      ExtractNextAtom(phpWithResultType in Attr,Attr);
+      if not AtomIsIdentifier(false) then exit;
+      ExtractNextAtom(phpWithResultType in Attr,Attr);
+    end;
     ExtractProcHeadPos:=phepResultType;
   end;
   // read 'of object'
@@ -676,7 +681,14 @@ begin
   if (CurPos.Flag=cafColon) then begin
     // read function result type
     ReadNextAtom;
-    ReadNextAtom;
+    if AtomIsIdentifier(false) then begin
+      ReadNextAtom;
+      if CurPos.Flag=cafPoint then begin
+        ReadNextAtom;
+        if AtomIsIdentifier(false) then
+          ReadNextAtom;
+      end;
+    end;
   end;
   // CurPos now stands on the first proc specifier or on a semicolon
 end;