From e29e7acf74b120c4f3486b956e024a15899280b0 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Thu, 28 May 2026 09:29:36 -0700
Subject: [PATCH] Introduce local variables

---
 src/main/java/org/plumelib/options/Options.java  | 12 +++++++-----
 .../java/org/plumelib/options/OptionsDoclet.java | 16 ++++++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/plumelib/options/Options.java b/src/main/java/org/plumelib/options/Options.java
index 9dc945ab3..cab14cbb5 100644
--- a/src/main/java/org/plumelib/options/Options.java
+++ b/src/main/java/org/plumelib/options/Options.java
@@ -488,7 +488,7 @@ class OptionInfo {
         defaultStr = defaultObj.toString();
       }
 
-      if (field.getType().isArray()) {
+      if (baseType.isArray()) {
         throw new Error("@Option may not annotate a variable of array type: " + field);
       }
 
@@ -829,15 +829,17 @@ public Options(String usageSynopsis, @UnknownInitialization Object... args) {
     // Add each option to the option name map
     for (OptionInfo oi : options) {
       if (oi.shortName != null) {
-        if (nameToOption.containsKey("-" + oi.shortName)) {
+        String shortOptionName = "-" + oi.shortName;
+        if (nameToOption.containsKey(shortOptionName)) {
           throw new Error("short name " + oi + " appears twice");
         }
-        nameToOption.put("-" + oi.shortName, oi);
+        nameToOption.put(shortOptionName, oi);
       }
-      if (nameToOption.containsKey(prefix + oi.longName)) {
+      String longOptionName = prefix + oi.longName;
+      if (nameToOption.containsKey(longOptionName)) {
         throw new Error("long name " + oi + " appears twice");
       }
-      nameToOption.put(prefix + oi.longName, oi);
+      nameToOption.put(longOptionName, oi);
       if (useDashes && oi.longName.contains("-")) {
         nameToOption.put(prefix + oi.longName.replace('-', '_'), oi);
       }
diff --git a/src/main/java/org/plumelib/options/OptionsDoclet.java b/src/main/java/org/plumelib/options/OptionsDoclet.java
index 79527795d..dcfec301c 100644
--- a/src/main/java/org/plumelib/options/OptionsDoclet.java
+++ b/src/main/java/org/plumelib/options/OptionsDoclet.java
@@ -643,8 +643,9 @@ private String newDocFileText() {
       boolean replacedOnce = false;
 
       while ((docline = doc.readLine()) != null) {
+        String trimmedLine = docline.trim();
         if (replacing) {
-          if (docline.trim().equals(endDelim)) {
+          if (trimmedLine.equals(endDelim)) {
             replacing = false;
           } else {
             continue;
@@ -653,7 +654,7 @@ private String newDocFileText() {
 
         b.add(docline);
 
-        if (!replacedOnce && docline.trim().equals(startDelim)) {
+        if (!replacedOnce && trimmedLine.equals(startDelim)) {
           if (formatJavadoc) {
             int starIndex = docline.indexOf('*');
             b.add(docline.substring(0, starIndex + 1));
@@ -856,9 +857,10 @@ public String optionsToHtml(int refillWidth) {
    */
   public String optionsToJavadoc(int padding, int refillWidth) {
     StringJoiner b = new StringJoiner(lineSep);
+    String paddingStr = StringUtils.repeat(' ', padding);
     for (String line : optionsToHtml(refillWidth - padding - 2).lines().toList()) {
       StringBuilder bb = new StringBuilder();
-      bb.append(StringUtils.repeat(' ', padding));
+      bb.append(paddingStr);
       if (line.isBlank()) {
         bb.append('*');
       } else {
@@ -884,13 +886,14 @@ public String optionsToJavadoc(int padding, int refillWidth) {
   private String optionListToHtml(
       List<Options.OptionInfo> optList, int padding, int firstLinePadding, int refillWidth) {
     StringJoiner b = new StringJoiner(lineSep);
+    String paddingStr = StringUtils.repeat(" ", padding);
     for (Options.OptionInfo oi : optList) {
       if (oi.unpublicized) {
         continue;
       }
       StringBuilder bb = new StringBuilder(32);
       String optHtml = optionToHtml(oi, padding);
-      bb.append(StringUtils.repeat(" ", padding));
+      bb.append(paddingStr);
       bb.append("<li id=\"option:").append(oi.longName).append("\">").append(optHtml);
       // .append("</li>");
       if (refillWidth <= 0) {
@@ -936,6 +939,7 @@ private String refill(String in, int padding, int firstLinePadding, int refillWi
       compressedSpaces = compressedSpaces.substring(1);
     }
     String oneLine = StringUtils.repeat(" ", firstLinePadding) + compressedSpaces;
+    String paddingStr = StringUtils.repeat(" ", padding);
     StringJoiner multiLine = new StringJoiner(lineSep);
     while (oneLine.length() > refillWidth) {
       int breakLoc = oneLine.lastIndexOf(' ', refillWidth);
@@ -947,12 +951,12 @@ private String refill(String in, int padding, int firstLinePadding, int refillWi
         break;
       }
       multiLine.add(firstPart);
-      oneLine = StringUtils.repeat(" ", padding) + oneLine.substring(breakLoc + 1);
+      oneLine = paddingStr + oneLine.substring(breakLoc + 1);
     }
     multiLine.add(oneLine);
     if (suffix != null) {
       for (String line : suffix.lines().toList()) {
-        multiLine.add(StringUtils.repeat(" ", padding) + line);
+        multiLine.add(paddingStr + line);
       }
     }
     return multiLine.toString();