Extra debug info for the KLSP (#3872)

Small PR to help with showing more information about how the KLSP finds the `cache.bin` file. Co-authored-by: rv-jenkins <[email protected]>
runtimeverification · Dec 13, 2023 · a4e9877 · a4e9877
1 parent 585d74e
commit a4e9877
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/kernel/src/main/java/org/kframework/lsp/TextDocumentSyncHandler.java b/kernel/src/main/java/org/kframework/lsp/TextDocumentSyncHandler.java
@@ -61,7 +61,8 @@ public void findCacheFile() {
       cacheFile =
           Files.walk(Path.of(URI.create(workspaceFolder.getUri())))
               .filter(p -> p.endsWith(CACHE_FILE_NAME))
-              .findFirst();
+              .min(Comparator.comparing(Path::getNameCount, Comparator.naturalOrder()));
+      clientLogger.logMessage("Found cache file: " + cacheFile);
       loadCaches();
     } catch (IOException e) {
       clientLogger.logMessage("findCachesException: " + e);
@@ -81,7 +82,7 @@ public void loadCaches() {
           // this way we can find all the updated locations when finding references
           if (!files.containsKey(uri)) add(uri);
         });
-    clientLogger.logMessage("loaded cached modules: " + caches.size());
+    clientLogger.logMessage("Loaded cached modules: " + caches.size());
   }
 
   public void add(String uri) {

diff --git a/kernel/src/test/java/org/kframework/lsp/LSPTests.java b/kernel/src/test/java/org/kframework/lsp/LSPTests.java
@@ -5,6 +5,7 @@
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -127,7 +128,7 @@ public void testKLSPathK() throws IOException {
     Optional<Path> cacheFile =
         Files.walk(Path.of(URI.create(workspaceFolder.getUri())))
             .filter(p -> p.endsWith(Kompile.CACHE_FILE_NAME))
-            .findFirst();
+            .min(Comparator.comparing(Path::getNameCount, Comparator.naturalOrder()));
     if (cacheFile.isPresent())
       caches = loader.loadCache(java.util.Map.class, cacheFile.get().toFile());