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

IDEA-109245 "Evaluate expression" should not wrap text automatically

Browse Source
This commit is contained in:
Denis.Zhdanov
2013-06-20 18:42:34 +04:00
parent 0840f9c268
commit 8525992afb
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java
+8 -2
View File
@@ -93,8 +93,10 @@ public class AutoHardWrapHandler {
change.charTyped(editor, modificationStampBeforeTyping);
}
// Return eagerly if we don't need to auto-wrap line on right margin exceeding.
if (project == null || !editor.getSettings().isWrapWhenTypingReachesRightMargin(project)
// Return eagerly if we don't need to auto-wrap line, e.g. because of right margin exceeding.
if (/*editor.isOneLineMode()
|| */project == null
|| !editor.getSettings().isWrapWhenTypingReachesRightMargin(project)
|| (TemplateManager.getInstance(project) != null && TemplateManager.getInstance(project).getActiveTemplate(editor) != null))
{
return;
@@ -108,6 +110,10 @@ public class AutoHardWrapHandler {
// Check if right margin is exceeded.
int margin = editor.getSettings().getRightMargin(project);
if (margin <= 0) {
return;
}
VisualPosition visEndLinePosition = editor.offsetToVisualPosition(endOffset);
if (margin > visEndLinePosition.column) {
if (change != null) {