Skip to content

Restore auto-building when smart import fails #4256

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
vogella wants to merge 1 commit into
base: master
Choose a base branch
from
+36 −11
Open

Restore auto-building when smart import fails #4256

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
31 changes: 20 additions & 11 deletions ...s/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/SmartImportJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,11 @@ public void setListener(RecursiveImportListener listener) {

@Override
public IStatus run(IProgressMonitor monitor) {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
boolean isAutoBuilding = workspace.isAutoBuilding();
try {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
IWorkspaceDescription description = workspace.getDescription();
boolean isAutoBuilding = workspace.isAutoBuilding();
if (isAutoBuilding) {
description.setAutoBuilding(false);
workspace.setDescription(description);
setAutoBuilding(workspace, false);
}

if (directoriesToImport != null) {
Expand Down Expand Up @@ -270,21 +268,32 @@ protected IStatus run(IProgressMonitor aMonitor) {
try {
project.close(monitor);
} catch (CoreException e) {
listener.errorHappened(project.getLocation(), e);
if (listener != null) {
listener.errorHappened(project.getLocation(), e);
}
}
});
}

if (isAutoBuilding) {
description.setAutoBuilding(true);
workspace.setDescription(description);
}
} catch (Exception ex) {
return new Status(IStatus.ERROR, IDEWorkbenchPlugin.IDE_WORKBENCH, ex.getMessage(), ex);
} finally {
if (isAutoBuilding) {
try {
setAutoBuilding(workspace, true);
} catch (CoreException ex) {
IDEWorkbenchPlugin.log("Could not restore auto-building after import", ex); //$NON-NLS-1$
}
}
}
return Status.OK_STATUS;
}

private static void setAutoBuilding(IWorkspace workspace, boolean autoBuilding) throws CoreException {
IWorkspaceDescription description = workspace.getDescription();
description.setAutoBuilding(autoBuilding);
workspace.setDescription(description);
}

protected boolean rootProjectWorthBeingRemoved() {
if (this.report.size() == 1) {
return false;
Expand Down
16 changes: 16 additions & 0 deletions ...eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/SmartImportTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,4 +572,20 @@ public void testSmartImportJobSkipsDotFoldersInProposals() throws Exception {
org.eclipse.core.tests.harness.FileSystemHelper.clear(tempDir.toFile());
}
}

@Test
public void testAutoBuildingRestoredAfterFailedImport() throws Exception {
assertTrue("Test expects auto-building to be enabled", ResourcesPlugin.getWorkspace().isAutoBuilding());
// a regular file as import root makes the project creation fail
java.nio.file.Path notADirectory = Files.createTempFile("smartImportFailure", ".txt");
try {
SmartImportJob job = new SmartImportJob(notADirectory.toFile(), Collections.emptySet(), true, true);
IStatus status = job.run(new NullProgressMonitor());
assertEquals("Import was expected to fail", IStatus.ERROR, status.getSeverity());
assertTrue("Auto-building must be restored after a failed import",
ResourcesPlugin.getWorkspace().isAutoBuilding());
} finally {
Files.deleteIfExists(notADirectory);
}
}
}
Loading