Skip to content

Show proper symlink decorations for broken symlinks #4158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iloveeclipse wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −3
Open

Show proper symlink decorations for broken symlinks #4158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/LinkedResourceDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
import java.net.URI;
import java.util.Optional;

import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileInfo;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourceAttributes;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.viewers.IDecoration;
Expand Down Expand Up @@ -108,8 +110,20 @@ public void decorate(Object element, IDecoration decoration) {
} else {
LINK_WARNING.ifPresent(decoration::addOverlay);
}
} else {
// broken filesystem symlinks (not Eclipse-linked, but a symlink with missing
// target)
ResourceAttributes attrs = resource.getResourceAttributes();
if (attrs == null) {
URI location = resource.getLocationURI();
if (location != null) {
IFileInfo fileInfo = IDEResourceInfoUtils.getFileInfo(location);
if (fileInfo != null && fileInfo.getAttribute(EFS.ATTRIBUTE_SYMLINK)) {
LINK_WARNING.ifPresent(decoration::addOverlay);
}
}
}
}

}

}
18 changes: 16 additions & 2 deletions bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/SymlinkDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@
*******************************************************************************/
package org.eclipse.ui.internal.ide;

import java.net.URI;
import java.util.Optional;

import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileInfo;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourceAttributes;
import org.eclipse.core.resources.mapping.ResourceMapping;
Expand All @@ -25,6 +28,7 @@
import org.eclipse.jface.viewers.IDecoration;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ILightweightLabelDecorator;
import org.eclipse.ui.internal.ide.dialogs.IDEResourceInfoUtils;

/**
* Decorate symbolic links
Expand Down Expand Up @@ -68,8 +72,18 @@ public void decorate(Object element, IDecoration decoration) {
IResource resource = Adapters.adapt(element, IResource.class);
if (resource != null) {
ResourceAttributes resourceAttributes = resource.getResourceAttributes();
if (resourceAttributes != null && resourceAttributes.isSymbolicLink()) {
SYMLINK.ifPresent(decoration::addOverlay);
if (resourceAttributes != null) {
if (resourceAttributes.isSymbolicLink()) {
SYMLINK.ifPresent(decoration::addOverlay);
}
} else {
URI location = resource.getLocationURI();
if (location != null) {
IFileInfo fileInfo = IDEResourceInfoUtils.getFileInfo(location);
if (fileInfo != null && fileInfo.getAttribute(EFS.ATTRIBUTE_SYMLINK)) {
SYMLINK.ifPresent(decoration::addOverlay);
}
}
}
}
}
Expand Down
Loading