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

fixed PY-10995 properly, fixed broken test

Browse Source 
we can skip formatting events in case of current string ends with spaces
This commit is contained in:
Ekaterina Tuzova
2013-10-04 15:26:43 +04:00
parent cf608f8242
commit 4b3647cd20
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java
+8 -1
View File
@@ -17,6 +17,7 @@ package com.intellij.codeInsight.editorActions;
import com.intellij.codeInsight.template.TemplateManager;
import com.intellij.formatting.FormatConstants;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.formatter.WhiteSpaceFormattingStrategy;
import com.intellij.ide.DataManager;
import com.intellij.openapi.actionSystem.DataContext;
@@ -107,7 +108,8 @@ public class AutoHardWrapHandler {
int line = document.getLineNumber(caretOffset);
int startOffset = document.getLineStartOffset(line);
int endOffset = document.getLineEndOffset(line);
final String endOfString = document.getText().substring(caretOffset, endOffset);
final boolean endsWithSpaces = StringUtil.isEmptyOrSpaces(endOfString);
// Check if right margin is exceeded.
int margin = editor.getSettings().getRightMargin(project);
if (margin <= 0) {
@@ -183,6 +185,11 @@ public class AutoHardWrapHandler {
caretOffsetDiff[0] += event.getNewLength() - event.getOldLength();
}
if (event.getNewLength() <= event.getOldLength() && endsWithSpaces) {
// There is a possible case that document fragment is removed because of auto-formatting.
// We don't want to process such events in case of current string ends with spaces.
return;
}
wrapIntroducedSymbolsNumber[0] += event.getNewLength() - event.getOldLength();
}