From 1fbad51aaccbb4f7bf8eb871dc81d89fd68e437a Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Mon, 20 May 2013 20:43:42 +0400 Subject: [PATCH] fixed PY-9661 Fill paragraph generally bad --- .../formatter/PyLineWrapPositionStrategy.java | 2 +- python/testData/fillParagraph/enter_after.py | 14 +++++++------- .../fillParagraph/multilineDocstring_after.py | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/python/src/com/jetbrains/python/formatter/PyLineWrapPositionStrategy.java b/python/src/com/jetbrains/python/formatter/PyLineWrapPositionStrategy.java index 8900a354339e..875333d46ce7 100644 --- a/python/src/com/jetbrains/python/formatter/PyLineWrapPositionStrategy.java +++ b/python/src/com/jetbrains/python/formatter/PyLineWrapPositionStrategy.java @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; public class PyLineWrapPositionStrategy extends GenericLineWrapPositionStrategy { public PyLineWrapPositionStrategy() { // Commas. - addRule(new Rule(',', WrapCondition.AFTER, Rule.DEFAULT_WEIGHT * 1.4)); + addRule(new Rule(',', WrapCondition.AFTER, Rule.DEFAULT_WEIGHT * 1.2)); // Symbols to wrap either before or after. addRule(new Rule(' ')); diff --git a/python/testData/fillParagraph/enter_after.py b/python/testData/fillParagraph/enter_after.py index 2be987956d41..9748605ac7bb 100644 --- a/python/testData/fillParagraph/enter_after.py +++ b/python/testData/fillParagraph/enter_after.py @@ -1,7 +1,7 @@ -# Lorem ipsum dolor sit amet, consectetur adipisicing elit, -# sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim -# ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip -# ex ea commodo consequat. Duis aute irure dolor in reprehenderit in -# voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint -# occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit -# anim id est laborum. \ No newline at end of file +# Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod +# tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim +# veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea +# commodo consequat. Duis aute irure dolor in reprehenderit in voluptate +# velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat +# cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id +# est laborum. \ No newline at end of file diff --git a/python/testData/fillParagraph/multilineDocstring_after.py b/python/testData/fillParagraph/multilineDocstring_after.py index 07c19cdca980..5dc9c0a2a06c 100644 --- a/python/testData/fillParagraph/multilineDocstring_after.py +++ b/python/testData/fillParagraph/multilineDocstring_after.py @@ -3,6 +3,6 @@ __author__ = 'ktisha' def foo(): """ This is my docstring. There are many like it, but this one mine. My docstring is my best friend. it is my life. I - must master it as I must master my life. This is my docstring. There are many like it, - but this one mine. My docstring is my best friend. it is my life. I must master it as I must master my life. + must master it as I must master my life. This is my docstring. There are many like it, but this one mine. My + docstring is my best friend. it is my life. I must master it as I must master my life. """ \ No newline at end of file