diff options
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 8 | ||||
| -rw-r--r-- | Lib/idlelib/NEWS.txt | 3 | ||||
| -rw-r--r-- | Lib/idlelib/PyParse.py | 14 |
3 files changed, 20 insertions, 5 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index 3c4585b..cc38122 100644 --- 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 898f2c2..7450e2b 100644 --- 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 422a86c..1bf4919 100644 --- 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 |