界面库

语法高亮匹配问题修正

designer/tslvcldesigner.tsf

@@ -127,7 +127,16 @@ type TVclDesigner = class(tvcform)
             tcname := tc.name;
             tcclassname := tc.dclassname;
             if not(tcclassname and tcname and ifstring(tcname) and ifstring(tcclassname)) then raise "错误!";
-            r+= "object "+ tc.name +":"+tc.dclassname+"\r\n";
+            oorinh := (tc.isinherited)?"inherited ":"object ";
+            ihp := "";
+            if tc.isinherited then 
+            begin
+                if ifstring(tc.inheritedparent) then 
+                begin
+                    ihp := "("+tc.inheritedparent+")";
+                end
+            end 
+            r+= oorinh + tc.name +":"+tc.dclassname+ihp+"\r\n";
             itemnames[length(itemnames)] := array(tc.name,tc.dclassname);
             cr := tc.GetChangedPublish();
             for i,v in cr do 

designer/utslsynmemo.tsf

@@ -1249,11 +1249,11 @@ type ttfmhighlighter = class(tcustomsynhighlighter)
     begin
         inherited;
         ExecuteCommand("string",array(('"',"\\")));
-        ExecuteCommand("keywords",array("object","end"));
+        ExecuteCommand("keywords",array("object","end","inherited"));
         ExecuteCommand("rowannotes",array());
         ExecuteCommand("blockannotes",array());
         ExecuteCommand("syms",array("{","}","[","]","<",">",":",",","="));
-        ExecuteCommand("pairs",array(("{","}"),("[","]"),("<",">"),("object","end")));
+        ExecuteCommand("pairs",array(("{","}"),("[","]"),("<",">"),("object","end"),("inherited","end")));
     end 
 
 end 

designer/utslvcldcomponents.tsf

@@ -34,6 +34,8 @@ type TDComponent = class()
         end         
     end 
     private 
+    fisiherted;
+    finheritedparent;
     static fdcomponentobjects;
     protected
     fiscontainerdcmp;
@@ -634,6 +636,9 @@ format("
             hs := "\r\n\tfunction "+n+"("+ps+");"+vt+"\r\n\tbegin\r\n"+b+"\r\n\tend\r\n";
         return hs;
     end 
+    published
+    property isinherited read fisiherted write fisiherted;//为继承做准备
+    property inheritedparent read finheritedparent write finheritedparent;
 end  
 type TDRootComponent = class(TDComponent)
     {**