diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-08-23 22:47:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-08-23 22:47:33 +0000 |
| commit | 710198cc7d623d5a673d446c4f3cc9212f155f1f (patch) | |
| tree | 31eb9c961fb81870031d97dbdb287045873f1bdb | |
| parent | 08bc827b428b81ce79c3592a9bd8cd1edc36e78b (diff) | |
| parent | 717004e877fdd33739123676085c738d49b0286e (diff) | |
| download | platform_external_doclava-androidx-room-release.tar.gz platform_external_doclava-androidx-room-release.tar.bz2 platform_external_doclava-androidx-room-release.zip | |
Merge "Snap for 5826610 from af4aca7863a81c8d82495caa47d77c4fe5dc8fa1 to androidx-room-release" into androidx-room-releaseandroidx-room-release
| -rw-r--r-- | src/com/google/doclava/Comment.java | 12 | ||||
| -rw-r--r-- | src/com/google/doclava/Errors.java | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/com/google/doclava/Comment.java b/src/com/google/doclava/Comment.java index 63ace55..ea09788 100644 --- a/src/com/google/doclava/Comment.java +++ b/src/com/google/doclava/Comment.java @@ -387,8 +387,16 @@ public class Comment { known = Doclava.knownTags.contains(name); } if (!known) { - Errors.error(Errors.UNKNOWN_TAG, pos == null ? null : new SourcePositionInfo(pos), - "Unknown tag: " + name); + if (name.length() >= 2 && Character.isUpperCase(name.charAt(1))) { + // This is a workaround for b/135928616 where parsing of comments fails when there is + // a Java annotation and not a tag. + Errors.error(Errors.JAVA_TAG_IN_COMMENT, + pos == null ? null : new SourcePositionInfo(pos), + "Invalid tag: " + name); + } else { + Errors.error(Errors.UNKNOWN_TAG, pos == null ? null : new SourcePositionInfo(pos), + "Unknown tag: " + name); + } } TagInfo t = new TextTagInfo(name, name, text, pos); if (isInline) { diff --git a/src/com/google/doclava/Errors.java b/src/com/google/doclava/Errors.java index 6b0eee0..a7a3bdf 100644 --- a/src/com/google/doclava/Errors.java +++ b/src/com/google/doclava/Errors.java @@ -314,6 +314,7 @@ public class Errors { public static final Error TODO = new Error(128, LINT); public static final Error NO_ARTIFACT_DATA = new Error(129, HIDDEN); public static final Error BROKEN_ARTIFACT_FILE = new Error(130, ERROR); + public static final Error JAVA_TAG_IN_COMMENT = new Error(131, LINT); public static boolean setErrorLevel(int code, int level) { for (Error e : sErrors) { |