Merge pull request #12 from goaop/feature/match-inherited-pointcut

Added support for matchInherited() pointcut

Author: lisachenko

src/com/aopphp/go/PointcutQuerySyntaxHighlighter.java

@@ -63,7 +63,8 @@ public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
             || tokenType.equals(PointcutTypes.INITIALIZATION)
             || tokenType.equals(PointcutTypes.STATICINITIALIZATION)
             || tokenType.equals(PointcutTypes.CFLOWBELOW)
-            || tokenType.equals(PointcutTypes.DYNAMIC)) {
+            || tokenType.equals(PointcutTypes.DYNAMIC)
+            || tokenType.equals(PointcutTypes.MATCHINHERITED)) {
             return KEY_KEYS;
         } else if (tokenType.equals(PointcutTypes.T_LEFT_PAREN)
             || tokenType.equals(PointcutTypes.T_RIGHT_PAREN)) {

src/com/aopphp/go/completion/PointcutKeywordCompletionProvider.java

@@ -17,6 +17,7 @@ public class PointcutKeywordCompletionProvider extends CompletionProvider<Comple
         "within",
         "initialization",
         "staticinitialization",
+        "matchInherited",
     };
 
     private static final PointcutKeywordInsertHandler keywordInsertionHandler = PointcutKeywordInsertHandler.getInstance();

src/com/aopphp/go/parser/PointcutLexer.flex

@@ -50,6 +50,7 @@ WHITE_SPACE=({T_LINE_WS}|{EOL})+
   "staticinitialization"    { return com.aopphp.go.psi.PointcutTypes.STATICINITIALIZATION; }
   "cflowbelow"              { return com.aopphp.go.psi.PointcutTypes.CFLOWBELOW; }
   "dynamic"                 { return com.aopphp.go.psi.PointcutTypes.DYNAMIC; }
+  "matchInherited"          { return com.aopphp.go.psi.PointcutTypes.MATCHINHERITED; }
   "private"                 { return com.aopphp.go.psi.PointcutTypes.PRIVATE; }
   "protected"               { return com.aopphp.go.psi.PointcutTypes.PROTECTED; }
   "public"                  { return com.aopphp.go.psi.PointcutTypes.PUBLIC; }