diff --git a/Agendas/20180516.md b/Agendas/20180516.md index 74fe9b6c..5a131b38 100644 --- a/Agendas/20180516.md +++ b/Agendas/20180516.md @@ -1,5 +1,6 @@ 1. Editors' report 1. Approval of new changes: + 1. [Issue #93](https://github.com/oasis-tcs/sarif-spec/issues/93): "Problems with regions" 1. [Issue #149](https://github.com/oasis-tcs/sarif-spec/issues/149): "Support nested graphs" 1. [Issue #161](https://github.com/oasis-tcs/sarif-spec/issues/161): "Expand code flows to represent dynamic execution events" 1. [Issue #103](https://github.com/oasis-tcs/sarif-spec/issues/103): "Specify handling of line breaks" diff --git a/Documents/ChangeDrafts/Active/sarif-v2.0-issue-93-region-improvements.docx b/Documents/ChangeDrafts/Active/sarif-v2.0-issue-93-region-improvements.docx new file mode 100644 index 00000000..f62bddfc Binary files /dev/null and b/Documents/ChangeDrafts/Active/sarif-v2.0-issue-93-region-improvements.docx differ diff --git a/Documents/Schema changes between SARIF v1 and v2.md b/Documents/Schema changes between SARIF v1 and v2.md index bf67320b..228852c3 100644 --- a/Documents/Schema changes between SARIF v1 and v2.md +++ b/Documents/Schema changes between SARIF v1 and v2.md @@ -672,6 +672,17 @@ These overrides are noted on the earlier change. ## Changes to review at TC #17 +- [Issue #93](https://github.com/oasis-tcs/sarif-spec/issues/93): "Problems with regions" + + In the `region` object: + + - Remove the `offset` property. + - Remove the `length` property. + - Add a `charOffset` property of type `integer`, optional. + - Add a `charLength` property of type `integer`, optional. + - Add a `byteOffset` property of type `integer`, optional. + - Add a `byteLength` property of type `integer`, optional. + - [Issue #138](https://github.com/oasis-tcs/sarif-spec/issues/138): "Consider a download/install uri for the tool" In the `tool` object: diff --git a/EditorsReports/Editor's report 2018-05-16.md b/EditorsReports/Editor's report 2018-05-16.md index 72669f4e..63ca94e2 100644 --- a/EditorsReports/Editor's report 2018-05-16.md +++ b/EditorsReports/Editor's report 2018-05-16.md @@ -38,6 +38,8 @@ Presented at TC Meeting #17, May 16th, 2018 1. The formal spec language for the following additional issues was made available for review on the specified dates, and we will move their adoption in today's meeting: + 1. [Issue #93](https://github.com/oasis-tcs/sarif-spec/issues/93): "Problems with regions" -- made available on May 11th, 2018. + 1. [Issue #103](https://github.com/oasis-tcs/sarif-spec/issues/103): "Specify handling of line breaks" -- made available on May 5th, 2018. 1. [Issue #138](https://github.com/oasis-tcs/sarif-spec/issues/138): "Consider a download/install uri for the tool" -- made available on May 1st, 2018. diff --git a/Schemata/sarif-schema.json b/Schemata/sarif-schema.json index e4ddca14..64334830 100644 --- a/Schemata/sarif-schema.json +++ b/Schemata/sarif-schema.json @@ -1158,19 +1158,31 @@ }, "endColumn": { - "description": "The column number of the last character in the region.", + "description": "The column number of the character following the end of the region.", "type": "integer", "minimum": 1 }, - "offset": { - "description": "The zero-based offset from the beginning of the file of the first byte or character in the region.", + "charOffset": { + "description": "The zero-based offset from the beginning of the file of the first character in the region.", "type": "integer", "minimum": 0 }, - "length": { - "description": "The length of the region in bytes or characters.", + "charLength": { + "description": "The length of the region in characters.", + "type": "integer", + "minimum": 0 + }, + + "byteOffset": { + "description": "The zero-based offset from the beginning of the file of the first byte in the region.", + "type": "integer", + "minimum": 0 + }, + + "byteLength": { + "description": "The length of the region in bytes.", "type": "integer", "minimum": 0 },