MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mskr/webstorm-js-bugs'

Browse Source
This commit is contained in:
Maxim Kropotov
2016-11-10 16:48:16 +03:00
parent 18717abde7 64e9d11e8f
commit 91329eb42b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterBetweenBracesHandler.java
+7 -1
View File
@@ -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();
}