diff options
| author | Anton Hansson <hansson@google.com> | 2023-10-18 09:28:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-18 09:28:29 +0000 |
| commit | 559a958206da63eb2b4a126dc21b7f7ffae6ad75 (patch) | |
| tree | 3a8a2c786dd3812087165fcdb8dd5e47e346da5e | |
| parent | 18143f5909cb676a10aac3828d9e3eb2090df8c4 (diff) | |
| parent | 027022739e4d19fbfc31e30d0338b19d6d73bd47 (diff) | |
| download | doclava-559a958206da63eb2b4a126dc21b7f7ffae6ad75.tar.gz | |
Merge "Allow comments in baseline files" into main am: 027022739e
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2792960
Change-Id: I142c97fe66a4f638879bed140ea4d9b4b218b76f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/google/doclava/Doclava.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/google/doclava/Doclava.java b/src/com/google/doclava/Doclava.java index 101e45f..bc3c378 100644 --- a/src/com/google/doclava/Doclava.java +++ b/src/com/google/doclava/Doclava.java @@ -1845,7 +1845,11 @@ public class Doclava implements Doclet { } try (BufferedReader reader = new BufferedReader(new FileReader(lintBaselineFile))) { List<LintBaselineEntry> baseline = - reader.lines().map(ErrorMessage::parse).filter(e -> e != null).collect(toList()); + reader.lines() + .filter(l -> !l.trim().isEmpty() && !l.startsWith("//")) + .map(ErrorMessage::parse) + .filter(e -> e != null) + .collect(toList()); Errors.setLintBaseline(baseline); return true; } catch (IOException exception) { |