Change the default input language to ES 2017 to match the command-lin…

…e default. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=173967724
google · Oct 31, 2017 · bb5b170 · bb5b170
1 parent aae1c12
commit bb5b170
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 107 deletions.
diff --git a/src/com/google/javascript/jscomp/CompilerOptions.java b/src/com/google/javascript/jscomp/CompilerOptions.java
@@ -1207,7 +1207,7 @@ public void setPrintConfig(boolean printConfig) {
    */
   public CompilerOptions() {
     // Accepted language
-    languageIn = LanguageMode.ECMASCRIPT_2017;
+    languageIn = LanguageMode.ECMASCRIPT3;
     languageOut = LanguageMode.NO_TRANSPILE;
 
     // Which environment to use

diff --git a/src/com/google/javascript/jscomp/ComposeWarningsGuard.java b/src/com/google/javascript/jscomp/ComposeWarningsGuard.java
@@ -46,7 +46,8 @@ public class ComposeWarningsGuard extends WarningsGuard {
   private final Map<WarningsGuard, Integer> orderOfAddition = new HashMap<>();
   private int numberOfAdds = 0;
 
-  private final Comparator<WarningsGuard> guardComparator = new GuardComparator(orderOfAddition);
+  private final Comparator<WarningsGuard> guardComparator =
+      new GuardComparator(orderOfAddition);
   private boolean demoteErrors = false;
 
   private static class GuardComparator
@@ -72,7 +73,8 @@ public int compare(WarningsGuard a, WarningsGuard b) {
   }
 
   // The order that the guards are applied in.
-  private final TreeSet<WarningsGuard> guards = new TreeSet<>(guardComparator);
+  private final TreeSet<WarningsGuard> guards =
+      new TreeSet<>(guardComparator);
 
   public ComposeWarningsGuard(List<WarningsGuard> guards) {
     addGuards(guards);

diff --git a/test/com/google/debugging/sourcemap/SourceMapTestCase.java b/test/com/google/debugging/sourcemap/SourceMapTestCase.java
@@ -22,7 +22,6 @@
 import com.google.debugging.sourcemap.proto.Mapping.OriginalMapping;
 import com.google.javascript.jscomp.Compiler;
 import com.google.javascript.jscomp.CompilerOptions;
-import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import com.google.javascript.jscomp.Result;
 import com.google.javascript.jscomp.SourceFile;
 import com.google.javascript.jscomp.SourceMap;
@@ -263,7 +262,6 @@ protected RunResult compile(String js, String fileName) {
 
   protected CompilerOptions getCompilerOptions() {
     CompilerOptions options = new CompilerOptions();
-    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setSourceMapOutputPath("testcode_source_map.out");
     options.setSourceMapFormat(getSourceMapFormat());
     options.setSourceMapDetailLevel(detailLevel);

diff --git a/test/com/google/javascript/jscomp/BaseReplaceScriptTestCase.java b/test/com/google/javascript/jscomp/BaseReplaceScriptTestCase.java
@@ -22,7 +22,6 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
@@ -68,7 +67,6 @@ protected void setUp() throws Exception {
    */
   protected CompilerOptions getOptions(DiagnosticGroup... typesOfGuard) {
     CompilerOptions options = new CompilerOptions();
-    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.declaredGlobalExternsOnWindow = false;
     options.setClosurePass(true);
     // These are the options that are always on in JsDev which is the only

diff --git a/test/com/google/javascript/jscomp/ClosurePrimitivesIntegrationTest.java b/test/com/google/javascript/jscomp/ClosurePrimitivesIntegrationTest.java
@@ -15,7 +15,6 @@
  */
 package com.google.javascript.jscomp;
 
-import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 
 /**
  * Tests that the property renaming primitive goog.reflect.objectProperty
@@ -146,8 +145,6 @@ public void testStaticPropRenameSimple() {
   @Override
   protected CompilerOptions createCompilerOptions() {
     CompilerOptions options = new CompilerOptions();
-    options.setLanguageIn(LanguageMode.ECMASCRIPT_2017);
-    options.setLanguageOut(LanguageMode.ECMASCRIPT3);
     if (useSimpleMode) {
       CompilationLevel.SIMPLE_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
     } else {

diff --git a/test/com/google/javascript/jscomp/CommonJSIntegrationTest.java b/test/com/google/javascript/jscomp/CommonJSIntegrationTest.java
@@ -16,7 +16,6 @@
 
 package com.google.javascript.jscomp;
 
-import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import com.google.javascript.jscomp.deps.ModuleLoader;
 
 /**
@@ -315,7 +314,6 @@ public void testCrossModuleSubclass6() {
   @Override
   protected CompilerOptions createCompilerOptions() {
     CompilerOptions options = new CompilerOptions();
-    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setCodingConvention(new GoogleCodingConvention());
     WarningLevel.VERBOSE.setOptionsForWarningLevel(options);
     options.setProcessCommonJSModules(true);

diff --git a/test/com/google/javascript/jscomp/CompilerTest.java b/test/com/google/javascript/jscomp/CompilerTest.java
@@ -114,7 +114,6 @@ public void testPrintExterns() {
     List<SourceFile> externs =
         ImmutableList.of(SourceFile.fromCode("extern", "function alert(x) {}"));
     CompilerOptions options = new CompilerOptions();
-    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setPrintExterns(true);
     Compiler compiler = new Compiler();
     compiler.init(externs, ImmutableList.<SourceFile>of(), options);
@@ -132,7 +131,8 @@ public void testLocalUndefined() throws Exception {
     //
     // This test is just to make sure that the compiler doesn't crash.
     CompilerOptions options = new CompilerOptions();
-    CompilationLevel.SIMPLE_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
+    CompilationLevel.SIMPLE_OPTIMIZATIONS.setOptionsForCompilationLevel(
+        options);
     Compiler compiler = new Compiler();
     SourceFile externs = SourceFile.fromCode("externs.js", "");
     SourceFile input = SourceFile.fromCode("input.js",
@@ -318,7 +318,6 @@ public void testApplyInputSourceMaps() throws Exception {
             originalSourcePosition));
 
     CompilerOptions options = new CompilerOptions();
-    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.sourceMapOutputPath = "fake/source_map_path.js.map";
     options.inputSourceMaps = inputSourceMaps;
     options.applyInputSourceMaps = true;
@@ -875,9 +874,6 @@ static Result test(String js, String expected, DiagnosticType error) {
 
   public void testConsecutiveSemicolons() {
     Compiler compiler = new Compiler();
-    CompilerOptions options = new CompilerOptions();
-    options.setEmitUseStrict(false);
-    compiler.initOptions(options);
     String js = "if(a);";
     Node n = compiler.parseTestCode(js);
     Compiler.CodeBuilder cb = new Compiler.CodeBuilder();
@@ -918,7 +914,6 @@ public void testWarningsFiltering() {
   public void testExportSymbolReservesNamesForRenameVars() {
     Compiler compiler = new Compiler();
     CompilerOptions options = new CompilerOptions();
-    options.setEmitUseStrict(false);
     options.setClosurePass(true);
     options.setVariableRenaming(VariableRenamingPolicy.ALL);
 
@@ -928,13 +923,12 @@ public void testExportSymbolReservesNamesForRenameVars() {
     Result result = compiler.compile(EMPTY_EXTERNS, inputs, options);
 
     assertTrue(result.success);
-    assertThat(compiler.toSource()).isEqualTo("var b;var c;b.exportSymbol(\"a\",c);");
+    assertEquals("var b;var c;b.exportSymbol(\"a\",c);", compiler.toSource());
   }
 
   public void testGenerateExportsReservesNames() {
     Compiler compiler = new Compiler();
     CompilerOptions options = new CompilerOptions();
-    options.setEmitUseStrict(false);
     options.setClosurePass(true);
     options.setVariableRenaming(VariableRenamingPolicy.ALL);
     options.setGenerateExports(true);
@@ -945,7 +939,8 @@ public void testGenerateExportsReservesNames() {
     Result result = compiler.compile(EMPTY_EXTERNS, inputs, options);
 
     assertTrue(result.success);
-    assertThat(compiler.toSource()).isEqualTo("var b;var c={};b.exportSymbol(\"a\",c);");
+    assertEquals("var b;var c={};b.exportSymbol(\"a\",c);",
+        compiler.toSource());
   }
 
   private static final DiagnosticType TEST_ERROR =
@@ -1437,12 +1432,9 @@ public Class<String> getType() {
   }
 
   private static CompilerOptions createNewFlagBasedOptions() {
-    CompilerOptions options = new CompilerOptions();
-    CompilationLevel.ADVANCED_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
-    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
-    options.setLanguageOut(LanguageMode.ECMASCRIPT3);
-    options.setEmitUseStrict(false);
-    return options;
+    CompilerOptions opt = new CompilerOptions();
+    CompilationLevel.ADVANCED_OPTIMIZATIONS.setOptionsForCompilationLevel(opt);
+    return opt;
   }
 
   private static byte[] serialize(Object obj) throws IOException {

diff --git a/test/com/google/javascript/jscomp/GatherSideEffectSubexpressionsCallbackTest.java b/test/com/google/javascript/jscomp/GatherSideEffectSubexpressionsCallbackTest.java
@@ -160,9 +160,6 @@ private Node getSideEffectsHookNode() {
   private void checkKeepSimplifiedShortCircuitExpr(Node root,
                                                    List<String> expected) {
     Compiler compiler = new Compiler();
-    CompilerOptions options = new CompilerOptions();
-    options.setEmitUseStrict(false);
-    compiler.initOptions(options);
     List<Node> replacements = new ArrayList<>();
     GetReplacementSideEffectSubexpressions accumulator =
         new GetReplacementSideEffectSubexpressions(compiler, replacements);
@@ -180,9 +177,6 @@ private void checkKeepSimplifiedHookExpr(Node root,
                                            boolean elseHasSideEffects,
                                            List<String> expected) {
     Compiler compiler = new Compiler();
-    CompilerOptions options = new CompilerOptions();
-    options.setEmitUseStrict(false);
-    compiler.initOptions(options);
     List<Node> replacements = new ArrayList<>();
     GetReplacementSideEffectSubexpressions accumulator =
         new GetReplacementSideEffectSubexpressions(compiler, replacements);

diff --git a/test/com/google/javascript/jscomp/GoldenFileComparer.java b/test/com/google/javascript/jscomp/GoldenFileComparer.java
@@ -20,7 +20,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Files;
-import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -108,7 +107,6 @@ private static void compileAndCompare(
    */
   public static CompilerOptions options() {
     CompilerOptions options = new CompilerOptions();
-    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     // Instrumentation done
     options.setPrettyPrint(true);
     return options;