From 97e96284a3cec71b8cf78a3bec5b525cc3e538bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Vall=C3=A9e?= Date: Fri, 27 Nov 2015 16:09:34 -0500 Subject: [PATCH] Disable long word wrapping entirely in comments. As pointed out by nico, we should unconditionally disable breaking of long words in comments. It is unlikely long words that are in comments should be split (like pathnames). --- misc/ninja_syntax.py | 6 ++---- misc/ninja_syntax_test.py | 7 +------ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/misc/ninja_syntax.py b/misc/ninja_syntax.py index f285420f..73d22090 100644 --- a/misc/ninja_syntax.py +++ b/misc/ninja_syntax.py @@ -22,10 +22,8 @@ class Writer(object): self.output.write('\n') def comment(self, text, has_path=False): - args = {} - if has_path: - args['break_long_words'] = args['break_on_hyphens'] = False - for line in textwrap.wrap(text, self.width - 2, **args): + for line in textwrap.wrap(text, self.width - 2, break_long_words=False, + break_on_hyphens=False): self.output.write('# ' + line + '\n') def variable(self, key, value, indent=0): diff --git a/misc/ninja_syntax_test.py b/misc/ninja_syntax_test.py index 46ce3823..c9755b86 100755 --- a/misc/ninja_syntax_test.py +++ b/misc/ninja_syntax_test.py @@ -46,13 +46,8 @@ class TestLineWordWrap(unittest.TestCase): self.out.getvalue()) def test_comment_wrap(self): - # We should wrap the comments - self.n.comment('Hello there') - self.assertEqual('# Hello\n# there\n', self.out.getvalue()) - - def test_comment_wrap_filename(self): # Filenames shoud not be wrapped - self.n.comment('Hello /usr/local/build-tools/bin', has_path=True) + self.n.comment('Hello /usr/local/build-tools/bin') self.assertEqual('# Hello\n# /usr/local/build-tools/bin\n', self.out.getvalue())