From 64e9d11e8fbb91bd1d633ca7a21a0af061bf3483 Mon Sep 17 00:00:00 2001 From: Maxim Kropotov Date: Tue, 8 Nov 2016 16:52:43 +0300 Subject: [PATCH] WEB-23181: don't run javaDoc comment logic inside ES6 generators --- .../editorActions/enter/EnterBetweenBracesHandler.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterBetweenBracesHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterBetweenBracesHandler.java index 70e3526de127..d5b002850086 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterBetweenBracesHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterBetweenBracesHandler.java @@ -25,10 +25,12 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; +import com.intellij.psi.PsiComment; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; +import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.NotNull; @@ -65,7 +67,7 @@ public class EnterBetweenBracesHandler extends EnterHandlerDelegateAdapter { CodeDocumentationUtil.tryParseCommentContext(file, text, caretOffset, start); // special case: enter inside "()" or "{}" - String indentInsideJavadoc = commentContext.docAsterisk + String indentInsideJavadoc = isInComment(caretOffset, file) && commentContext.docAsterisk ? CodeDocumentationUtil.getIndentInsideJavadoc(document, caretOffset) : null; @@ -86,6 +88,10 @@ public class EnterBetweenBracesHandler extends EnterHandlerDelegateAdapter { return indentInsideJavadoc == null ? Result.Continue : Result.DefaultForceIndent; } + private static boolean isInComment(int offset, PsiFile file) { + return PsiTreeUtil.getParentOfType(file.findElementAt(offset), PsiComment.class)!=null; + } + private static boolean isValidOffset(int offset, CharSequence text) { return offset >= 0 && offset < text.length(); }