-
Notifications
You must be signed in to change notification settings - Fork 402
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use linked resource instead of filesystem
Use linked resources instead of filesystem hack as this one can return invalid locations through standard API. This removes the filesystem bundle, the logic is now moved in ProjectManagers and a workspace listener takes care of using linked resources for metadata. This also remove the InvisibleProjectMetadataTest.testMetadataFileLocation() test because creating a new project in Eclipse workspace now enforces creation of a .settings/org.eclipse.core.resources.prefs file. Where the metadata for the invisible project is stored doesn't matter as the internal project is internal and not visible to user anyway.
- Loading branch information
1 parent
1813177
commit 1d172c7
Showing
25 changed files
with
230 additions
and
594 deletions.
There are no files selected for viewing
121 changes: 121 additions & 0 deletions
121
org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/LinkResourceUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,121 @@ | ||
/******************************************************************************* | ||
* Copyright (c) 2023 Red Hat, Inc. and others. | ||
* All rights reserved. This program and the accompanying materials | ||
* are made available under the terms of the Eclipse Public License 2.0 | ||
* which accompanies this distribution, and is available at | ||
* https://www.eclipse.org/legal/epl-2.0/ | ||
* | ||
* SPDX-License-Identifier: EPL-2.0 | ||
*******************************************************************************/ | ||
package org.eclipse.jdt.ls.core.internal.managers; | ||
|
||
import java.io.File; | ||
import java.io.IOException; | ||
import java.nio.file.Files; | ||
import java.nio.file.Path; | ||
import java.nio.file.StandardCopyOption; | ||
import java.nio.file.StandardOpenOption; | ||
import java.nio.file.attribute.BasicFileAttributeView; | ||
import java.nio.file.attribute.BasicFileAttributes; | ||
import java.time.Instant; | ||
|
||
import org.eclipse.core.internal.preferences.EclipsePreferences; | ||
import org.eclipse.core.resources.IFile; | ||
import org.eclipse.core.resources.IFolder; | ||
import org.eclipse.core.resources.IProject; | ||
import org.eclipse.core.resources.IProjectDescription; | ||
import org.eclipse.core.resources.IResource; | ||
import org.eclipse.core.resources.ResourcesPlugin; | ||
import org.eclipse.core.runtime.CoreException; | ||
import org.eclipse.core.runtime.IPath; | ||
import org.eclipse.core.runtime.NullProgressMonitor; | ||
import org.eclipse.core.runtime.Status; | ||
import org.eclipse.jdt.core.IJavaProject; | ||
|
||
class LinkResourceUtil { | ||
|
||
private static final IPath METADATA_FOLDER_PATH = ResourcesPlugin.getWorkspace().getRoot().getLocation().append(".projects"); | ||
|
||
private static boolean isNewer(Path file, Instant instant) throws CoreException { | ||
try { | ||
BasicFileAttributes attributes = Files.getFileAttributeView(file, BasicFileAttributeView.class).readAttributes(); | ||
return attributes.creationTime().toInstant().isAfter(instant); | ||
} catch (IOException ex) { | ||
throw new CoreException(Status.error(ex.getMessage(), ex)); | ||
} | ||
} | ||
|
||
/** | ||
* Get the redirected path of the input path. The path will be redirected to | ||
* the workspace's metadata folder ({@link LinkResourceUtil#METADATA_FOLDER_PATH}). | ||
* @param projectName name of the project. | ||
* @param path path needs to be redirected. | ||
* @return the redirected path. | ||
*/ | ||
private static IPath getMetaDataFilePath(String projectName, IPath path) { | ||
if (path.segmentCount() == 1) { | ||
return METADATA_FOLDER_PATH.append(projectName).append(path); | ||
} | ||
|
||
String lastSegment = path.lastSegment(); | ||
if (IProjectDescription.DESCRIPTION_FILE_NAME.equals(lastSegment)) { | ||
return METADATA_FOLDER_PATH.append(projectName).append(lastSegment); | ||
} | ||
|
||
return null; | ||
} | ||
|
||
private static void linkFolderIfNewer(IFolder settingsFolder, Instant instant) throws CoreException { | ||
if (settingsFolder.isLinked()) { | ||
return; | ||
} | ||
if (settingsFolder.exists() && !isNewer(settingsFolder.getLocation().toPath(), instant)) { | ||
return; | ||
} | ||
if (!settingsFolder.exists()) { | ||
// not existing yet, create link | ||
File diskFolder = getMetaDataFilePath(settingsFolder.getProject().getName(), settingsFolder.getProjectRelativePath()).toFile(); | ||
diskFolder.mkdirs(); | ||
settingsFolder.createLink(diskFolder.toURI(), IResource.NONE, new NullProgressMonitor()); | ||
} else if (isNewer(settingsFolder.getLocation().toPath(), instant)) { | ||
// already existing but not existing before import: move then link | ||
File sourceFolder = settingsFolder.getLocation().toFile(); | ||
File targetFolder = getMetaDataFilePath(settingsFolder.getProject().getName(), settingsFolder.getProjectRelativePath()).toFile(); | ||
File parentTargetFolder = targetFolder.getParentFile(); | ||
if (!parentTargetFolder.isDirectory()) { | ||
parentTargetFolder.mkdirs(); | ||
} | ||
sourceFolder.renameTo(targetFolder); | ||
settingsFolder.createLink(targetFolder.toURI(), IResource.REPLACE, new NullProgressMonitor()); | ||
} | ||
} | ||
|
||
private static void linkFileIfNewer(IFile metadataFile, Instant instant, String ifEmpty) throws CoreException { | ||
if (metadataFile.isLinked()) { | ||
return; | ||
} | ||
if (metadataFile.exists() && !isNewer(metadataFile.getLocation().toPath(), instant)) { | ||
return; | ||
} | ||
File targetFile = getMetaDataFilePath(metadataFile.getProject().getName(), metadataFile.getProjectRelativePath()).toFile(); | ||
targetFile.getParentFile().mkdirs(); | ||
try { | ||
if (metadataFile.exists()) { | ||
Files.move(metadataFile.getLocation().toFile().toPath(), targetFile.toPath(), StandardCopyOption.REPLACE_EXISTING); | ||
} else { | ||
Files.writeString(targetFile.toPath(), ifEmpty != null ? ifEmpty : "", StandardOpenOption.CREATE); | ||
} | ||
} catch (IOException ex) { | ||
throw new CoreException(Status.error(ex.getMessage(), ex)); | ||
} | ||
metadataFile.createLink(targetFile.toURI(), IResource.REPLACE, new NullProgressMonitor()); | ||
} | ||
|
||
public static void linkMetadataResourcesIfNewer(IProject project, Instant instant) throws CoreException { | ||
linkFileIfNewer(project.getFile(IProjectDescription.DESCRIPTION_FILE_NAME), instant, null); | ||
linkFolderIfNewer(project.getFolder(EclipsePreferences.DEFAULT_PREFERENCES_DIRNAME), instant); | ||
linkFileIfNewer(project.getFile(IJavaProject.CLASSPATH_FILE_NAME), instant, null); | ||
linkFileIfNewer(project.getFile(".factorypath"), instant, "<factorypath/>"); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
2 changes: 0 additions & 2 deletions
2
org.eclipse.jdt.ls.filesystem/.settings/org.eclipse.core.resources.prefs
This file was deleted.
Oops, something went wrong.
9 changes: 0 additions & 9 deletions
9
org.eclipse.jdt.ls.filesystem/.settings/org.eclipse.jdt.core.prefs
This file was deleted.
Oops, something went wrong.
4 changes: 0 additions & 4 deletions
4
org.eclipse.jdt.ls.filesystem/.settings/org.eclipse.m2e.core.prefs
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
31 changes: 0 additions & 31 deletions
31
....filesystem/src/org/eclipse/jdt/ls/core/internal/filesystem/JDTLSFilesystemActivator.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.