From fc68c6914f9c61ff54faf94430f947f52aaa3950 Mon Sep 17 00:00:00 2001
From: Rustam Vishnyakov <rustam.vishnyakov@jetbrains.com>
Date: Tue, 25 Oct 2016 14:59:47 +0300
Subject: [PATCH] Another fix for indent after semicolon for var statement with
 line comments

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

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 3ac8d565bda4..40b8b2adcc73 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
@@ -202,12 +202,12 @@ public abstract class JavaLikeLangLineIndentProvider implements LineIndentProvid
                                   BlockOpeningBrace, 
                                   BlockComment, 
                                   DocBlockEnd, 
-                                  LineComment, 
                                   LeftParenthesis,
                                   LanguageStartDelimiter) ||
                (position.getLanguage() != Language.ANY) && !position.isAtLanguage(currLanguage)) {
         SemanticEditorPosition statementStart = getPosition(position.getEditor(), position.getStartOffset());
-        if (!statementStart.after().afterOptional(Whitespace).isAtEnd()) {
+        statementStart.after().afterOptional(Whitespace).afterOptional(LineComment).afterOptional(Whitespace);
+        if (!statementStart.isAtEnd()) {
           return statementStart.getStartOffset();
         }
       }