From 8525992afb89820bd80e6457f2f422d592d9116a Mon Sep 17 00:00:00 2001
From: "Denis.Zhdanov" <Denis.Zhdanov@jetbrains.com>
Date: Thu, 20 Jun 2013 18:42:10 +0400
Subject: [PATCH] IDEA-109245 "Evaluate expression" should not wrap text
 automatically

---
 .../codeInsight/editorActions/AutoHardWrapHandler.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java
index 57b4ac453581..d09e0bcf95ed 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java
@@ -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) {