Skip to content

Commit

Permalink
Automated rollback.
Browse files Browse the repository at this point in the history
*** Original change description ***

Annotate CodingConvention as immutable since it's used in an enum.

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=153657935
  • Loading branch information
tbreisacher authored and dimvar committed Apr 20, 2017
1 parent f23c5be commit 64d9a7c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 16 deletions.
7 changes: 3 additions & 4 deletions src/com/google/javascript/jscomp/ChromeCodingConvention.java
Expand Up @@ -17,16 +17,15 @@


import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.Immutable;
import com.google.javascript.jscomp.ClosureCodingConvention.AssertInstanceofSpec; import com.google.javascript.jscomp.ClosureCodingConvention.AssertInstanceofSpec;
import com.google.javascript.rhino.Node; import com.google.javascript.rhino.Node;
import com.google.javascript.rhino.jstype.FunctionType; import com.google.javascript.rhino.jstype.FunctionType;
import com.google.javascript.rhino.jstype.ObjectType; import com.google.javascript.rhino.jstype.ObjectType;
import java.util.Collection; import java.util.Collection;
import java.util.Set;


@Immutable public class ChromeCodingConvention extends CodingConventions.Proxy {
public final class ChromeCodingConvention extends CodingConventions.Proxy { private final Set<String> indirectlyDeclaredProperties;
private final ImmutableSet<String> indirectlyDeclaredProperties;


public ChromeCodingConvention() { public ChromeCodingConvention() {
this(CodingConventions.getDefault()); this(CodingConventions.getDefault());
Expand Down
7 changes: 3 additions & 4 deletions src/com/google/javascript/jscomp/ClosureCodingConvention.java
Expand Up @@ -19,7 +19,6 @@
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.Immutable;
import com.google.javascript.jscomp.newtypes.DeclaredTypeRegistry; import com.google.javascript.jscomp.newtypes.DeclaredTypeRegistry;
import com.google.javascript.jscomp.newtypes.JSType; import com.google.javascript.jscomp.newtypes.JSType;
import com.google.javascript.jscomp.newtypes.QualifiedName; import com.google.javascript.jscomp.newtypes.QualifiedName;
Expand All @@ -33,12 +32,12 @@
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Set;


/** /**
* This describes the Closure-specific JavaScript coding conventions. * This describes the Closure-specific JavaScript coding conventions.
* *
*/ */
@Immutable
public final class ClosureCodingConvention extends CodingConventions.Proxy { public final class ClosureCodingConvention extends CodingConventions.Proxy {


private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
Expand All @@ -47,7 +46,7 @@ public final class ClosureCodingConvention extends CodingConventions.Proxy {
"JSC_REFLECT_OBJECTLIT_EXPECTED", "JSC_REFLECT_OBJECTLIT_EXPECTED",
"Object literal expected as second argument"); "Object literal expected as second argument");


private final ImmutableSet<String> indirectlyDeclaredProperties; private final Set<String> indirectlyDeclaredProperties;


public ClosureCodingConvention() { public ClosureCodingConvention() {
this(CodingConventions.getDefault()); this(CodingConventions.getDefault());
Expand Down Expand Up @@ -346,7 +345,7 @@ public boolean isAliasingGlobalThis(Node n) {
return CodingConventions.isAliasingGlobalThis(this, n); return CodingConventions.isAliasingGlobalThis(this, n);
} }


private final ImmutableSet<String> propertyTestFunctions = ImmutableSet.of( private final Set<String> propertyTestFunctions = ImmutableSet.of(
"goog.isDef", "goog.isNull", "goog.isDefAndNotNull", "goog.isDef", "goog.isNull", "goog.isDefAndNotNull",
"goog.isString", "goog.isNumber", "goog.isBoolean", "goog.isString", "goog.isNumber", "goog.isBoolean",
"goog.isFunction", "goog.isArray", "goog.isArrayLike", "goog.isObject"); "goog.isFunction", "goog.isArray", "goog.isArrayLike", "goog.isObject");
Expand Down
2 changes: 0 additions & 2 deletions src/com/google/javascript/jscomp/CodingConvention.java
Expand Up @@ -15,7 +15,6 @@
*/ */
package com.google.javascript.jscomp; package com.google.javascript.jscomp;


import com.google.errorprone.annotations.Immutable;
import com.google.javascript.jscomp.newtypes.DeclaredTypeRegistry; import com.google.javascript.jscomp.newtypes.DeclaredTypeRegistry;
import com.google.javascript.jscomp.newtypes.JSType; import com.google.javascript.jscomp.newtypes.JSType;
import com.google.javascript.jscomp.newtypes.RawNominalType; import com.google.javascript.jscomp.newtypes.RawNominalType;
Expand All @@ -36,7 +35,6 @@
* Compiler for a specific team/company. * Compiler for a specific team/company.
* *
*/ */
@Immutable
public interface CodingConvention extends Serializable { public interface CodingConvention extends Serializable {


/** /**
Expand Down
3 changes: 0 additions & 3 deletions src/com/google/javascript/jscomp/CodingConventions.java
Expand Up @@ -18,7 +18,6 @@


import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import com.google.javascript.jscomp.newtypes.JSType; import com.google.javascript.jscomp.newtypes.JSType;
import com.google.javascript.jscomp.newtypes.RawNominalType; import com.google.javascript.jscomp.newtypes.RawNominalType;
import com.google.javascript.rhino.Node; import com.google.javascript.rhino.Node;
Expand Down Expand Up @@ -84,7 +83,6 @@ static boolean isAliasingGlobalThis(CodingConvention convention, Node n) {
* coding convention by creating a jQueryCodingConvention that delegates * coding convention by creating a jQueryCodingConvention that delegates
* to a ClosureCodingConvention that delegates to a DefaultCodingConvention. * to a ClosureCodingConvention that delegates to a DefaultCodingConvention.
*/ */
@Immutable
public static class Proxy implements CodingConvention { public static class Proxy implements CodingConvention {


protected final CodingConvention nextConvention; protected final CodingConvention nextConvention;
Expand Down Expand Up @@ -332,7 +330,6 @@ public Collection<String> getIndirectlyDeclaredProperties() {
* The default coding convention. * The default coding convention.
* Should be at the bottom of all proxy chains. * Should be at the bottom of all proxy chains.
*/ */
@Immutable
private static class DefaultCodingConvention implements CodingConvention { private static class DefaultCodingConvention implements CodingConvention {


private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
Expand Down
4 changes: 1 addition & 3 deletions src/com/google/javascript/jscomp/GoogleCodingConvention.java
Expand Up @@ -16,7 +16,6 @@


package com.google.javascript.jscomp; package com.google.javascript.jscomp;


import com.google.errorprone.annotations.Immutable;
import com.google.javascript.rhino.Node; import com.google.javascript.rhino.Node;
import com.google.javascript.rhino.StaticSourceFile; import com.google.javascript.rhino.StaticSourceFile;
import java.util.regex.Matcher; import java.util.regex.Matcher;
Expand All @@ -27,8 +26,7 @@
* Within Google, variable names are semantically significant. * Within Google, variable names are semantically significant.
* *
*/ */
@Immutable public class GoogleCodingConvention extends CodingConventions.Proxy {
public final class GoogleCodingConvention extends CodingConventions.Proxy {


private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


Expand Down

0 comments on commit 64d9a7c

Please sign in to comment.