opendev/gerrit
Code Issues Proposed changes

Merge topic 'comment-range' into stable-2.9

Browse Source 
* changes:
  Replace "line" with "end_line" when range is given in inline comment
  Add example of range comment in REST API documentation
This commit is contained in:
Shawn Pearce
2014-08-28 00:25:56 +00:00
committed by Gerrit Code Review
parent 7a4cdcd5f8 4a159a1edf
commit 820e8ddc4a
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/rest-api-changes.txt
View File

@@ -1545,6 +1545,15 @@ link:#review-input[ReviewInput] entity.
{ {
"line": 49, "line": 49,
"message": "[nit] s/conrtol/control" "message": "[nit] s/conrtol/control"
},
{
"range": {
"start_line": 50,
"start_character": 0,
"end_line": 55,
"end_character": 20
},
"message": "Incorrect indentation"
} }
] ]
} }
@@ -2890,7 +2899,7 @@ If not set, the default is `REVISION`.
The number of the line for which the comment should be added. + The number of the line for which the comment should be added. +
`0` if it is a file comment. + `0` if it is a file comment. +
If neither line nor range is set, a file comment is added. + If neither line nor range is set, a file comment is added. +
If range is set, this should equal the end line of the range. If range is set, this value is ignored in favor of the `end_line` of the range.
|`range` |optional| |`range` |optional|
The range of the comment as a link:#comment-range[CommentRange] The range of the comment as a link:#comment-range[CommentRange]
entity. entity.

1
gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
View File

@@ -339,6 +339,7 @@ public class PostReview implements RestModifyView<RevisionResource, ReviewInput>
c.range.startCharacter, c.range.startCharacter,
c.range.endLine, c.range.endLine,
c.range.endCharacter)); c.range.endCharacter));
e.setLine(c.range.endLine);
} }
ups.add(e); ups.add(e);
} }