Better indentation after first line of string continuation.

IDLEfork Patch 681992, Noam Raphael

diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 3c4585bcf88fb57a86b7ed24fd8a18f03d99f326..cc38122c51ac2f967295422e2d33dff353524428 100644 (file)
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -1078,8 +1078,12 @@ class EditorWindow(object):
             c = y.get_continuation_type()
             if c != PyParse.C_NONE:
                 # The current stmt hasn't ended yet.
-                if c == PyParse.C_STRING:
-                    # inside a string; just mimic the current indent
+                if c == PyParse.C_STRING_FIRST_LINE:
+                    # after the first line of a string; do not indent at all
+                    pass
+                elif c == PyParse.C_STRING_NEXT_LINES:
+                    # inside a string which started before this line;
+                    # just mimic the current indent
                     text.insert("insert", indent)
                 elif c == PyParse.C_BRACKET:
                     # line up with the first (if any) element of the

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 898f2c2c7377840c28ea00717f42a46941b1ca56..7450e2baaa06f082fee921003912aa4426b4ef6c 100644 (file)
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,9 @@ What's New in IDLE 1.2a0?
 
 *Release date: XX-XXX-2005*
 
+- Better indentation after first line of string continuation.
+  IDLEfork Patch 681992, Noam Raphael
+
 - Fixed CodeContext alignment problem, following suggestion from Tal Einat.
 
 - Increased performance in CodeContext extension  Patch 936169 Noam Raphael

diff --git a/Lib/idlelib/PyParse.py b/Lib/idlelib/PyParse.py
index 422a86cc76a64592fe4e952baa70e003e76919f6..1bf4919c21ac9803947d2f51b3477c398ff994d1 100644 (file)
--- a/Lib/idlelib/PyParse.py
+++ b/Lib/idlelib/PyParse.py
@@ -2,7 +2,8 @@ import re
 import sys
 
 # Reason last stmt is continued (or C_NONE if it's not).
-C_NONE, C_BACKSLASH, C_STRING, C_BRACKET = range(4)
+(C_NONE, C_BACKSLASH, C_STRING_FIRST_LINE,
+ C_STRING_NEXT_LINES, C_BRACKET) = range(5)
 
 if 0:   # for throwaway debugging output
     def dump(*stuff):
@@ -281,6 +282,7 @@ class Parser:
                 quote = ch
                 if str[i-1:i+2] == quote * 3:
                     quote = quote * 3
+                firstlno = lno
                 w = len(quote) - 1
                 i = i+w
                 while i < n:
@@ -315,7 +317,12 @@ class Parser:
                 else:
                     # didn't break out of the loop, so we're still
                     # inside a string
-                    continuation = C_STRING
+                    if (lno - 1) == firstlno:
+                        # before the previous \n in str, we were in the first
+                        # line of the string
+                        continuation = C_STRING_FIRST_LINE
+                    else:
+                        continuation = C_STRING_NEXT_LINES
                 continue    # with outer loop
 
             if ch == '#':
@@ -335,7 +342,8 @@ class Parser:
         # The last stmt may be continued for all 3 reasons.
         # String continuation takes precedence over bracket
         # continuation, which beats backslash continuation.
-        if continuation != C_STRING and level > 0:
+        if (continuation != C_STRING_FIRST_LINE
+            and continuation != C_STRING_NEXT_LINES and level > 0):
             continuation = C_BRACKET
         self.continuation = continuation