| Index: third_party/WebKit/Source/devtools/scripts/jsdoc_validator/src/org/chromium/devtools/jsdoc/checks/ProtoFollowsExtendsChecker.java
|
| diff --git a/third_party/WebKit/Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/checks/ProtoFollowsExtendsChecker.java b/third_party/WebKit/Source/devtools/scripts/jsdoc_validator/src/org/chromium/devtools/jsdoc/checks/ProtoFollowsExtendsChecker.java
|
| similarity index 80%
|
| rename from third_party/WebKit/Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/checks/ProtoFollowsExtendsChecker.java
|
| rename to third_party/WebKit/Source/devtools/scripts/jsdoc_validator/src/org/chromium/devtools/jsdoc/checks/ProtoFollowsExtendsChecker.java
|
| index 6447b0c6eb12f90edef0b7fd0f8cbd8bc37772fb..eee81e59a60b2c734edd41714b03e0a79a723491 100644
|
| --- a/third_party/WebKit/Source/devtools/scripts/jsdoc-validator/src/org/chromium/devtools/jsdoc/checks/ProtoFollowsExtendsChecker.java
|
| +++ b/third_party/WebKit/Source/devtools/scripts/jsdoc_validator/src/org/chromium/devtools/jsdoc/checks/ProtoFollowsExtendsChecker.java
|
| @@ -9,7 +9,6 @@ import java.util.List;
|
| import java.util.Set;
|
|
|
| public final class ProtoFollowsExtendsChecker extends ContextTrackingChecker {
|
| -
|
| private static final String PROTO_PROPERTY_NAME = "__proto__";
|
| private static final Set<String> IGNORED_SUPER_TYPES = new HashSet<>();
|
| static {
|
| @@ -22,21 +21,21 @@ public final class ProtoFollowsExtendsChecker extends ContextTrackingChecker {
|
| @Override
|
| protected void enterNode(Node node) {
|
| switch (node.getType()) {
|
| - case Token.ASSIGN:
|
| - case Token.VAR:
|
| - handleAssignment(node);
|
| - break;
|
| - case Token.STRING_KEY:
|
| - handleColonNode(node);
|
| - break;
|
| - case Token.FUNCTION:
|
| - enterFunction();
|
| - break;
|
| - case Token.CALL:
|
| - handleCall(node);
|
| - break;
|
| - default:
|
| - break;
|
| + case Token.ASSIGN:
|
| + case Token.VAR:
|
| + handleAssignment(node);
|
| + break;
|
| + case Token.STRING_KEY:
|
| + handleColonNode(node);
|
| + break;
|
| + case Token.FUNCTION:
|
| + enterFunction();
|
| + break;
|
| + case Token.CALL:
|
| + handleCall(node);
|
| + break;
|
| + default:
|
| + break;
|
| }
|
| }
|
|
|
| @@ -56,8 +55,8 @@ public final class ProtoFollowsExtendsChecker extends ContextTrackingChecker {
|
| }
|
| JSTypeExpression extendedType = typeRecord.getExtendedType();
|
| // FIXME: Strip template parameters from the extendedType.
|
| - if (extendedType == null ||
|
| - !typeName.equals(AstUtil.getAnnotationTypeString(extendedType))) {
|
| + if (extendedType == null
|
| + || !typeName.equals(AstUtil.getAnnotationTypeString(extendedType))) {
|
| return;
|
| }
|
| functionsMissingSuperCall.remove(contextFunction);
|
| @@ -144,8 +143,7 @@ public final class ProtoFollowsExtendsChecker extends ContextTrackingChecker {
|
| if (rootNode.getType() == Token.BANG && rootNode.getFirstChild() != null) {
|
| rootNode = rootNode.getFirstChild();
|
| }
|
| - getContext().reportErrorAtOffset(
|
| - rootNode.getSourceOffset(),
|
| + getContext().reportErrorAtOffset(rootNode.getSourceOffset(),
|
| String.format("No __proto__ assigned for type %s having @extends",
|
| record.typeName));
|
| }
|
| @@ -172,19 +170,19 @@ public final class ProtoFollowsExtendsChecker extends ContextTrackingChecker {
|
| String value = state.getNodeText(rightNode);
|
| boolean isNullPrototype = "null".equals(value);
|
| if (!isNullPrototype && !AstUtil.isPrototypeName(value)) {
|
| - reportErrorAtNodeStart(
|
| - rightNode, "__proto__ value is not a prototype");
|
| + reportErrorAtNodeStart(rightNode, "__proto__ value is not a prototype");
|
| return;
|
| }
|
| String superType = isNullPrototype ? "null" : AstUtil.getTypeNameFromPrototype(value);
|
| if (type.isInterface()) {
|
| - reportErrorAtNodeStart(node, String.format(
|
| - "__proto__ defined for interface %s", type.typeName));
|
| + reportErrorAtNodeStart(
|
| + node, String.format("__proto__ defined for interface %s", type.typeName));
|
| return;
|
| } else {
|
| if (!isNullPrototype && type.getExtendedType() == null) {
|
| - reportErrorAtNodeStart(rightNode, String.format(
|
| - "No @extends annotation for %s extending %s", type.typeName, superType));
|
| + reportErrorAtNodeStart(
|
| + rightNode, String.format("No @extends annotation for %s extending %s",
|
| + type.typeName, superType));
|
| return;
|
| }
|
| }
|
| @@ -198,11 +196,13 @@ public final class ProtoFollowsExtendsChecker extends ContextTrackingChecker {
|
| JSTypeExpression extendedType = type.getExtendedType();
|
| String extendedTypeName = AstUtil.getAnnotationTypeString(extendedType);
|
| if (!superType.equals(extendedTypeName)) {
|
| - reportErrorAtNodeStart(rightNode, String.format(
|
| - "Supertype does not match %s declared in @extends for %s (line %d)",
|
| - extendedTypeName, type.typeName,
|
| - state.getContext().getPosition(
|
| - extendedType.getRoot().getSourceOffset()).line));
|
| + reportErrorAtNodeStart(rightNode,
|
| + String.format(
|
| + "Supertype does not match %s declared in @extends for %s (line %d)",
|
| + extendedTypeName, type.typeName,
|
| + state.getContext()
|
| + .getPosition(extendedType.getRoot().getSourceOffset())
|
| + .line));
|
| }
|
| }
|
|
|
| @@ -229,9 +229,10 @@ public final class ProtoFollowsExtendsChecker extends ContextTrackingChecker {
|
| return;
|
| }
|
| if (type.getExtendedType() != null) {
|
| - reportErrorAtNodeStart(prototypeValueNode, String.format(
|
| - "@extends found for type %s but its prototype is not an object "
|
| - + "containing __proto__", AstUtil.getTypeNameFromPrototype(assignedTypeName)));
|
| + reportErrorAtNodeStart(prototypeValueNode,
|
| + String.format("@extends found for type %s but its prototype is not an object "
|
| + + "containing __proto__",
|
| + AstUtil.getTypeNameFromPrototype(assignedTypeName)));
|
| }
|
| }
|
| }
|
|
|