From 311397bdfd1a0183fd6984a1522205ea426296f5 Mon Sep 17 00:00:00 2001 From: heeba Date: Tue, 30 May 2017 15:56:04 -0700 Subject: [PATCH] Renaming files from "ProcessEs6Modules" to "Es6RewriteModules" to improve file organization/readability ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=157524318 --- src/com/google/javascript/jscomp/Compiler.java | 2 +- src/com/google/javascript/jscomp/CompilerInput.java | 2 +- .../{ProcessEs6Modules.java => Es6RewriteModules.java} | 8 ++++---- ...cessEs6ModulesTest.java => Es6RewriteModulesTest.java} | 8 ++++---- .../javascript/jscomp/ProcessCommonJSModulesTest.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) rename src/com/google/javascript/jscomp/{ProcessEs6Modules.java => Es6RewriteModules.java} (98%) rename test/com/google/javascript/jscomp/{ProcessEs6ModulesTest.java => Es6RewriteModulesTest.java} (99%) diff --git a/src/com/google/javascript/jscomp/Compiler.java b/src/com/google/javascript/jscomp/Compiler.java index 98a45f3a859..0019523d2bb 100644 --- a/src/com/google/javascript/jscomp/Compiler.java +++ b/src/com/google/javascript/jscomp/Compiler.java @@ -2086,7 +2086,7 @@ void processEs6Modules(List inputsToProcess, boolean forceRewrite if (root == null) { continue; } - new ProcessEs6Modules(this).processFile(root, forceRewrite); + new Es6RewriteModules(this).processFile(root, forceRewrite); } setFeatureSet(featureSet.withoutModules()); diff --git a/src/com/google/javascript/jscomp/CompilerInput.java b/src/com/google/javascript/jscomp/CompilerInput.java index 37b4c59241b..6f6ca15ecb1 100644 --- a/src/com/google/javascript/jscomp/CompilerInput.java +++ b/src/com/google/javascript/jscomp/CompilerInput.java @@ -389,7 +389,7 @@ private static Set concat(Iterable first, Iterable second) { ModulePath getPath() { if (modulePath == null) { - // Note: this method will not be called until ProcessEs6Modules + // Note: this method will not be called until Es6RewriteModules // (and similar), after Compiler.moduleLoader is already set. this.modulePath = compiler.getModuleLoader().resolve(getName()); } diff --git a/src/com/google/javascript/jscomp/ProcessEs6Modules.java b/src/com/google/javascript/jscomp/Es6RewriteModules.java similarity index 98% rename from src/com/google/javascript/jscomp/ProcessEs6Modules.java rename to src/com/google/javascript/jscomp/Es6RewriteModules.java index 7df8cbfc8ca..fd8a28bcaab 100644 --- a/src/com/google/javascript/jscomp/ProcessEs6Modules.java +++ b/src/com/google/javascript/jscomp/Es6RewriteModules.java @@ -40,7 +40,7 @@ * * @author moz@google.com (Michael Zhou) */ -public final class ProcessEs6Modules extends AbstractPostOrderCallback { +public final class Es6RewriteModules extends AbstractPostOrderCallback { private static final String DEFAULT_EXPORT_NAME = "$jscompDefaultExport"; static final DiagnosticType LHS_OF_GOOG_REQUIRE_MUST_BE_CONST = @@ -82,10 +82,10 @@ public final class ProcessEs6Modules extends AbstractPostOrderCallback { private Node googRequireInsertSpot; /** - * Creates a new ProcessEs6Modules instance which can be used to rewrite + * Creates a new Es6RewriteModules instance which can be used to rewrite * ES6 modules to a concatenable form. */ - public ProcessEs6Modules(Compiler compiler) { + public Es6RewriteModules(Compiler compiler) { this.compiler = compiler; } @@ -359,7 +359,7 @@ private void visitScript(NodeTraversal t, Node script) { ClosureRewriteModule.checkAndSetStrictModeDirective(t, script); Preconditions.checkArgument(scriptNodeCount == 1, - "ProcessEs6Modules supports only one invocation per " + "Es6RewriteModules supports only one invocation per " + "CompilerInput / script node"); // rewriteRequires is here (rather than being part of the main visit() diff --git a/test/com/google/javascript/jscomp/ProcessEs6ModulesTest.java b/test/com/google/javascript/jscomp/Es6RewriteModulesTest.java similarity index 99% rename from test/com/google/javascript/jscomp/ProcessEs6ModulesTest.java rename to test/com/google/javascript/jscomp/Es6RewriteModulesTest.java index 97f89541560..0687b7452c5 100644 --- a/test/com/google/javascript/jscomp/ProcessEs6ModulesTest.java +++ b/test/com/google/javascript/jscomp/Es6RewriteModulesTest.java @@ -16,17 +16,17 @@ package com.google.javascript.jscomp; -import static com.google.javascript.jscomp.ProcessEs6Modules.LHS_OF_GOOG_REQUIRE_MUST_BE_CONST; +import static com.google.javascript.jscomp.Es6RewriteModules.LHS_OF_GOOG_REQUIRE_MUST_BE_CONST; import com.google.common.collect.ImmutableList; import com.google.javascript.jscomp.CompilerOptions.LanguageMode; import com.google.javascript.rhino.Node; /** - * Unit tests for {@link ProcessEs6Modules} + * Unit tests for {@link Es6RewriteModules} */ -public final class ProcessEs6ModulesTest extends CompilerTestCase { +public final class Es6RewriteModulesTest extends CompilerTestCase { private ImmutableList moduleRoots = null; @Override @@ -624,7 +624,7 @@ public void testNamespaceImports() { "var foo$$module$testcode = new other.Foo();")); testModules("import * as Foo from 'goog:other.Foo';", - ProcessEs6Modules.NAMESPACE_IMPORT_CANNOT_USE_STAR); + Es6RewriteModules.NAMESPACE_IMPORT_CANNOT_USE_STAR); } public void testObjectDestructuringAndObjLitShorthand() { diff --git a/test/com/google/javascript/jscomp/ProcessCommonJSModulesTest.java b/test/com/google/javascript/jscomp/ProcessCommonJSModulesTest.java index d5fd3adb479..cea75751586 100644 --- a/test/com/google/javascript/jscomp/ProcessCommonJSModulesTest.java +++ b/test/com/google/javascript/jscomp/ProcessCommonJSModulesTest.java @@ -56,7 +56,7 @@ protected int getNumRepetitions() { } void testModules(String input, String expected) { - ProcessEs6ModulesTest.testModules(this, input, expected); + Es6RewriteModulesTest.testModules(this, input, expected); } public void testWithoutExports() {