diff --git a/platform/indexing-impl/src/com/intellij/ide/highlighter/custom/CustomFileTypeLexer.java b/platform/indexing-impl/src/com/intellij/ide/highlighter/custom/CustomFileTypeLexer.java
index 5d1cb670d8ed..da784dfbad22 100644
--- a/platform/indexing-impl/src/com/intellij/ide/highlighter/custom/CustomFileTypeLexer.java
+++ b/platform/indexing-impl/src/com/intellij/ide/highlighter/custom/CustomFileTypeLexer.java
@@ -62,14 +62,14 @@ public final class CustomFileTypeLexer extends AbstractCustomLexer {
 
     ArrayList<TokenParser> tokenParsers = new ArrayList<TokenParser>();
     tokenParsers.add(new WhitespaceParser());
-    tokenParsers.add(quotedStringParser);
-    tokenParsers.add(quotedStringParser2);
     if (lineCommentParser != null) {
       tokenParsers.add(lineCommentParser);
     }
     if (multilineCommentParser != null) {
       tokenParsers.add(multilineCommentParser);
     }
+    tokenParsers.add(quotedStringParser);
+    tokenParsers.add(quotedStringParser2);
     tokenParsers.add(numberParser);
     tokenParsers.add(new PunctuationParser());
     if (hexNumberParser != null) {
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeLexerTest.groovy b/platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeLexerTest.groovy
index 5d1e7c9e1012..cc6a4a8b1767 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeLexerTest.groovy
+++ b/platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeLexerTest.groovy
@@ -15,12 +15,9 @@
  * limitations under the License.
  */
 package com.intellij.ide.highlighter.custom
-
 import com.intellij.lexer.Lexer
 import com.intellij.openapi.fileTypes.PlainTextSyntaxHighlighterFactory
 import com.intellij.openapi.util.text.StringUtil
-import com.intellij.openapi.vcs.impl.CancellableRunnable
-import com.intellij.psi.impl.DebugUtil
 import com.intellij.testFramework.LexerTestCase
 import com.intellij.testFramework.PlatformTestUtil
 import com.intellij.util.ThrowableRunnable
@@ -334,6 +331,16 @@ KEYWORD_2 ('foo{}')
 '''
   }
 
+  public void "test quote block comment"() {
+    SyntaxTable table = new SyntaxTable()
+    table.startComment = '"'
+    table.endComment = 'x'
+    doTest table, '"axa', '''\
+MULTI_LINE_COMMENT ('"ax')
+IDENTIFIER ('a')
+'''
+  }
+
   public void testPlainText() {
     doTest PlainTextSyntaxHighlighterFactory.createPlainTextLexer(), 'ab.@c  (<def>)', '''\
 CHARACTER ('ab.@c')