Gradle Project hasn't been updated properly

Signed-off-by: Snjezana Peco <[email protected]>

Author: snjeza

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/BasicFileDetector.java

@@ -55,21 +55,30 @@ public class BasicFileDetector {
 	private static final Set<FileVisitOption> FOLLOW_LINKS_OPTION = EnumSet.of(FileVisitOption.FOLLOW_LINKS);
 	private List<Path> directories;
 	private Path rootDir;
-	private String fileName;
+	private List<String> fileNames;
 	private int maxDepth = 5;
 	private boolean includeNested = true;
 	private Set<String> exclusions = new LinkedHashSet<>(1);
 
 	/**
-	 * Constructs a new BasicFileDetector for the given root directory, searching for a fileName.
-	 * By default, the search depth is limited to 5. Sub-directories of a found directory will be walked through.
-	 * The ".metadata" folder is excluded.
-	 * @param rootDir the root directory to search for files
-	 * @param fileName the name of the file to search
+	 * Constructs a new BasicFileDetector for the given root directory, searching
+	 * for fileNames. By default, the search depth is limited to 5. Sub-directories
+	 * of a found directory will be walked through. The ".metadata" folder is
+	 * excluded.
+	 *
+	 * @param rootDir
+	 *            the root directory to search for files
+	 * @param fileNames
+	 *            the names of the file to search
 	 */
-	public BasicFileDetector(Path rootDir, String fileName) {
+	public BasicFileDetector(Path rootDir, String... fileNames) {
 		this.rootDir = rootDir;
-		this.fileName = fileName;
+		this.fileNames = new ArrayList<>();
+		if (fileNames != null) {
+			for (String fileName : fileNames) {
+				this.fileNames.add(fileName);
+			}
+		}
 		directories = new ArrayList<>();
 		addExclusions(METADATA_FOLDER);
 		List<String> javaImportExclusions = JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getJavaImportExclusions();
@@ -190,7 +199,12 @@ private boolean isExcluded(Path dir) {
 	}
 
 	private boolean hasTargetFile(Path dir) {
-		return Files.isRegularFile(dir.resolve(fileName));
+		for (String fileName : fileNames) {
+			if (Files.isRegularFile(dir.resolve(fileName))) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 }

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleBuildSupport.java

@@ -79,7 +79,11 @@ public void update(IProject project, boolean force, IProgressMonitor monitor) th
 				BuildConfiguration buildConfiguration = GradleProjectImporter.getBuildConfiguration(Paths.get(projectPath));
 				gradleBuild = GradleCore.getWorkspace().createBuild(buildConfiguration);
 			}
-			if (isRoot) {
+			File buildFile = project.getFile(GradleProjectImporter.BUILD_GRADLE_DESCRIPTOR).getLocation().toFile();
+			File settingsFile = project.getFile(GradleProjectImporter.SETTINGS_GRADLE_DESCRIPTOR).getLocation().toFile();
+			boolean shouldUpdate = (buildFile.exists() && JavaLanguageServerPlugin.getDigestStore().updateDigest(buildFile.toPath()))
+					|| (settingsFile.exists() && JavaLanguageServerPlugin.getDigestStore().updateDigest(settingsFile.toPath()));
+			if (force || isRoot || shouldUpdate) {
 				gradleBuild.synchronize(monitor);
 			}
 		}
@@ -89,9 +93,9 @@ private boolean isRoot(IProject project, GradleBuild gradleBuild, IProgressMonit
 		if (gradleBuild instanceof InternalGradleBuild) {
 			CancellationTokenSource tokenSource = GradleConnector.newCancellationTokenSource();
 			Collection<EclipseProject> eclipseProjects = ((InternalGradleBuild) gradleBuild).getModelProvider().fetchModels(EclipseProject.class, FetchStrategy.LOAD_IF_NOT_CACHED, tokenSource, monitor);
+			File projectDirectory = project.getLocation().toFile();
 			for (EclipseProject eclipseProject : eclipseProjects) {
 				File eclipseProjectDirectory = eclipseProject.getProjectDirectory();
-				File projectDirectory = project.getLocation().toFile();
 				if (eclipseProjectDirectory.equals(projectDirectory)) {
 					return eclipseProject.getParent() == null;
 				}

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporter.java

@@ -62,6 +62,7 @@ public class GradleProjectImporter extends AbstractProjectImporter {
 	public static final String GRADLE_USER_HOME = "GRADLE_USER_HOME";
 
 	public static final String BUILD_GRADLE_DESCRIPTOR = "build.gradle";
+	public static final String SETTINGS_GRADLE_DESCRIPTOR = "settings.gradle";
 
 	public static final GradleDistribution DEFAULT_DISTRIBUTION = GradleDistribution.forVersion(GradleVersion.current().getVersion());
 
@@ -91,7 +92,8 @@ public boolean applies(IProgressMonitor monitor) throws CoreException {
 			return false;
 		}
 		if (directories == null) {
-			BasicFileDetector gradleDetector = new BasicFileDetector(rootFolder.toPath(), BUILD_GRADLE_DESCRIPTOR)
+			BasicFileDetector gradleDetector = new BasicFileDetector(rootFolder.toPath(), BUILD_GRADLE_DESCRIPTOR,
+					SETTINGS_GRADLE_DESCRIPTOR)
 					.includeNested(false)
 					.addExclusions("**/build")//default gradle build dir
 					.addExclusions("**/bin");

org.eclipse.jdt.ls.tests/projects/gradle/sample/.gitattributes

@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+

org.eclipse.jdt.ls.tests/projects/gradle/sample/.gitignore

@@ -0,0 +1,5 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build

org.eclipse.jdt.ls.tests/projects/gradle/sample/app/build.gradle

@@ -0,0 +1,38 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This generated file contains a sample Java application project to get you started.
+ * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle
+ * User Manual available at https://docs.gradle.org/6.7.1/userguide/building_java_projects.html
+ */
+
+plugins {
+    // Apply the application plugin to add support for building a CLI application in Java.
+    id 'application'
+}
+
+repositories {
+    // Use JCenter for resolving dependencies.
+    jcenter()
+}
+
+dependencies {
+    // Use JUnit Jupiter API for testing.
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.2'
+
+    // Use JUnit Jupiter Engine for testing.
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+
+    // This dependency is used by the application.
+    implementation 'com.google.guava:guava:29.0-jre'
+}
+
+application {
+    // Define the main class for the application.
+    mainClass = 'sample.App'
+}
+
+tasks.named('test') {
+    // Use junit platform for unit tests.
+    useJUnitPlatform()
+}

org.eclipse.jdt.ls.tests/projects/gradle/sample/app/build.gradle2

@@ -0,0 +1,39 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This generated file contains a sample Java application project to get you started.
+ * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle
+ * User Manual available at https://docs.gradle.org/6.7.1/userguide/building_java_projects.html
+ */
+
+plugins {
+    // Apply the application plugin to add support for building a CLI application in Java.
+    id 'application'
+}
+
+repositories {
+    // Use JCenter for resolving dependencies.
+    jcenter()
+}
+
+dependencies {
+    // Use JUnit Jupiter API for testing.
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.2'
+
+    // Use JUnit Jupiter Engine for testing.
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+
+    // This dependency is used by the application.
+    implementation 'com.google.guava:guava:29.0-jre'
+    implementation 'org.apache.commons:commons-lang3:3.11'
+}
+
+application {
+    // Define the main class for the application.
+    mainClass = 'sample.App'
+}
+
+tasks.named('test') {
+    // Use junit platform for unit tests.
+    useJUnitPlatform()
+}

org.eclipse.jdt.ls.tests/projects/gradle/sample/app/src/main/java/sample/App.java

@@ -0,0 +1,14 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package sample;
+
+public class App {
+    public String getGreeting() {
+        return "Hello World!";
+    }
+
+    public static void main(String[] args) {
+        System.out.println(new App().getGreeting());
+    }
+}

org.eclipse.jdt.ls.tests/projects/gradle/sample/app/src/test/java/sample/AppTest.java

@@ -0,0 +1,14 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package sample;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class AppTest {
+    @Test void appHasAGreeting() {
+        App classUnderTest = new App();
+        assertNotNull(classUnderTest.getGreeting(), "app should have a greeting");
+    }
+}

org.eclipse.jdt.ls.tests/projects/gradle/sample/gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists