Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1400: use more precise location information in order to provide much more precise results when looking for references

Browse Source
This commit is contained in:
Martin Lippert
2024-11-12 12:32:11 +01:00
parent e52ae1890a
commit dbaea71610
11 changed files with 131 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/NamedReferencesProviderTest.java
View File

@@ -23,6 +23,7 @@ import org.eclipse.lsp4j.Position;
import org.eclipse.lsp4j.Range;
import org.eclipse.lsp4j.TextDocumentIdentifier;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -110,6 +111,7 @@ public class NamedReferencesProviderTest {
}
@Test
@Disabled // TODO: need to include setter injection in spring index as a first step, then resurrect this test case
public void testNamedRefersToOtherNamedValues() throws Exception {
Editor editor = harness.newEditor(LanguageId.JAVA, """
package org.test;

8
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/ProfileReferencesProviderTest.java
View File

@@ -84,13 +84,13 @@ public class ProfileReferencesProviderTest {
String expectedDefinitionUri1 = directory.toPath().resolve("src/main/java/org/test/profiles/ProfilesClass1.java").toUri().toString();
Location expectedLocation1 = new Location(expectedDefinitionUri1,
new Range(new Position(6, 0), new Position(6, 20)));
new Range(new Position(6, 9), new Position(6, 19)));
assertTrue(references.contains(expectedLocation1));
String expectedDefinitionUri2 = directory.toPath().resolve("src/main/java/org/test/profiles/ProfilesClassWithArray.java").toUri().toString();
Location expectedLocation2 = new Location(expectedDefinitionUri2,
new Range(new Position(6, 0), new Position(6, 42)));
new Range(new Position(6, 18), new Position(6, 28)));
assertTrue(references.contains(expectedLocation2));
}
@@ -115,13 +115,13 @@ public class ProfileReferencesProviderTest {
String expectedDefinitionUri1 = directory.toPath().resolve("src/main/java/org/test/profiles/ProfilesClass1.java").toUri().toString();
Location expectedLocation1 = new Location(expectedDefinitionUri1,
new Range(new Position(6, 0), new Position(6, 20)));
new Range(new Position(6, 9), new Position(6, 19)));
assertTrue(references.contains(expectedLocation1));
String expectedDefinitionUri2 = directory.toPath().resolve("src/main/java/org/test/profiles/ProfilesClassWithArray.java").toUri().toString();
Location expectedLocation2 = new Location(expectedDefinitionUri2,
new Range(new Position(6, 0), new Position(6, 42)));
new Range(new Position(6, 18), new Position(6, 28)));
assertTrue(references.contains(expectedLocation2));
}

2
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/QualifierReferencesProviderTest.java
View File

@@ -116,7 +116,7 @@ public class QualifierReferencesProviderTest {
String expectedDefinitionUri = directory.toPath().resolve("src/main/java/org/test/injections/ConfigurationWithInjectionsAndAnnotations.java").toUri().toString();
Location expectedLocation = new Location(expectedDefinitionUri,
new Range(new Position(12, 0), new Position(12, 23)));
new Range(new Position(12, 11), new Position(12, 22)));
List<? extends Location> references = editor.getReferences();
assertEquals(1, references.size());

4
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnPropertyReferenceFinderTest.java
View File

@@ -11,11 +11,8 @@
package org.springframework.ide.vscode.boot.java.conditionals.test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.File;
import java.net.URI;
import java.nio.file.Path;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
@@ -32,7 +29,6 @@ import org.springframework.ide.vscode.boot.app.SpringSymbolIndex;
import org.springframework.ide.vscode.boot.bootiful.BootLanguageServerTest;
import org.springframework.ide.vscode.boot.bootiful.SymbolProviderTestConf;
import org.springframework.ide.vscode.boot.java.Annotations;
import org.springframework.ide.vscode.boot.java.value.ValuePropertyReferencesProvider;
import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
import org.springframework.ide.vscode.commons.util.text.LanguageId;
import org.springframework.ide.vscode.languageserver.testharness.Editor;

32
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValuePropertyReferenceFinderTest.java
View File

@@ -254,34 +254,34 @@ public class ValuePropertyReferenceFinderTest {
URI javaFile = directory.toPath().resolve("src/main/java/org/test/properties/PropertyUsageWithValue.java").toUri();
location = getLocation(locations, javaFile);
assertNotNull(location);
assertEquals(9, location.getRange().getStart().getLine());
assertEquals(16, location.getRange().getStart().getCharacter());
assertEquals(9, location.getRange().getEnd().getLine());
assertEquals(24, location.getRange().getEnd().getCharacter());
assertEquals(8, location.getRange().getStart().getLine());
assertEquals(8, location.getRange().getStart().getCharacter());
assertEquals(8, location.getRange().getEnd().getLine());
assertEquals(21, location.getRange().getEnd().getCharacter());
javaFile = directory.toPath().resolve("src/main/java/org/test/properties/PropertyUsageWithConditional.java").toUri();
location = getLocation(locations, javaFile);
assertNotNull(location);
assertEquals(5, location.getRange().getStart().getLine());
assertEquals(0, location.getRange().getStart().getCharacter());
assertEquals(5, location.getRange().getEnd().getLine());
assertEquals(10, location.getRange().getEnd().getCharacter());
assertEquals(6, location.getRange().getStart().getLine());
assertEquals(23, location.getRange().getStart().getCharacter());
assertEquals(6, location.getRange().getEnd().getLine());
assertEquals(33, location.getRange().getEnd().getCharacter());
javaFile = directory.toPath().resolve("src/main/java/org/test/properties/PropertyUsageWithConditionalAndArray.java").toUri();
location = getLocation(locations, javaFile);
assertNotNull(location);
assertEquals(5, location.getRange().getStart().getLine());
assertEquals(0, location.getRange().getStart().getCharacter());
assertEquals(5, location.getRange().getEnd().getLine());
assertEquals(10, location.getRange().getEnd().getCharacter());
assertEquals(6, location.getRange().getStart().getLine());
assertEquals(31, location.getRange().getStart().getCharacter());
assertEquals(6, location.getRange().getEnd().getLine());
assertEquals(41, location.getRange().getEnd().getCharacter());
javaFile = directory.toPath().resolve("src/main/java/org/test/properties/PropertyUsageWithConditionalWithArrayAndPrefix.java").toUri();
location = getLocation(locations, javaFile);
assertNotNull(location);
assertEquals(5, location.getRange().getStart().getLine());
assertEquals(0, location.getRange().getStart().getCharacter());
assertEquals(5, location.getRange().getEnd().getLine());
assertEquals(10, location.getRange().getEnd().getCharacter());
assertEquals(6, location.getRange().getStart().getLine());
assertEquals(46, location.getRange().getStart().getCharacter());
assertEquals(6, location.getRange().getEnd().getLine());
assertEquals(53, location.getRange().getEnd().getCharacter());
}
}