Skip to content

Fix end_line incorrectly assigned from start_line in CSV output #4785 #4786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codewithfourtix wants to merge 1 commit into
base: develop
Choose a base branch
from
+19 −19
Open

Fix end_line incorrectly assigned from start_line in CSV output #4785 #4786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/formattedcode/output_csv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,23 +185,23 @@ def collect_keys(mapping, key_group):
inf = dict(path=path)
inf['copyright'] = copyr['copyright']
inf['start_line'] = copyr['start_line']
inf['end_line'] = copyr['start_line']
inf['end_line'] = copyr['end_line']
collect_keys(inf, 'copyright')
yield inf

for copyr in scanned_file.get('holders', []):
inf = dict(path=path)
inf['holder'] = copyr['holder']
inf['start_line'] = copyr['start_line']
inf['end_line'] = copyr['start_line']
inf['end_line'] = copyr['end_line']
collect_keys(inf, 'copyright')
yield inf

for copyr in scanned_file.get('authors', []):
inf = dict(path=path)
inf['author'] = copyr['author']
inf['start_line'] = copyr['start_line']
inf['end_line'] = copyr['start_line']
inf['end_line'] = copyr['end_line']
collect_keys(inf, 'copyright')
yield inf

Expand Down
32 changes: 16 additions & 16 deletions tests/formattedcode/data/csv/flatten_scan/full.json-expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3717,19 +3717,19 @@
"path": "samples/commoncode/src/commoncode/python.LICENSE",
"copyright": "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Python Software Foundation",
"start_line": 93,
"end_line": 93
"end_line": 94
},
{
"path": "samples/commoncode/src/commoncode/python.LICENSE",
"copyright": "Copyright (c) 1995-2001 Corporation for National Research Initiatives",
"start_line": 194,
"end_line": 194
"end_line": 195
},
{
"path": "samples/commoncode/src/commoncode/python.LICENSE",
"copyright": "Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The Netherlands",
"start_line": 254,
"end_line": 254
"end_line": 255
},
{
"path": "samples/commoncode/src/commoncode/python.LICENSE",
Expand All @@ -3741,19 +3741,19 @@
"path": "samples/commoncode/src/commoncode/python.LICENSE",
"copyright": "Copyright (c) 1990-2005 Sleepycat Software",
"start_line": 331,
"end_line": 331
"end_line": 332
},
{
"path": "samples/commoncode/src/commoncode/python.LICENSE",
"copyright": "Copyright (c) 1990, 1993, 1994, 1995 The Regents of the University of California",
"start_line": 366,
"end_line": 366
"end_line": 367
},
{
"path": "samples/commoncode/src/commoncode/python.LICENSE",
"copyright": "Copyright (c) 1995, 1996 The President and Fellows of Harvard University",
"start_line": 394,
"end_line": 394
"end_line": 395
},
{
"path": "samples/commoncode/src/commoncode/python.LICENSE",
Expand All @@ -3777,13 +3777,13 @@
"path": "samples/commoncode/src/commoncode/python.LICENSE",
"copyright": "copyrighted by the Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState Corporation",
"start_line": 554,
"end_line": 554
"end_line": 556
},
{
"path": "samples/commoncode/src/commoncode/python.LICENSE",
"copyright": "copyrighted by the Regents of the University of California, Sun Microsystems, Inc.",
"start_line": 597,
"end_line": 597
"end_line": 598
},
{
"path": "samples/commoncode/src/commoncode/python.LICENSE",
Expand All @@ -3801,7 +3801,7 @@
"path": "samples/commoncode/src/commoncode/python.LICENSE",
"holder": "Stichting Mathematisch Centrum Amsterdam, The Netherlands",
"start_line": 254,
"end_line": 254
"end_line": 255
},
{
"path": "samples/commoncode/src/commoncode/python.LICENSE",
Expand Down Expand Up @@ -3849,13 +3849,13 @@
"path": "samples/commoncode/src/commoncode/python.LICENSE",
"holder": "the Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState Corporation",
"start_line": 554,
"end_line": 554
"end_line": 556
},
{
"path": "samples/commoncode/src/commoncode/python.LICENSE",
"holder": "the Regents of the University of California, Sun Microsystems, Inc.",
"start_line": 597,
"end_line": 597
"end_line": 598
},
{
"path": "samples/commoncode/src/commoncode/python.LICENSE",
Expand All @@ -3873,13 +3873,13 @@
"path": "samples/commoncode/src/commoncode/python.LICENSE",
"author": "Eric Young (eay@cryptsoft.com)",
"start_line": 485,
"end_line": 485
"end_line": 486
},
{
"path": "samples/commoncode/src/commoncode/python.LICENSE",
"author": "Tim Hudson (tjh@cryptsoft.com)",
"start_line": 486,
"end_line": 486
"end_line": 487
},
{
"path": "samples/commoncode/src/commoncode/python.LICENSE",
Expand Down Expand Up @@ -5073,7 +5073,7 @@
"path": "samples/JGroups/licenses/apache-1.1.txt",
"author": "the Apache Software Foundation (http://www.apache.org/)",
"start_line": 21,
"end_line": 21
"end_line": 22
},
{
"path": "samples/JGroups/licenses/apache-1.1.txt",
Expand Down Expand Up @@ -7245,13 +7245,13 @@
"path": "samples/zlib/iostream2/zstream.h",
"copyright": "Copyright (c) 1997 Christian Michelsen Research AS Advanced Computing",
"start_line": 3,
"end_line": 3
"end_line": 5
},
{
"path": "samples/zlib/iostream2/zstream.h",
"holder": "Christian Michelsen Research AS Advanced Computing",
"start_line": 4,
"end_line": 4
"end_line": 5
},
{
"path": "samples/zlib/iostream2/zstream.h",
Expand Down
Loading