diff options
| author |  fzaiser <fzaiser@google.com> | 2017-10-24 17:37:51 +0200 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2017-10-25 16:46:00 +0200 |
| commit | 14a26830bb123317c3a820d3839628cc0dd654f4 (patch) | |
| tree | 516b6b9c464b9e083b707bb066439a015c0bdb8a /src/tools/skylark | |
| parent | 69f5849daaa18b79d37fb9b57e32686688b36dd4 (diff) | |
Skylint: fix exception for empty docstring lines
RELNOTES: none
PiperOrigin-RevId: 173261316
Diffstat (limited to 'src/tools/skylark')
| -rw-r--r-- | src/tools/skylark/java/com/google/devtools/skylark/skylint/DocstringChecker.java | 2 | ||||
| -rw-r--r-- | src/tools/skylark/java/com/google/devtools/skylark/skylint/LocationRange.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/tools/skylark/java/com/google/devtools/skylark/skylint/DocstringChecker.java b/src/tools/skylark/java/com/google/devtools/skylark/skylint/DocstringChecker.java index 3869bfa814..ee93a5feca 100644 --- a/src/tools/skylark/java/com/google/devtools/skylark/skylint/DocstringChecker.java +++ b/src/tools/skylark/java/com/google/devtools/skylark/skylint/DocstringChecker.java @@ -204,7 +204,7 @@ public class DocstringChecker extends SyntaxTreeVisitor { startColumn = 1; } Location start = new Location(startLine, startColumn); - Location end = new Location(startLine, startColumn + error.line.length() - 1); + Location end = new Location(startLine, Math.max(1, startColumn + error.line.length() - 1)); return new Issue( BAD_DOCSTRING_FORMAT_CATEGORY, "bad docstring format: " + error.message, diff --git a/src/tools/skylark/java/com/google/devtools/skylark/skylint/LocationRange.java b/src/tools/skylark/java/com/google/devtools/skylark/skylint/LocationRange.java index 0b76f7645b..6f1c2deb98 100644 --- a/src/tools/skylark/java/com/google/devtools/skylark/skylint/LocationRange.java +++ b/src/tools/skylark/java/com/google/devtools/skylark/skylint/LocationRange.java @@ -30,7 +30,10 @@ public class LocationRange { public LocationRange(Location start, Location end) { Preconditions.checkArgument( - Location.compare(start, end) <= 0, "end location should be after start location"); + Location.compare(start, end) <= 0, + "end location (%s) should be after start location (%s)", + end, + start); this.start = start; this.end = end; } |