Remove unnecessary parser option now that length is always preserved.

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=129640171
google · Aug 8, 2016 · 283d816 · 283d816
1 parent 670046d
commit 283d816
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 30 deletions.
diff --git a/src/com/google/javascript/jscomp/Compiler.java b/src/com/google/javascript/jscomp/Compiler.java
@@ -2208,9 +2208,6 @@ protected Config createConfig(Config.LanguageMode mode) {
         ParserRunner.createConfig(
             mode,
             options.isParseJsDocDocumentation(),
-            options.preservesDetailedSourceInfo()
-                ? Config.SourceLocationInformation.PRESERVE
-                : Config.SourceLocationInformation.DISCARD,
             options.canContinueAfterErrors()
                 ? Config.RunMode.KEEP_GOING
                 : Config.RunMode.STOP_AFTER_ERROR,

diff --git a/src/com/google/javascript/jscomp/Linter.java b/src/com/google/javascript/jscomp/Linter.java
@@ -63,7 +63,6 @@ private static void lint(Path path, boolean fix) throws IOException {
     // in LintPassConfig can all handle untranspiled ES6.
     options.setSkipTranspilationAndCrash(true);
 
-    options.setPreserveDetailedSourceInfo(true);
     options.setParseJsDocDocumentation(INCLUDE_DESCRIPTIONS_WITH_WHITESPACE);
     options.setCodingConvention(new GoogleCodingConvention());
 

diff --git a/src/com/google/javascript/jscomp/gwt/client/JsfileParser.java b/src/com/google/javascript/jscomp/gwt/client/JsfileParser.java
@@ -216,7 +216,6 @@ private static FileInfo parse(String code, String filename, @Nullable Reporter r
             // TODO(sdh): ES6_STRICT, with a non-strict fallback - then give warnings.
             Config.LanguageMode.ECMASCRIPT6,
             Config.JsDocParsing.INCLUDE_DESCRIPTIONS_NO_WHITESPACE,
-            Config.SourceLocationInformation.PRESERVE,
             Config.RunMode.KEEP_GOING,
             /* extraAnnotationNames */ ImmutableSet.<String>of());
 

diff --git a/src/com/google/javascript/jscomp/parsing/Config.java b/src/com/google/javascript/jscomp/parsing/Config.java
@@ -89,15 +89,6 @@ boolean shouldParseDescriptions() {
   }
   final JsDocParsing parseJsDocDocumentation;
 
-  /**
-   * Whether to keep detailed source location information such as the exact length of every node.
-   */
-  public enum SourceLocationInformation {
-    DISCARD,
-    PRESERVE,
-  }
-  final SourceLocationInformation preserveDetailedSourceInfo;
-
   /**
    * Whether to keep going after encountering a parse error.
    */
@@ -127,7 +118,6 @@ public enum RunMode {
     this(
         annotationWhitelist,
         JsDocParsing.TYPES_ONLY,
-        SourceLocationInformation.DISCARD,
         RunMode.STOP_AFTER_ERROR,
         suppressionNames,
         languageMode);
@@ -136,13 +126,11 @@ public enum RunMode {
   Config(
       Set<String> annotationWhitelist,
       JsDocParsing parseJsDocDocumentation,
-      SourceLocationInformation preserveDetailedSourceInfo,
       RunMode keepGoing,
       Set<String> suppressionNames,
       LanguageMode languageMode) {
     this.annotationNames = buildAnnotationNames(annotationWhitelist);
     this.parseJsDocDocumentation = parseJsDocDocumentation;
-    this.preserveDetailedSourceInfo = preserveDetailedSourceInfo;
     this.keepGoing = keepGoing;
     this.suppressionNames = ImmutableSet.copyOf(suppressionNames);
     this.languageMode = languageMode;

diff --git a/src/com/google/javascript/jscomp/parsing/ParserRunner.java b/src/com/google/javascript/jscomp/parsing/ParserRunner.java
@@ -22,7 +22,6 @@
 import com.google.javascript.jscomp.parsing.Config.JsDocParsing;
 import com.google.javascript.jscomp.parsing.Config.LanguageMode;
 import com.google.javascript.jscomp.parsing.Config.RunMode;
-import com.google.javascript.jscomp.parsing.Config.SourceLocationInformation;
 import com.google.javascript.jscomp.parsing.parser.FeatureSet;
 import com.google.javascript.jscomp.parsing.parser.Parser;
 import com.google.javascript.jscomp.parsing.parser.Parser.Config.Mode;
@@ -59,15 +58,13 @@ public static Config createConfig(LanguageMode languageMode,
     return createConfig(
         languageMode,
         JsDocParsing.TYPES_ONLY,
-        SourceLocationInformation.DISCARD,
         RunMode.STOP_AFTER_ERROR,
         extraAnnotationNames);
   }
 
   public static Config createConfig(
       LanguageMode languageMode,
       JsDocParsing jsdocParsingMode,
-      SourceLocationInformation sourceLocationInfo,
       RunMode runMode,
       Set<String> extraAnnotationNames) {
 
@@ -82,7 +79,6 @@ public static Config createConfig(
     return new Config(
         effectiveAnnotationNames,
         jsdocParsingMode,
-        sourceLocationInfo,
         runMode,
         suppressionNames,
         languageMode);
@@ -133,7 +129,7 @@ public static ParseResult parse(
       root.setIsSyntheticBlock(true);
       root.putProp(Node.FEATURE_SET, features);
 
-      if (config.preserveDetailedSourceInfo == Config.SourceLocationInformation.PRESERVE) {
+      if (config.parseJsDocDocumentation.shouldParseDescriptions()) {
         comments = p.getComments();
       }
     }

diff --git a/src/com/google/javascript/refactoring/RefactoringDriver.java b/src/com/google/javascript/refactoring/RefactoringDriver.java
@@ -93,7 +93,6 @@ public static CompilerOptions getCompilerOptions() {
 
     options.setChecksOnly(true);
     options.setContinueAfterErrors(true);
-    options.setPreserveDetailedSourceInfo(true);
     options.setParseJsDocDocumentation(Config.JsDocParsing.INCLUDE_DESCRIPTIONS_NO_WHITESPACE);
     options.setCheckSuspiciousCode(true);
     options.setCheckSymbols(true);

diff --git a/test/com/google/javascript/jscomp/BaseReplaceScriptTestCase.java b/test/com/google/javascript/jscomp/BaseReplaceScriptTestCase.java
@@ -51,7 +51,6 @@ protected CompilerOptions getOptions(DiagnosticGroup... typesOfGuard) {
     // use-case for replaceScript currently.
     options.setInferTypes(true);
     options.setAllowHotswapReplaceScript(true);
-    options.setPreserveDetailedSourceInfo(true);
     options.setChecksOnly(true);
     options.setContinueAfterErrors(true);
 

diff --git a/test/com/google/javascript/jscomp/lint/CheckMissingSemicolonTest.java b/test/com/google/javascript/jscomp/lint/CheckMissingSemicolonTest.java
@@ -32,7 +32,6 @@ public CompilerPass getProcessor(Compiler compiler) {
   protected CompilerOptions getOptions(CompilerOptions options) {
     super.getOptions(options);
     options.setWarningLevel(DiagnosticGroups.LINT_CHECKS, CheckLevel.WARNING);
-    options.setPreserveDetailedSourceInfo(true);
     return options;
   }
 

diff --git a/test/com/google/javascript/jscomp/parsing/AttachJsdocsTest.java b/test/com/google/javascript/jscomp/parsing/AttachJsdocsTest.java
@@ -787,7 +787,6 @@ private Node parse(String source, String... warnings) {
         ParserRunner.createConfig(
             mode,
             Config.JsDocParsing.INCLUDE_DESCRIPTIONS_NO_WHITESPACE,
-            Config.SourceLocationInformation.PRESERVE,
             Config.RunMode.KEEP_GOING,
             null);
     Node script = ParserRunner.parse(

diff --git a/test/com/google/javascript/jscomp/parsing/JsDocInfoParserTest.java b/test/com/google/javascript/jscomp/parsing/JsDocInfoParserTest.java
@@ -25,7 +25,6 @@
 import com.google.javascript.jscomp.parsing.Config.JsDocParsing;
 import com.google.javascript.jscomp.parsing.Config.LanguageMode;
 import com.google.javascript.jscomp.parsing.Config.RunMode;
-import com.google.javascript.jscomp.parsing.Config.SourceLocationInformation;
 import com.google.javascript.jscomp.parsing.ParserRunner.ParseResult;
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.JSDocInfo.Marker;
@@ -4492,7 +4491,6 @@ private Node parseFull(String code, String... warnings) {
         new Config(
             extraAnnotations,
             JsDocParsing.INCLUDE_DESCRIPTIONS_NO_WHITESPACE,
-            SourceLocationInformation.PRESERVE,
             RunMode.KEEP_GOING,
             extraSuppressions,
             LanguageMode.ECMASCRIPT3);
@@ -4543,7 +4541,6 @@ private JSDocInfo parse(String comment, JsDocParsing parseDocumentation,
         new Config(
             extraAnnotations,
             parseDocumentation,
-            SourceLocationInformation.DISCARD,
             RunMode.STOP_AFTER_ERROR,
             extraSuppressions,
             LanguageMode.ECMASCRIPT3);

diff --git a/test/com/google/javascript/jscomp/parsing/ParserTest.java b/test/com/google/javascript/jscomp/parsing/ParserTest.java
@@ -3363,7 +3363,6 @@ private Config createConfig() {
       return ParserRunner.createConfig(
           mode,
           Config.JsDocParsing.INCLUDE_DESCRIPTIONS_NO_WHITESPACE,
-          Config.SourceLocationInformation.PRESERVE,
           Config.RunMode.KEEP_GOING,
           null);
     } else {