writer-json-sarif: write endLine/endColumn unconditionally

... paired with each startLine/startColumn to be compatible with `shellcheck-sarif` and `sarif-fmt`. Resolves: csutils#136 Closes: csutils#167
kdudka · Apr 4, 2024 · c09b7a9 · c09b7a9
1 parent 874b5a5
commit c09b7a9
Show file tree

Hide file tree

Showing 8 changed files with 12,871 additions and 5,802 deletions.
diff --git a/src/lib/writer-json-sarif.cc b/src/lib/writer-json-sarif.cc
@@ -230,16 +230,14 @@ static void sarifEncodeLoc(object *pLoc, const Defect &def, unsigned idx)
 
     // line start/end
     object reg = {
-        { "startLine", evt.line }
+        { "startLine", evt.line },
+        { "endLine", evt.line + evt.vSize }
     };
-    if (0 < evt.vSize)
-        reg["endLine"] = evt.line + evt.vSize;
 
     // column start/end
     if (evt.column) {
         reg["startColumn"] = evt.column;
-        if (0 < evt.hSize)
-            reg["endColumn"] = evt.column + evt.hSize;
+        reg["endColumn"] = evt.column + evt.hSize;
     }
 
     locPhy["region"] = std::move(reg);

diff --git a/tests/csgrep/0080-sarif-writer-stdout.txt b/tests/csgrep/0080-sarif-writer-stdout.txt
diff --git a/tests/csgrep/0081-sarif-writer-stdout.txt b/tests/csgrep/0081-sarif-writer-stdout.txt
diff --git a/tests/csgrep/0085-sarif-writer-stdout.txt b/tests/csgrep/0085-sarif-writer-stdout.txt
diff --git a/tests/csgrep/0090-sarif-writer-illegal-utf8-sequence-stdout.txt b/tests/csgrep/0090-sarif-writer-illegal-utf8-sequence-stdout.txt
@@ -32,7 +32,8 @@
                                     "uri": "test.c"
                                 },
                                 "region": {
-                                    "startLine": 0
+                                    "startLine": 0,
+                                    "endLine": 0
                                 }
                             }
                         }
@@ -53,7 +54,8 @@
                                                         "uri": "test.c"
                                                     },
                                                     "region": {
-                                                        "startLine": 0
+                                                        "startLine": 0,
+                                                        "endLine": 0
                                                     }
                                                 },
                                                 "message": {

diff --git a/tests/csgrep/0096-sarif-levels-stdout.txt b/tests/csgrep/0096-sarif-levels-stdout.txt
diff --git a/tests/csgrep/0097-sarif-set-tool-stdout.txt b/tests/csgrep/0097-sarif-set-tool-stdout.txt
@@ -60,7 +60,9 @@
                                 },
                                 "region": {
                                     "startLine": 6,
-                                    "startColumn": 1
+                                    "endLine": 6,
+                                    "startColumn": 1,
+                                    "endColumn": 1
                                 }
                             }
                         }
@@ -82,7 +84,9 @@
                                                     },
                                                     "region": {
                                                         "startLine": 6,
-                                                        "startColumn": 1
+                                                        "endLine": 6,
+                                                        "startColumn": 1,
+                                                        "endColumn": 1
                                                     }
                                                 },
                                                 "message": {
@@ -112,7 +116,9 @@
                                 },
                                 "region": {
                                     "startLine": 4,
-                                    "startColumn": 7
+                                    "endLine": 4,
+                                    "startColumn": 7,
+                                    "endColumn": 7
                                 }
                             }
                         }
@@ -134,7 +140,9 @@
                                                     },
                                                     "region": {
                                                         "startLine": 4,
-                                                        "startColumn": 7
+                                                        "endLine": 4,
+                                                        "startColumn": 7,
+                                                        "endColumn": 7
                                                     }
                                                 },
                                                 "message": {

diff --git a/tests/csgrep/0109-shellcheck-sarif-cwe-stdout.txt b/tests/csgrep/0109-shellcheck-sarif-cwe-stdout.txt