fix bug sub folders appearing on top level

CodeLtDave · Jun 18, 2024 · 7350ba7 · 7350ba7
1 parent ba42ff1
commit 7350ba7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/...pse.core.filesystem/src/org/eclipse/core/internal/filesystem/zip/ZipEntryFileVisitor.java b/...pse.core.filesystem/src/org/eclipse/core/internal/filesystem/zip/ZipEntryFileVisitor.java
@@ -38,6 +38,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
 		if (!dir.equals(zipRoot)) {
 			String dirName = zipRoot.relativize(dir).toString() + "/"; //$NON-NLS-1$
 			entryList.add(new ZipEntry(dirName));
+			return FileVisitResult.SKIP_SUBTREE; // Skip the subdirectories
 		}
 		return FileVisitResult.CONTINUE;
 	}

diff --git a/.../org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/zip/OpenTest.java b/.../org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/zip/OpenTest.java
@@ -116,6 +116,10 @@ public void testOpenDeepNestedTextFile() throws IOException, CoreException, URIS
 		ensureExists(nestedFile);
 		assertTextFileContent(nestedFile, "Hello World!");
 
+		String nestedPathShouldFail = "sub2";
+		IFolder nestedFileShouldFail = openedNestedZipFileParent.getFolder(nestedPathShouldFail);
+		ensureDoesNotExist(nestedFileShouldFail);
+
 		String deepNestedPath = "sub1/sub2/sub3/sub4/sub5/sub6/sub8/sub9/sub10/Text.txt";
 		IFile deepNestedFile = openedNestedZipFileParent.getFile(deepNestedPath);
 		ensureExists(deepNestedFile);