From 561e44b2801a75e39290af2b8079de0358c686dd Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 3 May 2017 13:21:43 +0200
Subject: [PATCH] =?UTF-8?q?ExternalStorage=20=E2=80=94=20remove=20all=20st?=
 =?UTF-8?q?orage=20files?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExternalSystemStreamProviderFactory.kt                  | 1 +
 platform/projectModel-api/src/com/intellij/util/io/path.kt  | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStreamProviderFactory.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStreamProviderFactory.kt
index f4bc140b3875..49b3c8ee69b6 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStreamProviderFactory.kt
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStreamProviderFactory.kt
@@ -121,6 +121,7 @@ private fun createStorage(project: Project): PersistentHashMap<String, ByteArray
   })
 
   fun deleteFileAndWriteLatestFormatVersion() {
+    dir.deleteChildrenStartingWith(file.fileName.toString())
     file.delete()
     versionFile.outputStream().use { it.write(MODULE_FILE_FORMAT_VERSION) }
 
diff --git a/platform/projectModel-api/src/com/intellij/util/io/path.kt b/platform/projectModel-api/src/com/intellij/util/io/path.kt
index 8ce9d943ea5b..2035c8717a1d 100644
--- a/platform/projectModel-api/src/com/intellij/util/io/path.kt
+++ b/platform/projectModel-api/src/com/intellij/util/io/path.kt
@@ -98,6 +98,12 @@ fun Path.deleteWithParentsIfEmpty(root: Path, isFile: Boolean = true): Boolean {
   return true
 }
 
+fun Path.deleteChildrenStartingWith(prefix: String) {
+  directoryStreamIfExists({ it.fileName.toString().startsWith(prefix) }) { it.toList() }?.forEach {
+    it.delete()
+  }
+}
+
 private fun Path.deleteRecursively() = Files.walkFileTree(this, object : SimpleFileVisitor<Path>() {
   override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult {
     try {