2 files changed, 5 insertions, 6 deletions
diff --git a/python/rest/src/com/jetbrains/rest/lexer/rest.flex b/python/rest/src/com/jetbrains/rest/lexer/rest.flex
index ee0b33108d4e..354779fcc48a 100644
--- a/python/rest/src/com/jetbrains/rest/lexer/rest.flex
+++ b/python/rest/src/com/jetbrains/rest/lexer/rest.flex
@@ -170,7 +170,7 @@ ANY= .|\n
 {USUAL_TYPES}"::"                                   { yybegin(IN_VALUE); return DIRECTIVE;}
 {HIGHLIGHT_TYPES}"::"                               { yybegin(IN_HIGHLIGHT); return CUSTOM_DIRECTIVE;}
 [0-9A-Za-z\-:]*"::"                                 { yybegin(IN_VALUE); return CUSTOM_DIRECTIVE;}
-"|"[0-9A-Za-z]*"|"                                  { return SUBSTITUTION;}
+"|"[0-9A-Za-z_]*"|"                                 { return SUBSTITUTION;}
 [0-9A-Za-z_\[|.]*                                   { yybegin(IN_COMMENT); return COMMENT;}
 {CRLF}{2}                                           { yybegin(INIT); return COMMENT;}
 {SPACE}*{CRLF}+                                     { return WHITESPACE; }
diff --git a/python/rest/src/com/jetbrains/rest/parsing/RestParser.java b/python/rest/src/com/jetbrains/rest/parsing/RestParser.java
index 791d94d02a75..1df9fc1eca0d 100644
--- a/python/rest/src/com/jetbrains/rest/parsing/RestParser.java
+++ b/python/rest/src/com/jetbrains/rest/parsing/RestParser.java
@@ -95,7 +95,7 @@ public class RestParser implements PsiParser {
       listMarker.drop();
   }
 
-  private void parseMarkup(PsiBuilder builder) {
+  private static void parseMarkup(PsiBuilder builder) {
     PsiBuilder.Marker marker = builder.mark();
     IElementType type = builder.getTokenType();
     if (type == RestTokenTypes.SUBSTITUTION) {
@@ -131,19 +131,19 @@ public class RestParser implements PsiParser {
     }
   }
 
-  private void gotoNextWhiteSpaces(PsiBuilder builder) {
+  private static void gotoNextWhiteSpaces(PsiBuilder builder) {
      while(!"\n".equals(builder.getTokenText()) && !(builder.getTokenType() == RestTokenTypes.TITLE) && !builder.eof() && (builder.getTokenType() != null)) {
        builder.advanceLexer();
     }
   }
 
-  private void skipBlankLines(PsiBuilder builder) {
+  private static void skipBlankLines(PsiBuilder builder) {
      while("\n".equals(builder.getTokenText()) && !builder.eof() && (builder.getTokenType() != null)) {
        builder.advanceLexer();
     }
   }
 
-  private void parseDirective(PsiBuilder builder, String white, PsiBuilder.Marker marker) {
+  private static void parseDirective(PsiBuilder builder, String white, PsiBuilder.Marker marker) {
     gotoNextWhiteSpaces(builder);
     if (builder.getTokenType() != RestTokenTypes.WHITESPACE) {
       builder.advanceLexer();
@@ -157,7 +157,6 @@ public class RestParser implements PsiParser {
     }
     else {
       marker.done(RestElementTypes.DIRECTIVE_BLOCK);
-      return;
     }
   }
 }