Skip to content

Commit

Permalink
Minor ES_2018 corrections in DefaultPassConfig.
Browse files Browse the repository at this point in the history
1. Correct name of the pass that transpiles object spread to no longer mention object rest.
2. Run async generator rewriting for ES_2018, not ES_NEXT.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=209607461
  • Loading branch information
brad4d authored and blickly committed Aug 27, 2018
1 parent 722fccb commit f56edb6
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/com/google/javascript/jscomp/TranspilationPasses.java
Expand Up @@ -79,12 +79,9 @@ static void addPreTypecheckTranspilationPasses(
markUntranspilableFeaturesAsRemoved( markUntranspilableFeaturesAsRemoved(
options.getLanguageIn().toFeatureSet(), options.getOutputFeatureSet())); options.getLanguageIn().toFeatureSet(), options.getOutputFeatureSet()));


if (options.needsTranspilationFrom(ES_NEXT)) {
passes.add(rewriteAsyncIteration);
}

if (options.needsTranspilationFrom(ES2018)) { if (options.needsTranspilationFrom(ES2018)) {
passes.add(rewriteObjRestSpread); passes.add(rewriteAsyncIteration);
passes.add(rewriteObjectSpread);
} }


if (options.needsTranspilationFrom(ES8)) { if (options.needsTranspilationFrom(ES8)) {
Expand Down Expand Up @@ -112,6 +109,9 @@ static void addPreTypecheckTranspilationPasses(
passes.add(es6RewriteArrowFunction); passes.add(es6RewriteArrowFunction);
passes.add(es6ExtractClasses); passes.add(es6ExtractClasses);
passes.add(es6RewriteClass); passes.add(es6RewriteClass);
// TODO(bradfordcsmith): Inject runtime libraries now includes async generator support
// (ES_2018), so this should be moved earlier and possibly run unconditionally by this
// method, since it will itself detect what it needs to inject or doesn't need to inject.
passes.add(es6InjectRuntimeLibraries); passes.add(es6InjectRuntimeLibraries);


if (!options.checksOnly) { if (!options.checksOnly) {
Expand Down Expand Up @@ -241,8 +241,8 @@ protected FeatureSet featureSet() {
} }
}; };


private static final PassFactory rewriteObjRestSpread = private static final PassFactory rewriteObjectSpread =
new HotSwapPassFactory("rewriteObjRestSpread") { new HotSwapPassFactory("rewriteObjectSpread") {
@Override @Override
protected HotSwapCompilerPass create(final AbstractCompiler compiler) { protected HotSwapCompilerPass create(final AbstractCompiler compiler) {
return new RewriteObjectSpread(compiler); return new RewriteObjectSpread(compiler);
Expand Down

0 comments on commit f56edb6

Please sign in to comment.