From ef28417ae1cb31b85cf643788eb01c98d915746c Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 2 Oct 2015 14:26:00 +0300 Subject: [PATCH] error deleting directory --- .../test-framework-java8/path.kt | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/platform/testFramework/test-framework-java8/path.kt b/platform/testFramework/test-framework-java8/path.kt index 47fe2577fbbc..2dd37a778a7f 100644 --- a/platform/testFramework/test-framework-java8/path.kt +++ b/platform/testFramework/test-framework-java8/path.kt @@ -1,32 +1,22 @@ package com.intellij.testFramework +import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VirtualFile import java.io.File -import java.io.IOException -import java.nio.file.FileVisitResult import java.nio.file.Files import java.nio.file.Path -import java.nio.file.SimpleFileVisitor -import java.nio.file.attribute.BasicFileAttributes import java.nio.file.attribute.FileTime fun Path.exists(): Boolean = Files.exists(this) fun Path.createDirectories(): Path = Files.createDirectories(this) -fun Path.deleteRecursively(): Path = if (exists()) Files.walkFileTree(this, object : SimpleFileVisitor() { - override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult { - Files.delete(file) - return FileVisitResult.CONTINUE - } - - override fun postVisitDirectory(dir: Path, exc: IOException?): FileVisitResult { - Files.delete(dir) - return FileVisitResult.CONTINUE - } -}) else this +fun Path.deleteRecursively(): Path { + FileUtil.delete(toFile()) + return this +} fun Path.getLastModifiedTime(): FileTime? = Files.getLastModifiedTime(this)