From 63bab594228435b30586989c57ede4535cb39229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= Date: Wed, 24 Mar 2021 11:38:56 +0100 Subject: [PATCH] line_length: tweak tests --- tests/rules/test_line_length.py | 15 +++++++++++++-- yamllint/rules/line_length.py | 10 +++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/tests/rules/test_line_length.py b/tests/rules/test_line_length.py index fc3f0e8..245fe4d 100644 --- a/tests/rules/test_line_length.py +++ b/tests/rules/test_line_length.py @@ -120,11 +120,22 @@ class LineLengthTestCase(RuleTestCase): self.check('---\n' '# http://www.verylongurlurlurlurlurlurlurlurl.com\n' 'key:\n' - ' value:\n', conf) + ' subkey: value\n', conf) self.check('---\n' '## http://www.verylongurlurlurlurlurlurlurlurl.com\n' 'key:\n' - ' value:\n', conf) + ' subkey: value\n', conf) + self.check('---\n' + '# # http://www.verylongurlurlurlurlurlurlurlurl.com\n' + 'key:\n' + ' subkey: value\n', conf, + problem=(2, 21)) + self.check('---\n' + '#A http://www.verylongurlurlurlurlurlurlurlurl.com\n' + 'key:\n' + ' subkey: value\n', conf, + problem1=(2, 2, 'comments'), + problem2=(2, 21, 'line-length')) conf = ('line-length: {max: 20, allow-non-breakable-words: true}\n' 'trailing-spaces: disable') diff --git a/yamllint/rules/line_length.py b/yamllint/rules/line_length.py index 0289747..cfc328c 100644 --- a/yamllint/rules/line_length.py +++ b/yamllint/rules/line_length.py @@ -140,11 +140,11 @@ def check(conf, line): start += 1 if start != line.end: - if line.buffer[start] in ('#'): - idx = line.buffer.find(' ', start, line.end) - if idx != -1: - start = idx + 1 - elif line.buffer[start] in ('-'): + if line.buffer[start] == '#': + while line.buffer[start] == '#': + start += 1 + start += 1 + elif line.buffer[start] == '-': start += 2 if line.buffer.find(' ', start, line.end) == -1: