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 'master' of git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Evgeny Pasynkov
2013-02-26 15:59:31 +01:00
parent 4eaa2c764a 6b3c99293e
commit 353f3fb755
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/BaseIndentEnterHandler.java
+3 -3
View File
@@ -109,7 +109,7 @@ public class BaseIndentEnterHandler extends EnterHandlerDelegateAdapter {
final int previousLineStartOffset = lineNumber > 0 ? document.getLineStartOffset(lineNumber - 1) : lineStartOffset;
final EditorHighlighter highlighter = ((EditorEx)editor).getHighlighter();
final HighlighterIterator iterator = highlighter.createIterator(caret - 1);
final IElementType type = getNonWhitespaceElementType(iterator, previousLineStartOffset);
final IElementType type = getNonWhitespaceElementType(iterator, lineStartOffset, previousLineStartOffset);
final CharSequence editorCharSequence = document.getCharsSequence();
final CharSequence lineIndent =
@@ -190,8 +190,8 @@ public class BaseIndentEnterHandler extends EnterHandlerDelegateAdapter {
}
@Nullable
private IElementType getNonWhitespaceElementType(final HighlighterIterator iterator, final int lineStartOffset) {
while (!iterator.atEnd() && iterator.getStart() >= lineStartOffset) {
private IElementType getNonWhitespaceElementType(final HighlighterIterator iterator, int currentLineStartOffset, final int prevLineStartOffset) {
while (!iterator.atEnd() && iterator.getEnd() >= currentLineStartOffset && iterator.getStart() >= prevLineStartOffset) {
final IElementType tokenType = iterator.getTokenType();
if (!myWhitespaceTokens.contains(tokenType)) {
return tokenType;