ACTIVE PROPERTY support

Author: ichavchavadze

META-INF/plugin.xml

@@ -8,13 +8,9 @@
     <description>Plugin provides lsFusion language support.</description>
 
     <change-notes><![CDATA[
-        <b>Version 1.0.300</b><br>
+        <b>Version 1.0.301</b><br>
         <ul>
-            <li>UML Diagram improvements</li>
-            <li>NEWTHREAD: implement notify action</li>
-            <li>NAVIGATOR SCHEDULE support</li>
-            <li>FindImplementations optimisation</li>
-            <li>TREE hierarchicalCaption support</li>
+            <li>ACTIVE PROPERTY support</li>
         </ul>
     ]]>
     </change-notes>

src/com/lsfusion/lang/LSF.bnf

@@ -365,7 +365,7 @@ expressionFriendlyPD ::= joinPropertyDefinition
 	    |	castPropertyDefinition
 	    |	sessionPropertyDefinition
 	    |	signaturePropertyDefinition
-	    |   activeTabPropertyDefinition
+	    |   activePropertyDefinition
 	    |   roundPropertyDefinition
 	    |	expressionLiteral
 	    |	objectPropertyDefinition
@@ -519,7 +519,7 @@ sessionPropertyDefinition ::= sessionPropertyType LBRAC propertyExpression RBRAC
 signaturePropertyDefinition ::= ISCLASS LBRAC propertyExpression RBRAC
 {pin = 2 implements = "com.lsfusion.lang.psi.context.LSFExpression" methods = [ resolveInferredValueClass inferParamClasses getValueClassNames getValuePropertyNames ]}
 
-activeTabPropertyDefinition ::= ACTIVE TAB componentID
+activePropertyDefinition ::= ACTIVE (TAB componentID | PROPERTY formPropertyDrawID)
 {
     pin = 1
     implements = "com.lsfusion.lang.psi.context.LSFExpression"

src/com/lsfusion/lang/psi/LSFPsiImplUtil.java

@@ -1437,7 +1437,7 @@ public static LSFExClassSet resolveInferredValueClass(@NotNull LSFSignaturePrope
     }
 
     @Nullable
-    public static LSFExClassSet resolveInferredValueClass(@NotNull LSFActiveTabPropertyDefinition sourceStatement, @Nullable InferExResult inferred) {
+    public static LSFExClassSet resolveInferredValueClass(@NotNull LSFActivePropertyDefinition sourceStatement, @Nullable InferExResult inferred) {
         return LSFExClassSet.logical;
     }
 
@@ -2000,7 +2000,7 @@ public static List<String> getValueClassNames(@NotNull LSFSignaturePropertyDefin
         return singletonList(LogicalClass.instance.getName());
     }
 
-    public static List<String> getValueClassNames(@NotNull LSFActiveTabPropertyDefinition sourceStatement) {
+    public static List<String> getValueClassNames(@NotNull LSFActivePropertyDefinition sourceStatement) {
         return singletonList(LogicalClass.instance.getName());
     }
 
@@ -2367,7 +2367,7 @@ public static List<String> getValuePropertyNames(@NotNull LSFSignaturePropertyDe
         return Collections.EMPTY_LIST;
     }
 
-    public static List<String> getValuePropertyNames(@NotNull LSFActiveTabPropertyDefinition sourceStatement) {
+    public static List<String> getValuePropertyNames(@NotNull LSFActivePropertyDefinition sourceStatement) {
         return Collections.EMPTY_LIST;
     }
 
@@ -3789,8 +3789,8 @@ public static Inferred inferParamClasses(@NotNull LSFSignaturePropertyDefinition
         return inferParamClasses(sourceStatement.getPropertyExpression(), null);
     }
 
-    public
-    @NotNull static Inferred inferParamClasses(@NotNull LSFActiveTabPropertyDefinition sourceStatement, @Nullable LSFExClassSet valueClass) {
+    @NotNull
+    public static Inferred inferParamClasses(@NotNull LSFActivePropertyDefinition sourceStatement, @Nullable LSFExClassSet valueClass) {
         return Inferred.EMPTY;
     }
 
@@ -4834,8 +4834,8 @@ public static String getDocumentation(LSFSessionPropertyDefinition lsfSessionPro
         return "Change_operators_SET_CHANGED_etc";
     }
 
-    public static String getDocumentation(LSFActiveTabPropertyDefinition lsfActiveTabPropertyDefinition, PsiElement child) {
-        return "ACTIVE_TAB_operator";
+    public static String getDocumentation(LSFActivePropertyDefinition lsfActivePropertyDefinition, PsiElement child) {
+        return lsfActivePropertyDefinition.getComponentID() != null ? "ACTIVE_TAB_operator" : "ACTIVE_PROPERTY_operator";
     }
 
     public static String getDocumentation(LSFDataPropertyDefinition lsfDataPropertyDefinition, PsiElement child) {