Skip to content

Commit d1cf437

Browse files
authored
Gradle Project hasn't been updated properly (#1617)
- redhat-developer/vscode-java#1714 - redhat-developer/vscode-java#1463 Signed-off-by: Snjezana Peco <[email protected]>
1 parent a772f0c commit d1cf437

File tree

12 files changed

+432
-13
lines changed

12 files changed

+432
-13
lines changed

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

+18-9
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,25 @@ public class BasicFileDetector {
5555
private static final Set<FileVisitOption> FOLLOW_LINKS_OPTION = EnumSet.of(FileVisitOption.FOLLOW_LINKS);
5656
private List<Path> directories;
5757
private Path rootDir;
58-
private String fileName;
58+
private List<String> fileNames;
5959
private int maxDepth = 5;
6060
private boolean includeNested = true;
6161
private Set<String> exclusions = new LinkedHashSet<>(1);
6262

6363
/**
64-
* Constructs a new BasicFileDetector for the given root directory, searching for a fileName.
65-
* By default, the search depth is limited to 5. Sub-directories of a found directory will be walked through.
66-
* The ".metadata" folder is excluded.
67-
* @param rootDir the root directory to search for files
68-
* @param fileName the name of the file to search
64+
* Constructs a new BasicFileDetector for the given root directory, searching
65+
* for fileNames. By default, the search depth is limited to 5. Sub-directories
66+
* of a found directory will be walked through. The ".metadata" folder is
67+
* excluded.
68+
*
69+
* @param rootDir
70+
* the root directory to search for files
71+
* @param fileNames
72+
* the names of the file to search
6973
*/
70-
public BasicFileDetector(Path rootDir, String fileName) {
74+
public BasicFileDetector(Path rootDir, String... fileNames) {
7175
this.rootDir = rootDir;
72-
this.fileName = fileName;
76+
this.fileNames = fileNames == null ? new ArrayList<>() : Arrays.asList(fileNames);
7377
directories = new ArrayList<>();
7478
addExclusions(METADATA_FOLDER);
7579
List<String> javaImportExclusions = JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getJavaImportExclusions();
@@ -190,7 +194,12 @@ private boolean isExcluded(Path dir) {
190194
}
191195

192196
private boolean hasTargetFile(Path dir) {
193-
return Files.isRegularFile(dir.resolve(fileName));
197+
for (String fileName : fileNames) {
198+
if (Files.isRegularFile(dir.resolve(fileName))) {
199+
return true;
200+
}
201+
}
202+
return false;
194203
}
195204

196205
}

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@ public void update(IProject project, boolean force, IProgressMonitor monitor) th
7979
BuildConfiguration buildConfiguration = GradleProjectImporter.getBuildConfiguration(Paths.get(projectPath));
8080
gradleBuild = GradleCore.getWorkspace().createBuild(buildConfiguration);
8181
}
82-
if (isRoot) {
82+
File buildFile = project.getFile(GradleProjectImporter.BUILD_GRADLE_DESCRIPTOR).getLocation().toFile();
83+
File settingsFile = project.getFile(GradleProjectImporter.SETTINGS_GRADLE_DESCRIPTOR).getLocation().toFile();
84+
boolean shouldUpdate = (buildFile.exists() && JavaLanguageServerPlugin.getDigestStore().updateDigest(buildFile.toPath()))
85+
|| (settingsFile.exists() && JavaLanguageServerPlugin.getDigestStore().updateDigest(settingsFile.toPath()));
86+
if (isRoot || shouldUpdate) {
8387
gradleBuild.synchronize(monitor);
8488
}
8589
}
@@ -89,9 +93,9 @@ private boolean isRoot(IProject project, GradleBuild gradleBuild, IProgressMonit
8993
if (gradleBuild instanceof InternalGradleBuild) {
9094
CancellationTokenSource tokenSource = GradleConnector.newCancellationTokenSource();
9195
Collection<EclipseProject> eclipseProjects = ((InternalGradleBuild) gradleBuild).getModelProvider().fetchModels(EclipseProject.class, FetchStrategy.LOAD_IF_NOT_CACHED, tokenSource, monitor);
96+
File projectDirectory = project.getLocation().toFile();
9297
for (EclipseProject eclipseProject : eclipseProjects) {
9398
File eclipseProjectDirectory = eclipseProject.getProjectDirectory();
94-
File projectDirectory = project.getLocation().toFile();
9599
if (eclipseProjectDirectory.equals(projectDirectory)) {
96100
return eclipseProject.getParent() == null;
97101
}

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

+18-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public class GradleProjectImporter extends AbstractProjectImporter {
6262
public static final String GRADLE_USER_HOME = "GRADLE_USER_HOME";
6363

6464
public static final String BUILD_GRADLE_DESCRIPTOR = "build.gradle";
65+
public static final String SETTINGS_GRADLE_DESCRIPTOR = "settings.gradle";
6566

6667
public static final GradleDistribution DEFAULT_DISTRIBUTION = GradleDistribution.forVersion(GradleVersion.current().getVersion());
6768

@@ -91,7 +92,8 @@ public boolean applies(IProgressMonitor monitor) throws CoreException {
9192
return false;
9293
}
9394
if (directories == null) {
94-
BasicFileDetector gradleDetector = new BasicFileDetector(rootFolder.toPath(), BUILD_GRADLE_DESCRIPTOR)
95+
BasicFileDetector gradleDetector = new BasicFileDetector(rootFolder.toPath(), BUILD_GRADLE_DESCRIPTOR,
96+
SETTINGS_GRADLE_DESCRIPTOR)
9597
.includeNested(false)
9698
.addExclusions("**/build")//default gradle build dir
9799
.addExclusions("**/bin");
@@ -120,6 +122,21 @@ public void importToWorkspace(IProgressMonitor monitor) throws CoreException {
120122
JavaLanguageServerPlugin.logInfo(IMPORTING_GRADLE_PROJECTS);
121123
subMonitor.worked(1);
122124
directories.forEach(d -> importDir(d, subMonitor.newChild(1)));
125+
// store the digest for the imported gradle projects.
126+
ProjectUtils.getGradleProjects().forEach(project -> {
127+
File buildFile = project.getFile(BUILD_GRADLE_DESCRIPTOR).getLocation().toFile();
128+
File settingsFile = project.getFile(SETTINGS_GRADLE_DESCRIPTOR).getLocation().toFile();
129+
try {
130+
if (buildFile.exists()) {
131+
JavaLanguageServerPlugin.getDigestStore().updateDigest(buildFile.toPath());
132+
}
133+
if (settingsFile.exists()) {
134+
JavaLanguageServerPlugin.getDigestStore().updateDigest(settingsFile.toPath());
135+
}
136+
} catch (CoreException e) {
137+
JavaLanguageServerPlugin.logException("Failed to update digest for gradle build file", e);
138+
}
139+
});
123140
subMonitor.done();
124141
}
125142

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* This file was generated by the Gradle 'init' task.
3+
*
4+
* This generated file contains a sample Java application project to get you started.
5+
* For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle
6+
* User Manual available at https://docs.gradle.org/6.7.1/userguide/building_java_projects.html
7+
*/
8+
9+
plugins {
10+
// Apply the application plugin to add support for building a CLI application in Java.
11+
id 'application'
12+
}
13+
14+
repositories {
15+
// Use JCenter for resolving dependencies.
16+
jcenter()
17+
}
18+
19+
dependencies {
20+
}
21+
22+
application {
23+
// Define the main class for the application.
24+
mainClass = 'sample.App'
25+
}
26+
27+
tasks.named('test') {
28+
// Use junit platform for unit tests.
29+
useJUnitPlatform()
30+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* This file was generated by the Gradle 'init' task.
3+
*
4+
* This generated file contains a sample Java application project to get you started.
5+
* For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle
6+
* User Manual available at https://docs.gradle.org/6.7.1/userguide/building_java_projects.html
7+
*/
8+
9+
plugins {
10+
// Apply the application plugin to add support for building a CLI application in Java.
11+
id 'application'
12+
}
13+
14+
repositories {
15+
// Use JCenter for resolving dependencies.
16+
jcenter()
17+
}
18+
19+
dependencies {
20+
implementation 'org.apache.commons:commons-lang3:3.11'
21+
}
22+
23+
application {
24+
// Define the main class for the application.
25+
mainClass = 'sample.App'
26+
}
27+
28+
tasks.named('test') {
29+
// Use junit platform for unit tests.
30+
useJUnitPlatform()
31+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/*
2+
* This Java source file was generated by the Gradle 'init' task.
3+
*/
4+
package sample;
5+
6+
public class App {
7+
public String getGreeting() {
8+
return "Hello World!";
9+
}
10+
11+
public static void main(String[] args) {
12+
System.out.println(new App().getGreeting());
13+
}
14+
}
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
19+
##############################################################################
20+
##
21+
## Gradle start up script for UN*X
22+
##
23+
##############################################################################
24+
25+
# Attempt to set APP_HOME
26+
# Resolve links: $0 may be a link
27+
PRG="$0"
28+
# Need this for relative symlinks.
29+
while [ -h "$PRG" ] ; do
30+
ls=`ls -ld "$PRG"`
31+
link=`expr "$ls" : '.*-> \(.*\)$'`
32+
if expr "$link" : '/.*' > /dev/null; then
33+
PRG="$link"
34+
else
35+
PRG=`dirname "$PRG"`"/$link"
36+
fi
37+
done
38+
SAVED="`pwd`"
39+
cd "`dirname \"$PRG\"`/" >/dev/null
40+
APP_HOME="`pwd -P`"
41+
cd "$SAVED" >/dev/null
42+
43+
APP_NAME="Gradle"
44+
APP_BASE_NAME=`basename "$0"`
45+
46+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
48+
49+
# Use the maximum available, or set MAX_FD != -1 to use that value.
50+
MAX_FD="maximum"
51+
52+
warn () {
53+
echo "$*"
54+
}
55+
56+
die () {
57+
echo
58+
echo "$*"
59+
echo
60+
exit 1
61+
}
62+
63+
# OS specific support (must be 'true' or 'false').
64+
cygwin=false
65+
msys=false
66+
darwin=false
67+
nonstop=false
68+
case "`uname`" in
69+
CYGWIN* )
70+
cygwin=true
71+
;;
72+
Darwin* )
73+
darwin=true
74+
;;
75+
MINGW* )
76+
msys=true
77+
;;
78+
NONSTOP* )
79+
nonstop=true
80+
;;
81+
esac
82+
83+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
84+
85+
86+
# Determine the Java command to use to start the JVM.
87+
if [ -n "$JAVA_HOME" ] ; then
88+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
89+
# IBM's JDK on AIX uses strange locations for the executables
90+
JAVACMD="$JAVA_HOME/jre/sh/java"
91+
else
92+
JAVACMD="$JAVA_HOME/bin/java"
93+
fi
94+
if [ ! -x "$JAVACMD" ] ; then
95+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
96+
97+
Please set the JAVA_HOME variable in your environment to match the
98+
location of your Java installation."
99+
fi
100+
else
101+
JAVACMD="java"
102+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
103+
104+
Please set the JAVA_HOME variable in your environment to match the
105+
location of your Java installation."
106+
fi
107+
108+
# Increase the maximum file descriptors if we can.
109+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
110+
MAX_FD_LIMIT=`ulimit -H -n`
111+
if [ $? -eq 0 ] ; then
112+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
113+
MAX_FD="$MAX_FD_LIMIT"
114+
fi
115+
ulimit -n $MAX_FD
116+
if [ $? -ne 0 ] ; then
117+
warn "Could not set maximum file descriptor limit: $MAX_FD"
118+
fi
119+
else
120+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
121+
fi
122+
fi
123+
124+
# For Darwin, add options to specify how the application appears in the dock
125+
if $darwin; then
126+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
127+
fi
128+
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
134+
JAVACMD=`cygpath --unix "$JAVACMD"`
135+
136+
# We build the pattern for arguments to be converted via cygpath
137+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
138+
SEP=""
139+
for dir in $ROOTDIRSRAW ; do
140+
ROOTDIRS="$ROOTDIRS$SEP$dir"
141+
SEP="|"
142+
done
143+
OURCYGPATTERN="(^($ROOTDIRS))"
144+
# Add a user-defined pattern to the cygpath arguments
145+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
146+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
147+
fi
148+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
149+
i=0
150+
for arg in "$@" ; do
151+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
152+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
153+
154+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
155+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
156+
else
157+
eval `echo args$i`="\"$arg\""
158+
fi
159+
i=`expr $i + 1`
160+
done
161+
case $i in
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
172+
esac
173+
fi
174+
175+
# Escape application args
176+
save () {
177+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
178+
echo " "
179+
}
180+
APP_ARGS=`save "$@"`
181+
182+
# Collect all arguments for the java command, following the shell quoting and substitution rules
183+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
184+
185+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)