Reopening a gradle project resets its gradle version

Signed-off-by: Snjezana Peco <[email protected]>
eclipse-jdtls · Jul 17, 2019 · 65c4cd8 · 65c4cd8
1 parent febf189
commit 65c4cd8
Show file tree

Hide file tree

Showing 18 changed files with 775 additions and 67 deletions.
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JobHelpers.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JobHelpers.java
@@ -14,6 +14,7 @@
 import java.util.Deque;
 import java.util.List;
 
+import org.eclipse.buildship.core.internal.CorePlugin;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -195,7 +196,7 @@ static class BuildJobMatcher implements IJobMatcher {
 		@Override
 		public boolean matches(Job job) {
 			return (job instanceof WorkspaceJob) || job.getClass().getName().matches("(.*\\.AutoBuild.*)")
-					|| job.getClass().getName().endsWith("JREUpdateJob");
+					|| job.getClass().getName().endsWith("JREUpdateJob") || job.belongsTo(CorePlugin.GRADLE_JOB_FAMILY);
 		}
 
 	}

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/ProjectUtils.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/ProjectUtils.java
@@ -33,6 +33,7 @@
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -368,5 +369,13 @@ private static IPath detectSources(Path file) {
 		return Files.isRegularFile(sourcePath) ? new org.eclipse.core.runtime.Path(sourcePath.toString()) : null;
 	}
 
-
+	public static IProject findUniqueProject(IWorkspace workspace, String basename) {
+		IProject project = null;
+		String name;
+		for (int i = 1; project == null || project.exists(); i++) {
+			name = (i < 2) ? basename : basename + " (" + i + ")";
+			project = workspace.getRoot().getProject(name);
+		}
+		return project;
+	}
 }
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/ResourceUtils.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/ResourceUtils.java
@@ -119,6 +119,22 @@ public static String getContent(URI fileURI) throws CoreException {
 		return content;
 	}
 
+	/**
+	 * Reads file content directly from the filesystem.
+	 */
+	public static String getContent(File file) throws CoreException {
+		if (file == null) {
+			return null;
+		}
+		String content;
+		try {
+			content = Files.toString(file, Charsets.UTF_8);
+		} catch (IOException e) {
+			throw new CoreException(StatusFactory.newErrorStatus("Can not get " + file + " content", e));
+		}
+		return content;
+	}
+
 	/**
 	 * Writes content to file, outside the workspace. No change event is
 	 * emitted.
@@ -263,4 +279,16 @@ public static String toGlobPattern(IPath path) {
 		return globPattern;
 	}
 
+	public static IPath fixDevice(IPath path) {
+		if (path != null && path.getDevice() != null) {
+			return path.setDevice(path.getDevice().toUpperCase());
+		}
+		if (Platform.OS_WIN32.equals(Platform.getOS()) && path != null && path.toString().startsWith("//")) {
+			String server = path.segment(0);
+			String pathStr = path.toString().replace(server, server.toUpperCase());
+			return new Path(pathStr);
+		}
+		return path;
+	}
+
 }
diff --git a/...pse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/EclipseProjectImporter.java b/...pse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/EclipseProjectImporter.java
@@ -23,11 +23,12 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.ls.core.internal.AbstractProjectImporter;
 import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
+import org.eclipse.jdt.ls.core.internal.ProjectUtils;
+import org.eclipse.jdt.ls.core.internal.ResourceUtils;
 
 public class EclipseProjectImporter extends AbstractProjectImporter {
 
@@ -78,14 +79,14 @@ private void importDir(java.nio.file.Path dir, IProgressMonitor m) {
 			IProject project = workspace.getRoot().getProject(name);
 			if (project.exists()) {
 				IPath existingProjectPath = project.getLocation();
-				existingProjectPath = fixDevice(existingProjectPath);
-				dotProjectPath = fixDevice(dotProjectPath);
+				existingProjectPath = ResourceUtils.fixDevice(existingProjectPath);
+				dotProjectPath = ResourceUtils.fixDevice(dotProjectPath);
 				if (existingProjectPath.equals(dotProjectPath.removeLastSegments(1))) {
 					project.open(IResource.NONE, monitor.newChild(1));
 					project.refreshLocal(IResource.DEPTH_INFINITE, monitor.newChild(1));
 					return;
 				} else {
-					project = findUniqueProject(workspace, name);
+					project = ProjectUtils.findUniqueProject(workspace, name);
 					descriptor.setName(project.getName());
 				}
 			}
@@ -99,27 +100,4 @@ private void importDir(java.nio.file.Path dir, IProgressMonitor m) {
 		}
 	}
 
-	private IPath fixDevice(IPath path) {
-		if (path != null && path.getDevice() != null) {
-			return path.setDevice(path.getDevice().toUpperCase());
-		}
-		if (Platform.OS_WIN32.equals(Platform.getOS()) && path != null && path.toString().startsWith("//")) {
-			String server = path.segment(0);
-			String pathStr = path.toString().replace(server, server.toUpperCase());
-			return new Path(pathStr);
-		}
-		return path;
-	}
-
-	//XXX should be package protected. Temporary fix (ahaha!) until test fragment can work in tycho builds
-	public IProject findUniqueProject(IWorkspace workspace, String basename) {
-		IProject project = null;
-		String name;
-		for (int i = 1; project == null || project.exists(); i++) {
-			name = (i < 2)? basename:basename + " ("+ i +")";
-			project = workspace.getRoot().getProject(name);
-		}
-		return project;
-	}
-
 }