Simplify

.claude/settings.json

@@ -19,6 +19,7 @@
       "Bash(python3 -m json.tool)",
       "Bash(timeout 300 ./gradlew:*)",
       "Bash(wc:*)",
+      "Bash(xargs cat:*)",
       "Edit(./**)",
       "Read(//home/mernst/research/types/checker-framework-fork*/**)",
       "Read(//scratch/**)",
@@ -28,5 +29,5 @@
     "deny": [],
     "ask": []
   },
-  "skipDangerousModePermissionPrompt": false
+  "skipDangerousModePermissionPrompt": true
 }

.github/workflows/gradle.yml

@@ -25,5 +25,7 @@ jobs:
           cache: 'gradle'
       - name: java -version
         run: java -version
+      - name: Warm up Gradle cache
+        run: ./gradlew spotlessCheck > /dev/null 2>&1 || (sleep 60 && true)
       - name: ./gradlew build
         run: ./gradlew build

build.gradle

@@ -6,6 +6,7 @@ plugins {
   alias(libs.plugins.com.gradleup.shadow)
 
   // Code formatting; defines targets "spotlessApply" and "spotlessCheck"
+  // which are run by "check" (which is itself run by "build").
   alias(libs.plugins.com.diffplug.spotless)
 
   // Error Prone linter

src/main/java/org/plumelib/lookup/Lookup.java

@@ -71,7 +71,7 @@
  *             <b>--regular-expressions=</b><i>boolean</i>. Specifies that keywords are regular
  *             expressions. If false, keywords are text matches. [default: false]
  *         <li id="option:case-sensitive"><b>-c</b> <b>--case-sensitive=</b><i>boolean</i>. If true,
- *             keywords matching is case sensistive. By default, both regular expressions and text
+ *             keywords matching is case sensitive. By default, both regular expressions and text
  *             keywords are case-insensitive. [default: false]
  *         <li id="option:word-match"><b>-w</b> <b>--word-match=</b><i>boolean</i>. If true, match a
  *             text keyword only as a separate word, not as a substring of a word. This option may
@@ -160,10 +160,10 @@ private Lookup() {
   public static boolean regular_expressions = false;
 
   /**
-   * If true, keywords matching is case sensistive. By default, both regular expressions and text
+   * If true, keywords matching is case sensitive. By default, both regular expressions and text
    * keywords are case-insensitive.
    */
-  @Option("-c Keywords are case sensistive")
+  @Option("-c Keywords are case sensitive")
   public static boolean case_sensitive = false;
 
   /**
@@ -270,9 +270,7 @@ public static void main(String[] args) throws IOException {
       System.err.println("Error: --comment-re is not a regex: " + comment_re);
       System.exit(254);
     }
-    if (multiline_comment_start_re == null && multiline_comment_end_re == null) {
-      // Nothing to validate
-    } else if (multiline_comment_start_re != null && multiline_comment_end_re != null) {
+    if (multiline_comment_start_re != null && multiline_comment_end_re != null) {
       if (!RegexUtil.isRegex(multiline_comment_start_re)) {
         System.err.println(
             "Error: --multiline-comment-start-re is not a regex: " + multiline_comment_start_re);
@@ -283,7 +281,7 @@ public static void main(String[] args) throws IOException {
             "Error: --multiline-comment-end-re is not a regex: " + multiline_comment_end_re);
         System.exit(254);
       }
-    } else {
+    } else if (multiline_comment_start_re != null || multiline_comment_end_re != null) {
       System.err.println(
           "Error: supply both or neither of --multiline-comment-start-re and"
               + " --multiline-comment-end-re, not just one.");
@@ -365,6 +363,7 @@ public static void main(String[] args) throws IOException {
       try {
         // Process each entry looking for matches
         int entryCnt = 0;
+        boolean usePatterns = !patterns.isEmpty();
 
         EntryReader.Entry entry = reader.getEntry();
         while (entry != null) {
@@ -375,7 +374,7 @@ public static void main(String[] args) throws IOException {
           String toSearch =
               (search_body || entry.shortEntry) ? entry.body : entry.getDescription(description_re);
           boolean found = true;
-          if (!patterns.isEmpty()) {
+          if (usePatterns) {
             for (Pattern pattern : patterns) {
               if (!pattern.matcher(toSearch).find()) {
                 found = false;
@@ -432,7 +431,6 @@ public static void main(String[] args) throws IOException {
           }
           System.out.print(e.body);
         } else {
-          int i = 0;
           if (print_all) {
             System.out.printf("%d matches found (separated by dashes below)%n", numMatchingEntries);
           } else {
@@ -441,8 +439,8 @@ public static void main(String[] args) throws IOException {
                 numMatchingEntries);
           }
 
-          for (EntryReader.Entry e : matchingEntries) {
-            i++;
+          for (int i = 0; i < numMatchingEntries; i++) {
+            EntryReader.Entry e = matchingEntries.get(i);
             if (print_all) {
               if (show_location) {
                 System.out.printf(
@@ -453,9 +451,10 @@ public static void main(String[] args) throws IOException {
               System.out.print(e.body);
             } else {
               if (show_location) {
-                System.out.printf("  -i=%d %s:%d: %s%n", i, e.filename, e.lineNumber, e.firstLine);
+                System.out.printf(
+                    "  -i=%d %s:%d: %s%n", i + 1, e.filename, e.lineNumber, e.firstLine);
               } else {
-                System.out.printf("  -i=%d %s%n", i, e.getDescription(description_re));
+                System.out.printf("  -i=%d %s%n", i + 1, e.getDescription(description_re));
               }
             }
           }