Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dmitry Trofimov
2015-08-20 14:33:00 +02:00
@@ -15,7 +15,10 @@
*/
package com.intellij.psi.impl.source.codeStyle;
import com.intellij.formatting.*;
import com.intellij.formatting.CoreFormatterUtil;
import com.intellij.formatting.FormattingMode;
import com.intellij.formatting.FormattingModel;
import com.intellij.formatting.FormattingModelBuilder;
import com.intellij.injected.editor.DocumentWindow;
import com.intellij.lang.ASTNode;
import com.intellij.lang.LanguageFormatting;
@@ -127,7 +130,7 @@ abstract class CodeStyleManagerRunnable<T> {
protected abstract T doPerform(int offset, TextRange range);
private static boolean isInsidePlainComment(int offset, @Nullable PsiElement element) {
if (!(element instanceof PsiComment) || element instanceof PsiDocCommentBase || !element.getTextRange().contains(offset)) {
if (!(element instanceof PsiComment) || element instanceof PsiDocCommentBase || !element.getTextRange().contains(offset - 1)) {
return false;
}