From 3b7c29d46839c369065cb094bb6cf915bc9a4858 Mon Sep 17 00:00:00 2001 From: nickreid Date: Thu, 11 Oct 2018 10:37:39 -0700 Subject: [PATCH] Deletes linter check for visibility annotations on class constructors now that they're supported. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=216720684 --- .../jscomp/lint/CheckJSDocStyle.java | 18 +++--------------- .../jscomp/lint/CheckJSDocStyleTest.java | 9 --------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/com/google/javascript/jscomp/lint/CheckJSDocStyle.java b/src/com/google/javascript/jscomp/lint/CheckJSDocStyle.java index a6cb3a3bc69..dca26c6b8bc 100644 --- a/src/com/google/javascript/jscomp/lint/CheckJSDocStyle.java +++ b/src/com/google/javascript/jscomp/lint/CheckJSDocStyle.java @@ -40,10 +40,6 @@ * with no corresponding {@code @param} annotation, coding conventions not being respected, etc. */ public final class CheckJSDocStyle extends AbstractPostOrderCallback implements CompilerPass { - public static final DiagnosticType CONSTRUCTOR_DISALLOWED_JSDOC = - DiagnosticType.disabled("JSC_CONSTRUCTOR_DISALLOWED_JSDOC", - "Setting visibility on constructors is not yet supported.\n" - + "See https://github.com/google/closure-compiler/issues/2761\n"); public static final DiagnosticType CLASS_DISALLOWED_JSDOC = DiagnosticType.disabled("JSC_CLASS_DISALLOWED_JSDOC", @@ -94,7 +90,6 @@ public final class CheckJSDocStyle extends AbstractPostOrderCallback implements public static final DiagnosticGroup ALL_DIAGNOSTICS = new DiagnosticGroup( CLASS_DISALLOWED_JSDOC, - CONSTRUCTOR_DISALLOWED_JSDOC, MISSING_JSDOC, MISSING_PARAMETER_JSDOC, MIXED_PARAM_JSDOC_STYLES, @@ -120,10 +115,10 @@ public void process(Node externs, Node root) { } @Override - public void visit(NodeTraversal t, Node n, Node parent) { + public void visit(NodeTraversal t, Node n, Node unused) { switch (n.getToken()) { case FUNCTION: - visitFunction(t, n, parent); + visitFunction(t, n); break; case CLASS: visitClass(t, n); @@ -198,7 +193,7 @@ private void checkStyleForPrivateProperties(NodeTraversal t, Node n) { } } - private void visitFunction(NodeTraversal t, Node function, Node parent) { + private void visitFunction(NodeTraversal t, Node function) { JSDocInfo jsDoc = NodeUtil.getBestJSDocInfo(function); checkForAtSignCodePresence(t, function, jsDoc); @@ -214,13 +209,6 @@ private void visitFunction(NodeTraversal t, Node function, Node parent) { } checkReturn(t, function, jsDoc); } - - if (parent.isMemberFunctionDef() - && "constructor".equals(parent.getString()) - && jsDoc != null - && !jsDoc.getVisibility().equals(Visibility.INHERITED)) { - t.report(function, CONSTRUCTOR_DISALLOWED_JSDOC); - } } private void visitClass(NodeTraversal t, Node cls) { diff --git a/test/com/google/javascript/jscomp/lint/CheckJSDocStyleTest.java b/test/com/google/javascript/jscomp/lint/CheckJSDocStyleTest.java index 590479cf115..9c7085bb7b1 100644 --- a/test/com/google/javascript/jscomp/lint/CheckJSDocStyleTest.java +++ b/test/com/google/javascript/jscomp/lint/CheckJSDocStyleTest.java @@ -16,7 +16,6 @@ package com.google.javascript.jscomp.lint; import static com.google.javascript.jscomp.lint.CheckJSDocStyle.CLASS_DISALLOWED_JSDOC; -import static com.google.javascript.jscomp.lint.CheckJSDocStyle.CONSTRUCTOR_DISALLOWED_JSDOC; import static com.google.javascript.jscomp.lint.CheckJSDocStyle.EXTERNS_FILES_SHOULD_BE_ANNOTATED; import static com.google.javascript.jscomp.lint.CheckJSDocStyle.INCORRECT_PARAM_NAME; import static com.google.javascript.jscomp.lint.CheckJSDocStyle.MISSING_JSDOC; @@ -1147,14 +1146,6 @@ public void testValidExternsAnnotation_withES6Modules() { srcs("")); } - @Test - public void testConstructorsDontHaveVisibility() { - testSame(inIIFE("/** @private */ class Foo { constructor() {} }")); - - testWarning( - inIIFE("class Foo { /** @private */ constructor() {} }"), CONSTRUCTOR_DISALLOWED_JSDOC); - } - @Test public void testAtSignCodeDetectedWhenPresent() { testWarning(