From e63d3a59d25954841fa06b4cee0a87f3f4ea8b57 Mon Sep 17 00:00:00 2001
From: Maxim Kropotov <maxim.kropotov@jetbrains.com>
Date: Wed, 21 Jun 2017 20:17:33 +0300
Subject: [PATCH] WEB-27387: skip line comment offset when calculating indent
 in 'case'

---
 .../codeStyle/lineIndent/JavaLikeLangLineIndentProvider.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/JavaLikeLangLineIndentProvider.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/JavaLikeLangLineIndentProvider.java
index f3dfc8767b7f..676ade4cb5c1 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/JavaLikeLangLineIndentProvider.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/JavaLikeLangLineIndentProvider.java
@@ -204,7 +204,8 @@ public abstract class JavaLikeLangLineIndentProvider implements LineIndentProvid
     while (!position.isAtEnd()) {
       if (currLanguage == Language.ANY || currLanguage == null) currLanguage = position.getLanguage();
       if (position.isAt(Colon)) {
-        SemanticEditorPosition afterColon = getPosition(position.getEditor(), position.getStartOffset()).after().afterOptional(Whitespace);
+        SemanticEditorPosition afterColon = getPosition(position.getEditor(), position.getStartOffset())
+          .after().afterOptionalMix(Whitespace, LineComment);
         if (getPosition(position.getEditor(), position.getStartOffset()).isAfterOnSameLine(SwitchCase, SwitchDefault)) {
           return afterColon.getStartOffset();
         }