From 05193ca3d482b57c4b1098a099f53aa72cea9433 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 16 Dec 2016 10:19:24 +0100
Subject: [PATCH] use VFS to load module iml file

---
 .../src/FileBasedStorage.kt                   | 54 +++++++++++++------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/platform/configuration-store-impl/src/FileBasedStorage.kt b/platform/configuration-store-impl/src/FileBasedStorage.kt
index 539fdea63983..58b3176b25c5 100644
--- a/platform/configuration-store-impl/src/FileBasedStorage.kt
+++ b/platform/configuration-store-impl/src/FileBasedStorage.kt
@@ -41,6 +41,8 @@ import org.jdom.Element
 import org.jdom.JDOMException
 import org.jdom.Parent
 import java.io.IOException
+import java.nio.ByteBuffer
+import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.NoSuchFileException
 import java.nio.file.Path
@@ -112,31 +114,25 @@ open class FileBasedStorage(file: Path,
 
   override fun loadLocalData(): Element? {
     blockSavingTheContent = false
-
-    val attributes: BasicFileAttributes?
     try {
-      attributes = Files.readAttributes(file, BasicFileAttributes::class.java)
-    }
-    catch (e: NoSuchFileException) {
-      return null
-    }
-    catch (e: IOException) {
-      processReadException(e)
-      return null
-    }
+      // use VFS to load module file because it is refreshed and loaded into VFS in any case
+      if (fileSpec != StoragePathMacros.MODULE_FILE) {
+        return loadLocalDataUsingIo()
+      }
 
-    try {
-      if (!attributes.isRegularFile) {
+      val file = virtualFile
+      if (file == null || file.isDirectory || !file.isValid) {
         LOG.debug { "Document was not loaded for $fileSpec, not a file" }
       }
-      else if (attributes.size() == 0L) {
+      else if (file.length == 0L) {
         processReadException(null)
       }
       else {
-        val data = file.readChars()
-        lineSeparator = detectLineSeparators(data, if (isUseXmlProlog) null else LineSeparator.LF)
-        return loadElement(data)
+        val charBuffer = StandardCharsets.UTF_8.decode(ByteBuffer.wrap(file.contentsToByteArray()))
+        lineSeparator = detectLineSeparators(charBuffer, if (isUseXmlProlog) null else LineSeparator.LF)
+        return JDOMUtil.loadDocument(charBuffer).detachRootElement()
       }
+      return null
     }
     catch (e: JDOMException) {
       processReadException(e)
@@ -147,6 +143,30 @@ open class FileBasedStorage(file: Path,
     return null
   }
 
+  private fun loadLocalDataUsingIo(): Element? {
+    val attributes: BasicFileAttributes?
+    try {
+      attributes = Files.readAttributes(file, BasicFileAttributes::class.java)
+    }
+    catch (e: NoSuchFileException) {
+      LOG.debug { "Document was not loaded for $fileSpec, doesn't exist" }
+      return null
+    }
+
+    if (!attributes.isRegularFile) {
+      LOG.debug { "Document was not loaded for $fileSpec, not a file" }
+    }
+    else if (attributes.size() == 0L) {
+      processReadException(null)
+    }
+    else {
+      val data = file.readChars()
+      lineSeparator = detectLineSeparators(data, if (isUseXmlProlog) null else LineSeparator.LF)
+      return loadElement(data)
+    }
+    return null
+  }
+
   private fun processReadException(e: Exception?) {
     val contentTruncated = e == null
     blockSavingTheContent = !contentTruncated && (PROJECT_FILE == fileSpec || fileSpec.startsWith(PROJECT_CONFIG_DIR) || fileSpec == StoragePathMacros.MODULE_FILE || fileSpec == StoragePathMacros.WORKSPACE_FILE)