From 2b1408184ec71ec93f3af3949c9d9764141fc93f Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sun, 22 Nov 2009 19:18:19 +0000
Subject: [PATCH] codetools: parsing objcprotocol

git-svn-id: trunk@22707 -
---
 components/codetools/pascalparsertool.pas |   5 +-
 examples/pen_brush/project1.lpi           | 141 ++++++++++++++++++++--
 examples/pen_brush/unit1.pas              |   2 +-
 ideintf/propedits.pp                      |   3 +-
 4 files changed, 138 insertions(+), 13 deletions(-)

diff --git a/components/codetools/pascalparsertool.pas b/components/codetools/pascalparsertool.pas
index c3acf3c6aa..18fdabc1b7 100644
--- a/components/codetools/pascalparsertool.pas
+++ b/components/codetools/pascalparsertool.pas
@@ -391,7 +391,10 @@ begin
   'O':
     if CompareSrcIdentifiers('OBJECT',p)
     or CompareSrcIdentifiers('OBJCCLASS',p)
-    or CompareSrcIdentifiers('OBJCCATEGORY',p) then exit(KeyWordFuncClass);
+    or CompareSrcIdentifiers('OBJCCATEGORY',p) then
+      exit(KeyWordFuncClass)
+    else if CompareSrcIdentifiers('OBJCPROTOCOL',p) then
+      exit(KeyWordFuncClassInterface);
   'P':
     case UpChars[p[1]] of
     'A': if CompareSrcIdentifiers('PACKED',p) then exit(KeyWordFuncTypePacked);
diff --git a/examples/pen_brush/project1.lpi b/examples/pen_brush/project1.lpi
index 6cec71a574..8b9322eab5 100644
--- a/examples/pen_brush/project1.lpi
+++ b/examples/pen_brush/project1.lpi
@@ -9,7 +9,7 @@
       </Flags>
       <MainUnit Value="0"/>
       <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="0"/>
+      <ActiveEditorIndexAtStart Value="1"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
@@ -33,12 +33,12 @@
         <PackageName Value="LCL"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="2">
+    <Units Count="3">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="project1"/>
-        <UsageCount Value="23"/>
+        <UsageCount Value="26"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
@@ -46,22 +46,143 @@
         <ComponentName Value="Form1"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <CursorPos X="43" Y="79"/>
+        <CursorPos X="9" Y="66"/>
         <TopLine Value="49"/>
         <EditorIndex Value="0"/>
-        <UsageCount Value="23"/>
+        <UsageCount Value="26"/>
         <Loaded Value="True"/>
       </Unit1>
+      <Unit2>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <UnitName Value="Forms"/>
+        <CursorPos X="24" Y="980"/>
+        <TopLine Value="968"/>
+        <EditorIndex Value="1"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
+      </Unit2>
     </Units>
-    <JumpHistory Count="2" HistoryIndex="1">
+    <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="23" Column="43" TopLine="21"/>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="824" Column="13" TopLine="795"/>
       </Position1>
       <Position2>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="24" Column="44" TopLine="22"/>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="849" Column="11" TopLine="829"/>
       </Position2>
+      <Position3>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="926" Column="15" TopLine="907"/>
+      </Position3>
+      <Position4>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="66" Column="9" TopLine="49"/>
+      </Position4>
+      <Position5>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="592" Column="28" TopLine="584"/>
+      </Position5>
+      <Position6>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
+      </Position6>
+      <Position7>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="51" Column="11" TopLine="31"/>
+      </Position7>
+      <Position8>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="63" Column="75" TopLine="31"/>
+      </Position8>
+      <Position9>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="68" Column="23" TopLine="31"/>
+      </Position9>
+      <Position10>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="357" Column="18" TopLine="331"/>
+      </Position10>
+      <Position11>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="396" Column="37" TopLine="377"/>
+      </Position11>
+      <Position12>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="430" Column="34" TopLine="411"/>
+      </Position12>
+      <Position13>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="553" Column="31" TopLine="533"/>
+      </Position13>
+      <Position14>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="593" Column="28" TopLine="573"/>
+      </Position14>
+      <Position15>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="603" Column="31" TopLine="573"/>
+      </Position15>
+      <Position16>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="604" Column="47" TopLine="573"/>
+      </Position16>
+      <Position17>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="668" Column="28" TopLine="648"/>
+      </Position17>
+      <Position18>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="812" Column="13" TopLine="783"/>
+      </Position18>
+      <Position19>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="814" Column="13" TopLine="783"/>
+      </Position19>
+      <Position20>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="816" Column="11" TopLine="783"/>
+      </Position20>
+      <Position21>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="818" Column="48" TopLine="783"/>
+      </Position21>
+      <Position22>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="819" Column="62" TopLine="783"/>
+      </Position22>
+      <Position23>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="824" Column="46" TopLine="804"/>
+      </Position23>
+      <Position24>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="848" Column="11" TopLine="829"/>
+      </Position24>
+      <Position25>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="872" Column="24" TopLine="853"/>
+      </Position25>
+      <Position26>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="881" Column="29" TopLine="853"/>
+      </Position26>
+      <Position27>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="895" Column="24" TopLine="875"/>
+      </Position27>
+      <Position28>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="897" Column="31" TopLine="875"/>
+      </Position28>
+      <Position29>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="908" Column="28" TopLine="875"/>
+      </Position29>
+      <Position30>
+        <Filename Value="..\..\lcl\forms.pp"/>
+        <Caret Line="963" Column="30" TopLine="936"/>
+      </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/examples/pen_brush/unit1.pas b/examples/pen_brush/unit1.pas
index 2f99a241dd..267c48c04f 100644
--- a/examples/pen_brush/unit1.pas
+++ b/examples/pen_brush/unit1.pas
@@ -63,7 +63,7 @@ uses
 
 procedure TForm1.Button1Click(Sender: TObject);
 begin
-  Close;
+  Monitor;
 end;
 
 procedure TForm1.cbAntialiasingChange(Sender: TObject);
diff --git a/ideintf/propedits.pp b/ideintf/propedits.pp
index 1282ff95d2..fd542287fe 100644
--- a/ideintf/propedits.pp
+++ b/ideintf/propedits.pp
@@ -1345,11 +1345,11 @@ type
                            const OnGetRootClassName: TPropHookGetRootClassName);
     procedure RemoveHandlerGetRootClassName(
                            const OnGetRootClassName: TPropHookGetRootClassName);
+    // component create, delete, rename
     procedure AddHandlerComponentRenamed(
                            const OnComponentRenamed: TPropHookComponentRenamed);
     procedure RemoveHandlerComponentRenamed(
                            const OnComponentRenamed: TPropHookComponentRenamed);
-    // persistent selection
     procedure AddHandlerBeforeAddPersistent(
                      const OnBeforeAddPersistent: TPropHookBeforeAddPersistent);
     procedure RemoveHandlerBeforeAddPersistent(
@@ -1366,6 +1366,7 @@ type
                            const OnDeletePersistent: TPropHookDeletePersistent);
     procedure RemoveHandlerDeletePersistent(
                            const OnDeletePersistent: TPropHookDeletePersistent);
+    // persistent selection
     procedure AddHandlerGetSelection(
                                    const OnGetSelection: TPropHookGetSelection);
     procedure RemoveHandlerGetSelection(