diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
index 9ce077890516..02e548c8e903 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
@@ -143,17 +143,7 @@ public class IdentifierHighlighterPass extends TextEditorHighlightingPass {
   private void collectCodeBlockMarkerRanges() {
     PsiElement contextElement = myFile.findElementAt(
       TargetElementUtil.adjustOffset(myFile, myEditor.getDocument(), myEditor.getCaretModel().getOffset()));
-    if (contextElement == null) {
-      return;
-    }
-
-    for (CodeBlockSupportHandler handler : CodeBlockSupportHandler.EP.allForLanguage(contextElement.getLanguage())) {
-      List<TextRange> rangesToHighlight = handler.getCodeBlockMarkerRanges(contextElement);
-      if (!rangesToHighlight.isEmpty()) {
-        myCodeBlockMarkerRanges.addAll(rangesToHighlight);
-        return;
-      }
-    }
+    myCodeBlockMarkerRanges.addAll(CodeBlockSupportHandler.findMarkersRanges(contextElement));
   }
 
   /**