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

do not index package-info.java files

Browse Source 
Fixes GH-1426
This commit is contained in:
Martin Lippert
2024-12-10 08:21:17 +01:00
parent 25c21479b2
commit 783bb4b32d
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringFactoriesIndexer.java
View File

@@ -90,9 +90,9 @@ public class SpringFactoriesIndexer implements SpringIndexer {
}
@Override
public boolean isInterestedIn(String docURI) {
if (docURI.endsWith(".factories")) {
Path path = Paths.get(URI.create(docURI));
public boolean isInterestedIn(String resource) {
if (resource.endsWith(".factories")) {
Path path = Paths.get(URI.create(resource));
return FILE_GLOB_PATTERN.matches(path);
}
return false;

4
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019, 2022 Pivotal, Inc.
* Copyright (c) 2019, 2024 Pivotal, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@ import org.springframework.ide.vscode.commons.java.IJavaProject;
public interface SpringIndexer {
String[] getFileWatchPatterns();
boolean isInterestedIn(String docURI);
boolean isInterestedIn(String resource); // note that this might be a document URI or a standard file path on the system
List<EnhancedSymbolInformation> computeSymbols(IJavaProject project, String docURI, String content) throws Exception;

6
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java
View File

@@ -148,8 +148,8 @@ public class SpringIndexerJava implements SpringIndexer {
}
@Override
public boolean isInterestedIn(String docURI) {
return docURI.endsWith(".java");
public boolean isInterestedIn(String resource) {
return resource.endsWith(".java") && !resource.endsWith("package-info.java");
}
@Override
@@ -841,7 +841,7 @@ public class SpringIndexerJava implements SpringIndexer {
return Stream.empty();
}
})
.filter(path -> path.getFileName().toString().endsWith(".java"))
.filter(path -> isInterestedIn(path.getFileName().toString()))
.filter(Files::isRegularFile)
.map(path -> path.toAbsolutePath().toString())
.toArray(String[]::new);

4
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerXML.java
View File

@@ -105,8 +105,8 @@ public class SpringIndexerXML implements SpringIndexer {
}
@Override
public boolean isInterestedIn(String docURI) {
return docURI.endsWith(".xml");
public boolean isInterestedIn(String resource) {
return resource.endsWith(".xml");
}
@Override

2
headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/package-info.java Normal file
View File

@@ -0,0 +1,2 @@
@org.springframework.lang.NonNullApi
package org.test;