A couple small simplifications related to ES6 modules.

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=160142836
google · Jun 26, 2017 · 7db7728 · 7db7728
1 parent 5e037ee
commit 7db7728
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/com/google/javascript/jscomp/Compiler.java b/src/com/google/javascript/jscomp/Compiler.java
@@ -2071,8 +2071,7 @@ private List<CompilerInput> parsePotentialModules(List<CompilerInput> inputsToPr
       // Only process files that are detected as ES6 modules
       if (!options.dependencyOptions.shouldPruneDependencies()
           || !JsFileParser.isSupported()
-          || (input.getLoadFlags().containsKey("module")
-              && input.getLoadFlags().get("module").equals("es6"))) {
+          || "es6".equals(input.getLoadFlags().get("module"))) {
         filteredInputs.add(input);
       }
     }

diff --git a/src/com/google/javascript/jscomp/CompilerInput.java b/src/com/google/javascript/jscomp/CompilerInput.java
@@ -393,14 +393,10 @@ private static <T> Set<T> concat(Iterable<T> first, Iterable<T> second) {
   }
 
   ModulePath getPath() {
-    return getPath(getName());
-  }
-
-  private ModulePath getPath(String name) {
     if (modulePath == null) {
       // Note: this method will not be called until Es6RewriteModules
       // (and similar), after Compiler.moduleLoader is already set.
-      this.modulePath = compiler.getModuleLoader().resolve(name);
+      this.modulePath = compiler.getModuleLoader().resolve(getName());
     }
     return modulePath;
   }