Merge branch 'main-eisop' of github.com:jspecify/jspecify-reference-c…

…hecker into issue-159-again
jspecify · Apr 17, 2024 · 2eecb6e · 2eecb6e
2 parents 55b243d + 0c36cdf
commit 2eecb6e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/test/java/tests/ConformanceTest.java b/src/test/java/tests/ConformanceTest.java
@@ -29,7 +29,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
@@ -143,7 +142,6 @@ private static ImmutableSet<ReportedFact> analyze(
     TypecheckResult result = new TypecheckExecutor().runTest(config);
     return result.getUnexpectedDiagnostics().stream()
         .map(d -> DetailMessage.parse(d, testDirectory))
-        .filter(Objects::nonNull)
         // Do not filter out messages without details.
         // .filter(DetailMessage::hasDetails)
         .map(DetailMessageReportedFact::new)

diff --git a/src/test/java/tests/DetailMessage.java b/src/test/java/tests/DetailMessage.java
@@ -55,18 +55,22 @@ final class DetailMessage extends TestDiagnostic {
   final String readableMessage;
 
   /**
-   * Returns an object parsed from a diagnostic message, or {@code null} if the message doesn't
-   * match the expected format.
+   * Returns an object parsed from a diagnostic message.
    *
    * @param rootDirectory if not null, a root directory prefix to remove from the file part of the
    *     message
    */
-  static @Nullable DetailMessage parse(TestDiagnostic input, @Nullable Path rootDirectory) {
+  static DetailMessage parse(TestDiagnostic input, @Nullable Path rootDirectory) {
+    Path file = input.getFile();
+    if (rootDirectory != null && file.startsWith(rootDirectory)) {
+      file = rootDirectory.relativize(file);
+    }
+
     Matcher detailsMatcher = DETAIL_MESSAGE_PATTERN.matcher(input.getMessage());
     if (!detailsMatcher.matches()) {
       // Return a message with no key or parts.
       return new DetailMessage(
-          input.getFile(),
+          file,
           input.getLineNumber(),
           input.getKind(),
           "",
@@ -75,10 +79,6 @@ final class DetailMessage extends TestDiagnostic {
           null,
           input.getMessage());
     }
-    Path file = input.getFile();
-    if (rootDirectory != null) {
-      file = rootDirectory.relativize(file);
-    }
 
     int messagePartCount = parseInt(detailsMatcher.group("messagePartCount"));
     List<String> messageParts =

diff --git a/src/test/java/tests/NullSpecTest.java b/src/test/java/tests/NullSpecTest.java
@@ -118,7 +118,7 @@ public TypecheckResult adjustTypecheckResult(TypecheckResult testResult) {
     for (ListIterator<TestDiagnostic> i = unexpected.listIterator(); i.hasNext(); ) {
       TestDiagnostic diagnostic = i.next();
       DetailMessage detailMessage = DetailMessage.parse(diagnostic, null);
-      if (detailMessage != null && detailMessage.hasDetails()) {
+      if (detailMessage.hasDetails()) {
         // Replace diagnostics that can be parsed with DetailMessage diagnostics.
         i.set(detailMessage);
       } else if (diagnostic.getKind() != DiagnosticKind.Error) {