Invalidate indexes when targets change

3 files changed, 31 insertions, 15 deletions

diff --git a/src/test/java/org/javacs/CodeLensTest.java b/src/test/java/org/javacs/CodeLensTest.java
index 441bb30..0185b73 100644
--- a/src/test/java/org/javacs/CodeLensTest.java
+++ b/src/test/java/org/javacs/CodeLensTest.java
@@ -61,8 +61,8 @@ public class CodeLensTest {
         assertThat(lenses, not(empty()));
 
         var titles = titles(lenses);
-        assertThat(titles, hasItem("4:1 references"));
-        assertThat(titles, hasItem("6:1 references"));
+        assertThat(titles, hasItem("4:1 reference"));
+        assertThat(titles, hasItem("6:1 reference"));
     }
 
     @Test
@@ -71,4 +71,19 @@ public class CodeLensTest {
         var titles = titles(lenses);
         assertThat(titles, not(hasItem("4:0 references")));
     }
+
+    @Test
+    public void signatureMatches() {
+        var file = "/org/javacs/example/ConstructorRefs.java";
+        var uri = FindResource.uri(file);
+        var contents = FindResource.contents(file);
+        var compile = server.compiler.compileFile(uri, contents);
+        var signatureMatches = compile.signatureMatches();
+
+        var good = List.of(new Ptr("org.javacs.example.ConstructorRefs.ConstructorRefs(int)"));
+        assertTrue(signatureMatches.test(good));
+
+        var bad = List.of(new Ptr("org.javacs.example.ConstructorRefs.ConstructorRefs(int, int)"));
+        assertFalse(signatureMatches.test(bad));
+    }
 }
diff --git a/src/test/java/org/javacs/FindResource.java b/src/test/java/org/javacs/FindResource.java
index ce07a04..6e6860e 100644
--- a/src/test/java/org/javacs/FindResource.java
+++ b/src/test/java/org/javacs/FindResource.java
@@ -1,8 +1,11 @@
 package org.javacs;
 
+import java.io.IOException;
 import java.net.URI;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 
 /** Find java sources in test-project/workspace/src */
 public class FindResource {
@@ -12,6 +15,17 @@ public class FindResource {
         return path.toUri();
     }
 
+    public static String contents(String resourcePath) {
+        var path = path(resourcePath);
+        List<String> lines;
+        try {
+            lines = Files.readAllLines(path);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return String.join("\n", lines);
+    }
+
     public static Path path(String resourcePath) {
         if (resourcePath.startsWith("/")) resourcePath = resourcePath.substring(1);
 
diff --git a/src/test/java/org/javacs/JavaCompilerServiceTest.java b/src/test/java/org/javacs/JavaCompilerServiceTest.java
index 31339c9..db694b5 100644
--- a/src/test/java/org/javacs/JavaCompilerServiceTest.java
+++ b/src/test/java/org/javacs/JavaCompilerServiceTest.java
@@ -10,7 +10,6 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 import java.util.StringJoiner;
@@ -268,18 +267,6 @@ public class JavaCompilerServiceTest {
     }
 
     @Test
-    public void countReferences() {
-        var file = "GotoDefinition.java";
-        var refs = compiler.countReferences(resourceUri(file), contents(file), ReportProgress.EMPTY);
-        var stringify = new HashMap<String, Integer>();
-        for (var kv : refs.entrySet()) {
-            var key = kv.getKey().toString();
-            stringify.put(key, kv.getValue());
-        }
-        assertThat(stringify, hasEntry("GotoDefinition.goToHere()", 1));
-    }
-
-    @Test
     public void overloads() {
         var uri = resourceUri("Overloads.java");
         var contents = contents("Overloads.java");