Refactor CompilerOptions usages to use getter/setters, not fields

PiperOrigin-RevId: 858648457

Author: lauraharker

src/com/google/javascript/jscomp/AbstractCommandLineRunner.java

@@ -320,7 +320,7 @@ protected void setRunOptions(CompilerOptions options) throws IOException {
     DiagnosticGroups diagnosticGroups = getDiagnosticGroups();
 
     if (config.shouldSaveAfterStage1() || config.shouldContinueCompilation()) {
-      if (options.checksOnly) {
+      if (options.isChecksOnly()) {
         throw new FlagUsageException(
             "checks_only mode is incompatible with multi-stage compilation");
       }
@@ -361,12 +361,13 @@ protected void setRunOptions(CompilerOptions options) throws IOException {
       options.setDependencyOptions(config.dependencyOptions);
     }
 
-    options.devMode = config.jscompDevMode;
+    options.setDevMode(config.jscompDevMode);
     options.setCodingConvention(config.codingConvention);
     options.setSummaryDetailLevel(config.summaryDetailLevel);
     options.setTrustedStrings(true);
 
-    legacyOutputCharset = options.outputCharset = getLegacyOutputCharset();
+    legacyOutputCharset = getLegacyOutputCharset();
+    options.setOutputCharset(legacyOutputCharset);
     outputCharset2 = getOutputCharset2();
     inputCharset = getInputCharset();
 
@@ -395,26 +396,26 @@ protected void setRunOptions(CompilerOptions options) throws IOException {
     } else if (isOutputInJson()) {
       options.setSourceMapOutputPath("%outname%");
     }
-    options.sourceMapDetailLevel = config.sourceMapDetailLevel;
-    options.sourceMapFormat = config.sourceMapFormat;
-    options.sourceMapLocationMappings = config.sourceMapLocationMappings;
-    options.parseInlineSourceMaps = config.parseInlineSourceMaps;
-    options.applyInputSourceMaps = config.applyInputSourceMaps;
+    options.setSourceMapDetailLevel(config.sourceMapDetailLevel);
+    options.setSourceMapFormat(config.sourceMapFormat);
+    options.setSourceMapLocationMappings(config.sourceMapLocationMappings);
+    options.setParseInlineSourceMaps(config.parseInlineSourceMaps);
+    options.setApplyInputSourceMaps(config.applyInputSourceMaps);
 
     ImmutableMap.Builder<String, SourceMapInput> inputSourceMaps = new ImmutableMap.Builder<>();
     for (Map.Entry<String, String> files : config.sourceMapInputFiles.entrySet()) {
       SourceFile sourceMap =
           SourceFile.builder().withKind(SourceKind.NON_CODE).withPath(files.getValue()).build();
       inputSourceMaps.put(files.getKey(), new SourceMapInput(sourceMap));
     }
-    options.inputSourceMaps = inputSourceMaps.buildOrThrow();
+    options.setInputSourceMaps(inputSourceMaps.buildOrThrow());
 
     if (!config.variableMapInputFile.isEmpty()) {
-      options.inputVariableMap = VariableMap.load(config.variableMapInputFile);
+      options.setInputVariableMap(VariableMap.load(config.variableMapInputFile));
     }
 
     if (!config.propertyMapInputFile.isEmpty()) {
-      options.inputPropertyMap = VariableMap.load(config.propertyMapInputFile);
+      options.setInputPropertyMap(VariableMap.load(config.propertyMapInputFile));
     }
 
     if (!config.outputManifests.isEmpty()) {
@@ -439,7 +440,7 @@ protected void setRunOptions(CompilerOptions options) throws IOException {
 
     options.setProcessCommonJSModules(config.processCommonJSModules);
     options.setModuleRoots(config.moduleRoots);
-    options.angularPass = config.angularPass;
+    options.setAngularPass(config.angularPass);
 
     if (!config.jsonWarningsFile.isEmpty()) {
       options.addReportGenerator(
@@ -1045,11 +1046,11 @@ void writeOutput(
       @Nullable Function<String, String> escaper,
       String filename)
       throws IOException {
-    if (compiler.getOptions().outputJs == OutputJs.SENTINEL) {
+    if (compiler.getOptions().getOutputJs() == OutputJs.SENTINEL) {
       out.append("// No JS output because the compiler was run in checks-only mode.\n");
       return;
     }
-    checkState(compiler.getOptions().outputJs == OutputJs.NORMAL);
+    checkState(compiler.getOptions().getOutputJs() == OutputJs.NORMAL);
 
     String code = chunk == null ? compiler.toSource() : compiler.toSource(licenseTracker, chunk);
     writeOutput(out, compiler, code, wrapper, codePlaceholder, escaper, filename);
@@ -1197,8 +1198,8 @@ protected int doRun() throws IOException {
       }
 
       if (foundJsonInputSourceMap) {
-        inputSourceMaps.putAll(options.inputSourceMaps);
-        options.inputSourceMaps = inputSourceMaps.buildOrThrow();
+        inputSourceMaps.putAll(options.getInputSourceMaps());
+        options.setInputSourceMaps(inputSourceMaps.buildOrThrow());
       }
 
       compiler.initWebpackMap(inputPathByWebpackId.buildOrThrow());
@@ -1363,7 +1364,7 @@ private void runCompilerPasses(CompileMetricsRecorderInterface metricsRecorder)
     } else {
       // This is the code path taken when "building" a library by just checking it for errors
       // and generating an .ijs file and also when doing a full compilation.
-      actionMetricsName = compiler.getOptions().checksOnly ? "checks-only" : "full compile";
+      actionMetricsName = compiler.getOptions().isChecksOnly() ? "checks-only" : "full compile";
       runStage1 = true;
       runStage2 = true;
       runStage3 = true;
@@ -1516,7 +1517,7 @@ int processResults(Result result, List<JSChunk> chunks, B options) throws IOExce
       outputBundle();
       outputChunkGraphJson();
       return 0;
-    } else if (options.outputJs != OutputJs.NONE && result.success) {
+    } else if (options.getOutputJs() != OutputJs.NONE && result.success) {
       outputChunkGraphJson();
       if (chunks == null) {
         outputSingleBinary(options);
@@ -2230,8 +2231,8 @@ void printBundleTo(JSChunk chunk, Appendable out) throws IOException {
     CompilerOptions options = compiler.getOptions();
     // Prebuild ASTs before they're needed in getLoadFlags, for performance and because
     // StackOverflowErrors can be hit if not prebuilt.
-    if (options.numParallelThreads > 1) {
-      new PrebuildAst(compiler, compiler.getOptions().numParallelThreads).prebuild(inputs);
+    if (options.getNumParallelThreads() > 1) {
+      new PrebuildAst(compiler, compiler.getOptions().getNumParallelThreads()).prebuild(inputs);
     }
     if (options.getRuntimeLibraryMode() == RuntimeJsLibManager.RuntimeLibraryMode.INJECT) {
       // ES6 modules will need a runtime in a bundle. Skip appending this runtime if there are no

src/com/google/javascript/jscomp/AstValidator.java

@@ -259,18 +259,18 @@ public void validateStatement(Node n, boolean isAmbient) {
         // setWrapGoogModulesForWhitespaceOnly=false
         // TODO: b/294420383 Ideally the LateEs6ToEs3Rewriter pass should not inject code above the
         // module body node
-        if (compiler.getOptions().skipNonTranspilationPasses) {
-          if (!compiler.getOptions().wrapGoogModulesForWhitespaceOnly) {
+        if (compiler.getOptions().getSkipNonTranspilationPasses()) {
+          if (!compiler.getOptions().shouldWrapGoogModulesForWhitespaceOnly()) {
             validateModuleContents(n);
             return;
           }
         }
         violation("Expected statement but was " + n.getToken() + ".", n);
       }
       default -> {
-        if (n.isModuleBody() && compiler.getOptions().skipNonTranspilationPasses) {
+        if (n.isModuleBody() && compiler.getOptions().getSkipNonTranspilationPasses()) {
           checkState(
-              !compiler.getOptions().wrapGoogModulesForWhitespaceOnly,
+              !compiler.getOptions().shouldWrapGoogModulesForWhitespaceOnly(),
               "Modules can exist in transpiler only if setWrapGoogModulesForWhitespaceOnly is"
                   + " false");
           validateModuleContents(n);

src/com/google/javascript/jscomp/CheckClosureImports.java

@@ -324,7 +324,7 @@ private void checkGoogModuleGet(NodeTraversal t, Node call, ModuleMetadata curre
 
       if (!currentModule.isEs6Module()
           && !currentModule.isGoogModule()
-          && compiler.getOptions().moduleResolutionMode != ResolutionMode.WEBPACK) {
+          && compiler.getOptions().getModuleResolutionMode() != ResolutionMode.WEBPACK) {
         // Here we are making a heuristic check of the use of goog.module.get.  There are many
         // different ways to deliberately subvert these checks.  What we are trying to avoid
         // is accidential use of a `goog.provide` file as module scoped. So we want to avoid:

src/com/google/javascript/jscomp/ClosureRewriteModule.java

@@ -1382,7 +1382,7 @@ private void updateGoogRequireDynamicCallInAwait(Node call) {
   }
 
   private String namespaceIdToXid(String namespaceId) {
-    Xid.HashFunction hashFunction = this.compiler.getOptions().chunkIdHashFunction;
+    Xid.HashFunction hashFunction = this.compiler.getOptions().getChunkIdHashFunction();
     Xid xid = hashFunction == null ? new Xid() : new Xid(hashFunction);
     return xid.get(namespaceId);
   }

src/com/google/javascript/jscomp/ClosureUnawareOptions.java

@@ -81,20 +81,21 @@ private void setSafeOptimizationAssumptions() {
 
   private void copyOutputOptions() {
     shadowOptions.setPrettyPrint(original.isPrettyPrint());
-    shadowOptions.setGeneratePseudoNames(original.generatePseudoNames);
-    shadowOptions.setErrorHandler(original.errorHandler);
-    shadowOptions.setErrorFormat(original.errorFormat);
+    shadowOptions.setGeneratePseudoNames(original.shouldGeneratePseudoNames());
+    shadowOptions.setErrorHandler(original.getErrorHandler());
+    shadowOptions.setErrorFormat(original.getErrorFormat());
   }
 
   private void copyDebugOptions() {
     shadowOptions.setTracerMode(original.getTracerMode());
-    shadowOptions.setDevMode(original.devMode);
+    shadowOptions.setDevMode(original.getDevMode());
 
-    shadowOptions.setPrintSourceAfterEachPass(original.printSourceAfterEachPass);
+    shadowOptions.setPrintSourceAfterEachPass(original.shouldPrintSourceAfterEachPass());
     shadowOptions.setFilesToPrintAfterEachPassRegexList(
-        original.filesToPrintAfterEachPassRegexList);
-    shadowOptions.setPrintInputDelimiter(original.printInputDelimiter);
-    shadowOptions.setInputDelimiter(original.inputDelimiter);
+        original.getFilesToPrintAfterEachPassRegexList());
+    shadowOptions.setPrintInputDelimiter(original.shouldPrintInputDelimiter());
+
+    shadowOptions.setInputDelimiter(original.getInputDelimiter());
 
     shadowOptions.setDebugLogFilter(original.getDebugLogFilter());
     Path debugLogDirectory = original.getDebugLogDirectory();

src/com/google/javascript/jscomp/CodeGenerator.java

@@ -78,11 +78,11 @@ protected CodeGenerator(CodeConsumer consumer, CompilerOptions options) {
     cc = consumer;
 
     this.outputCharsetEncoder = new OutputCharsetEncoder(options.getOutputCharset());
-    this.preferSingleQuotes = options.preferSingleQuotes;
-    this.trustedStrings = options.trustedStrings;
-    this.preserveTypeAnnotations = options.preserveTypeAnnotations;
+    this.preferSingleQuotes = options.shouldPreferSingleQuotes();
+    this.trustedStrings = options.assumeTrustedStrings();
+    this.preserveTypeAnnotations = options.shouldPreserveTypeAnnotations();
     this.printNonJSDocComments = options.getPreserveNonJSDocComments();
-    this.gentsMode = options.gentsMode;
+    this.gentsMode = options.getGentsMode();
     this.quoteKeywordProperties = options.shouldQuoteKeywordProperties();
     this.useOriginalName = options.getUseOriginalNamesInOutput();
     this.outputFeatureSet = options.getOutputFeatureSet();

src/com/google/javascript/jscomp/CodePrinter.java

@@ -716,7 +716,7 @@ public Builder(Node node) {
     public Builder setCompilerOptions(CompilerOptions options) {
       this.options = options;
       this.prettyPrint = options.isPrettyPrint();
-      this.lineBreak = options.lineBreak;
+      this.lineBreak = options.shouldAddLineBreak();
       return this;
     }
 
@@ -856,20 +856,20 @@ private static SourceAndMappings toSource(
       boolean tagAsStrict,
       boolean lineBreak,
       CodeGeneratorFactory codeGeneratorFactory) {
-    checkState(options.sourceMapDetailLevel != null);
+    checkState(options.getSourceMapDetailLevel() != null);
 
     MappedCodePrinter mcp =
         outputFormat == Format.COMPACT
             ? new CompactCodePrinter(
                 lineBreak,
-                options.lineLengthThreshold,
+                options.getLineLengthThreshold(),
                 options.shouldGatherSourceMapInfo(),
-                options.sourceMapDetailLevel,
+                options.getSourceMapDetailLevel(),
                 licenseTracker)
             : new PrettyCodePrinter(
-                options.lineLengthThreshold,
+                options.getLineLengthThreshold(),
                 options.shouldGatherSourceMapInfo(),
-                options.sourceMapDetailLevel,
+                options.getSourceMapDetailLevel(),
                 licenseTracker);
     CodeGenerator cg = codeGeneratorFactory.getCodeGenerator(outputFormat, mcp);
 

src/com/google/javascript/jscomp/CommandLineRunner.java

@@ -1448,7 +1448,7 @@ public static enum FormattingOption {
     private void applyToOptions(CompilerOptions options) {
       switch (this) {
         case PRETTY_PRINT -> options.setPrettyPrint(true);
-        case PRINT_INPUT_DELIMITER -> options.printInputDelimiter = true;
+        case PRINT_INPUT_DELIMITER -> options.setPrintInputDelimiter(true);
         case SINGLE_QUOTES -> options.setPreferSingleQuotes(true);
       }
     }
@@ -1892,9 +1892,9 @@ protected CompilerOptions createOptions() {
       formattingOption.applyToOptions(options);
     }
 
-    options.closurePass = flags.processClosurePrimitives;
+    options.setClosurePass(flags.processClosurePrimitives);
 
-    options.angularPass = flags.angularPass;
+    options.setAngularPass(flags.angularPass);
 
     options.setPolymerVersion(flags.polymerVersion);
 
@@ -1911,11 +1911,11 @@ protected CompilerOptions createOptions() {
       }
     }
 
-    options.removeJ2clAsserts = flags.removeJ2cLAsserts;
+    options.setRemoveJ2clAsserts(flags.removeJ2cLAsserts);
 
-    options.renamePrefix = flags.renamePrefix;
+    options.setRenamePrefix(flags.renamePrefix);
 
-    options.renamePrefixNamespace = flags.renamePrefixNamespace;
+    options.setRenamePrefixNamespace(flags.renamePrefixNamespace);
 
     options.setPreserveTypeAnnotations(flags.preserveTypeAnnotations);
 
@@ -1925,16 +1925,16 @@ protected CompilerOptions createOptions() {
       options.setForceLibraryInjection(flags.forceInjectLibraries);
     }
 
-    options.rewritePolyfills =
+    options.setRewritePolyfills(
         flags.rewritePolyfills
-            && options.getLanguageIn().toFeatureSet().contains(FeatureSet.ES2015);
+            && options.getLanguageIn().toFeatureSet().contains(FeatureSet.ES2015));
     options.setIsolatePolyfills(flags.isolatePolyfills);
 
     if (!flags.translationsFile.isEmpty()) {
       try {
-        options.messageBundle =
+        options.setMessageBundle(
             new XtbMessageBundle(
-                new FileInputStream(flags.translationsFile), flags.translationsProject);
+                new FileInputStream(flags.translationsFile), flags.translationsProject));
       } catch (IOException e) {
         throw new RuntimeException("Reading XTB file", e);
       }
@@ -1947,7 +1947,7 @@ protected CompilerOptions createOptions() {
       // In ADVANCED mode, goog.getMsg is going to be renamed anyway,
       // so we might as well inline it. But shut off the i18n warnings,
       // because the user didn't really ask for i18n.
-      options.messageBundle = new EmptyMessageBundle();
+      options.setMessageBundle(new EmptyMessageBundle());
       options.setWarningLevel(DiagnosticGroups.MSG_CONVENTIONS, CheckLevel.OFF);
     }
 
@@ -2016,7 +2016,7 @@ protected CompilerOptions createOptions() {
                 + "--chunk_output_type is set to ES_MODULES.");
       }
 
-      options.chunkOutputType = flags.chunkOutputType;
+      options.setChunkOutputType(flags.chunkOutputType);
       options.setEmitUseStrict(false);
 
       if (level == CompilationLevel.ADVANCED_OPTIMIZATIONS) {

src/com/google/javascript/jscomp/CompilationLevel.java

@@ -85,9 +85,9 @@ public void setOptionsForCompilationLevel(CompilerOptions options) {
   }
 
   public void setDebugOptionsForCompilationLevel(CompilerOptions options) {
-    options.generatePseudoNames = true;
-    options.removeClosureAsserts = false;
-    options.removeJ2clAsserts = false;
+    options.setGeneratePseudoNames(true);
+    options.setRemoveClosureAsserts(false);
+    options.setRemoveJ2clAsserts(true);
   }
 
   /**
@@ -105,7 +105,7 @@ private static void applyBasicCompilationOptions(CompilerOptions options) {
    */
   private static void applyTranspileOnlyOptions(CompilerOptions options) {
     // ReplaceIdGenerators is on by default, but should not run in TRANSPILE_ONLY mode.
-    options.replaceIdGenerators = false;
+    options.setReplaceIdGenerators(false);
 
     options.setClosurePass(true);
     options.setRenamingPolicy(VariableRenamingPolicy.OFF, PropertyRenamingPolicy.OFF);
@@ -115,10 +115,10 @@ private static void applyTranspileOnlyOptions(CompilerOptions options) {
     options.setCoalesceVariableNames(false);
     options.setDeadAssignmentElimination(false);
     options.setCollapseVariableDeclarations(false);
-    options.convertToDottedProperties = false;
-    options.labelRenaming = false;
+    options.setConvertToDottedProperties(false);
+    options.setLabelRenaming(false);
     options.setRemoveUnusedVariables(Reach.NONE);
-    options.collapseObjectLiterals = false;
+    options.setCollapseObjectLiterals(false);
     /*
      * Turn off protecting side-effect free nodes by making them parameters to a extern function
      * call.
@@ -137,7 +137,7 @@ private static void applySafeCompilationOptions(CompilerOptions options) {
     options.setDependencyOptions(DependencyOptions.sortOnly());
 
     // ReplaceIdGenerators is on by default, but should not run in simple mode.
-    options.replaceIdGenerators = false;
+    options.setReplaceIdGenerators(false);
 
     // Does not call applyBasicCompilationOptions(options) because the call to
     // skipAllCompilerPasses() cannot be easily undone.
@@ -152,10 +152,10 @@ private static void applySafeCompilationOptions(CompilerOptions options) {
     options.setDeadAssignmentElimination(true);
     options.setDeadPropertyAssignmentElimination(false);
     options.setCollapseVariableDeclarations(true);
-    options.convertToDottedProperties = true;
-    options.labelRenaming = true;
+    options.setConvertToDottedProperties(true);
+    options.setLabelRenaming(true);
     options.setRemoveUnusedVariables(Reach.LOCAL_ONLY);
-    options.collapseObjectLiterals = true;
+    options.setCollapseObjectLiterals(true);
     options.setProtectHiddenSideEffects(true);
   }
 
@@ -244,7 +244,7 @@ public void setTypeBasedOptimizationOptions(CompilerOptions options) {
    */
   public void setWrappedOutputOptimizations(CompilerOptions options) {
     // Global variables and properties names can't conflict.
-    options.reserveRawExports = false;
+    options.setReserveRawExports(false);
     switch (this) {
       case SIMPLE_OPTIMIZATIONS -> {
         // Enable global variable optimizations (but not property optimizations)