Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1915)

Unified Diff: Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/checks/ReturnAnnotationChecker.java

Issue 218993012: DevTools: [JsDocValidator] Handle types declared as top-level vars (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Move case to keep the order consistent between methods Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/checks/ReturnAnnotationChecker.java
diff --git a/Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/checks/ReturnAnnotationChecker.java b/Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/checks/ReturnAnnotationChecker.java
index 10803aa7320af3caace0abdd0681ff574127c51f..60937784ebb6eff2f4a5ff87b27335331ecd83c2 100644
--- a/Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/checks/ReturnAnnotationChecker.java
+++ b/Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/checks/ReturnAnnotationChecker.java
@@ -30,7 +30,7 @@ public final class ReturnAnnotationChecker extends ContextTrackingChecker {
}
private void handleReturn(ReturnStatement node) {
- if (node.getReturnValue() == null || AstUtil.hasParentOfType(node, Token.ASSIGN)) {
+ if (node.getReturnValue() == null || AstUtil.parentOfType(node, Token.ASSIGN) != null) {
return;
}
@@ -137,8 +137,9 @@ public final class ReturnAnnotationChecker extends ContextTrackingChecker {
return nameNode;
}
- if (AstUtil.hasParentOfType(functionNode, Token.COLON)) {
- return ((ObjectProperty) functionNode.getParent()).getLeft();
+ ObjectProperty parent = (ObjectProperty) AstUtil.parentOfType(functionNode, Token.COLON);
+ if (parent != null) {
+ return parent.getLeft();
}
// Do not require annotation for assignment-RHS functions.
return null;

Powered by Google App Engine
This is Rietveld 408576698