CE-117 include

Author: nofateg

gen/oap/application/plugin/gen/OapTypes.java

@@ -99,7 +99,7 @@ WHITE_SPACE=[ \t\x0B\f\r]+
 COMMENT=("//"|"#")[^\n]*
 STRING=\"(\\\"|[^\"])*\"
 UNQUOTED_STRING=([:jletterdigit:]|[-/\.]) ([:jletterdigit:]|[-/\. ])*
-CLASS_NAME=([:jletter:] [:jletterdigit:]*)("." [:jletter:] [:jletterdigit:]*)+
+CLASS_NAME=([:jletter:] [:jletterdigit:]*)("." [:jletter:] [:jletterdigit:]*)*
 FIELD_NAME=[:jletter:] [:jletterdigit:]+
 KEY_NAME=[:jletter:] ([:jletterdigit:]|[-/])*
 
@@ -141,7 +141,7 @@ KEY_NAME=[:jletter:] ([:jletterdigit:]|[-/])*
   {BOOL}               { return OAP_BOOL; }
   "("                  { return OAP_LEFTPAREN; }
   ")"                  { return OAP_RIGHTPAREN; }
-  {STRING}             { return OAP_INCLUDE_RESOURCE_NAME; }
+  {STRING}             { return OAP_STRING; }
 
   {WHITE_SPACE}        { return WHITE_SPACE; }
   {NEXTLINE}           { yypopState(); return WHITE_SPACE; }

gen/oap/application/plugin/gen/parser/OapParser.java

@@ -91,7 +91,7 @@
 
 module ::=
         []
-        module_name_pair
+        ( &'name' module_name_pair )?
         ( &'enabled' module_enabled )?
         ( &'dependsOn' module_depends_on )?
         ( &'include' module_include )*
@@ -484,7 +484,7 @@ configuration_key_value_pair ::=
 // ] // configurations
 
 // include required("resource")
-module_include ::= 'include' 'required' '(' include_resource_name ')' {
+module_include ::= 'include' 'required' '(' string ')' {
     pin=1
 }
 // include required("resource")

gen/oap/application/plugin/gen/parser/_OapLexer.java

@@ -30,6 +30,8 @@ class OapColorSettingsPage : ColorSettingsPage {
             |  <module_dependson_module_name>b</module_dependson_module_name>
             |]
             |
+            |<include>include</include> <required>required</required>("resource")
+            |
             |<moduleservices>services</moduleservices> <brackets>{</brackets>
             |  <moduleservice>service-name</moduleservice> <brackets>{</brackets>
             |    <service_enabled>enabled</service_enabled> <eq>=</eq> <Boolean>false</Boolean>
@@ -85,6 +87,9 @@ class OapColorSettingsPage : ColorSettingsPage {
             "moduledependson" to OapHighlighterColors.ModuleDependsOn,
             "module_dependson_module_name" to OapHighlighterColors.ModuleDependsOnModuleName,
 
+            "include" to OapHighlighterColors.Include,
+            "required" to OapHighlighterColors.Required,
+
             "moduleservices" to OapHighlighterColors.ModuleServices,
             "moduleservice" to OapHighlighterColors.ModuleService,
             "service_enabled" to OapHighlighterColors.ModuleServiceEnabled,
@@ -138,6 +143,10 @@ class OapColorSettingsPage : ColorSettingsPage {
             "Module name" to OapHighlighterColors.ModuleName,
             "Module dependsOn" to OapHighlighterColors.ModuleDependsOn,
             "Module dependsOn [module name]" to OapHighlighterColors.ModuleDependsOnModuleName,
+
+            "Module include" to OapHighlighterColors.Include,
+            "Module include required" to OapHighlighterColors.Required,
+
             "Services" to OapHighlighterColors.ModuleServices,
             "Service Name" to OapHighlighterColors.ModuleService,
             "Service enabled/disabled" to OapHighlighterColors.ModuleServiceEnabled,

gen/oap/application/plugin/gen/psi/OapModuleInclude.java

@@ -20,6 +20,9 @@ object OapHighlighterColors {
     val ModuleDependsOn = key("OAP_MODULE_DEPENDS_ON", DefaultLanguageHighlighterColors.KEYWORD)
     val ModuleDependsOnModuleName = key("OAP_MODULE_DEPENDS_ON_MODULE_NAME", DefaultLanguageHighlighterColors.LABEL)
 
+    val Include = key("OAP_INCLUDE", DefaultLanguageHighlighterColors.KEYWORD)
+    val Required = key("OAP_REQUIRED", DefaultLanguageHighlighterColors.KEYWORD)
+
     val ModuleServices = key("OAP_MODULE_SERVICES", DefaultLanguageHighlighterColors.KEYWORD)
     val ModuleService = key("OAP_MODULE_SERVICE", DefaultLanguageHighlighterColors.INSTANCE_FIELD)
     val ModuleServiceEnabled = key("OAP_MODULE_SERVICE_ENABLED", DefaultLanguageHighlighterColors.KEYWORD)

gen/oap/application/plugin/gen/psi/impl/OapModuleIncludeImpl.java

@@ -25,6 +25,9 @@ class OapSyntaxHighlightingAnnotator : Annotator {
             OapTypes.OAP_ID_DEPENDS_ON -> annot(OapHighlighterColors.ModuleDependsOn)
             OapTypes.OAP_MODULE_DEPENDS_ON_NAME -> annot(OapHighlighterColors.ModuleDependsOnModuleName)
 
+            OapTypes.OAP_ID_INCLUDE -> annot(OapHighlighterColors.Include)
+            OapTypes.OAP_ID_REQUIRED -> annot(OapHighlighterColors.Required)
+
             OapTypes.OAP_ID_SERVICES -> annot(OapHighlighterColors.ModuleServices)
             OapTypes.OAP_SERVICE_NAME -> annot(OapHighlighterColors.ModuleService)
             OapTypes.OAP_ID_ENABLED -> annot(OapHighlighterColors.ModuleServiceEnabled)