Merge pull request #189 from mull-project/strip-only-newlines

 Initially strip only newlines from matched lines

Author: stanislaw

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.21
+current_version = 0.0.22
 commit = True
 tag = True
 

.github/workflows/ci-mac.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2

filecheck/filecheck.py

@@ -9,7 +9,7 @@
 from difflib import SequenceMatcher
 from enum import Enum
 
-__version__ = "0.0.21"
+__version__ = "0.0.22"
 
 from typing import Optional, List, Iterable
 
@@ -597,7 +597,7 @@ def exit_handler(code):
         failed_implicit_check = None
 
         while True:
-            line = line.rstrip()
+            line = line.rstrip("\n\r")
 
             unstripped_line = line
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "filecheck"
-version = "0.0.21"
+version = "0.0.22"
 description = "Python port of LLVM's FileCheck, flexible pattern matching file verifier"
 authors = ["Stanislav Pankevich <[email protected]>"]
 

tests/integration/tests/check_commands/CHECK/one_string/positive-match/07-positive-regex-match-trailing-space/filecheck.check

@@ -0,0 +1 @@
+CHECK: {{^}}hello {{$}}

tests/integration/tests/check_commands/CHECK/one_string/positive-match/07-positive-regex-match-trailing-space/filecheck.input

@@ -0,0 +1 @@
+hello 

tests/integration/tests/check_commands/CHECK/one_string/positive-match/07-positive-regex-match-trailing-space/sample.itest

@@ -0,0 +1 @@
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"

tests/integration/tests/py-only/version/sample.itest

@@ -1,4 +1,4 @@
 RUN: %FILECHECK_EXEC --version | %FILECHECK_TESTER_EXEC %s --match-full-lines
 CHECK: {{^.*}}FileCheck{{(\.py)?$}}
-CHECK: Version: 0.0.21
+CHECK: Version: 0.0.22
 CHECK-EMPTY: