From 0dfabb6bb5338c359f077bcef9a28c1407f1d833 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 6 Dec 2012 18:06:08 +0100
Subject: [PATCH] Windows short names resolving simplified

---
 .../util/src/com/intellij/openapi/util/io/FileUtil.java  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
index 51d339e69eee..1a5ea96121b8 100644
--- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
@@ -23,7 +23,6 @@ import com.intellij.util.*;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.Convertor;
 import com.intellij.util.io.URLUtil;
-import com.intellij.util.text.CaseInsensitiveStringHashingStrategy;
 import com.intellij.util.text.FilePathHashingStrategy;
 import gnu.trove.TObjectHashingStrategy;
 import org.intellij.lang.annotations.RegExp;
@@ -833,12 +832,8 @@ public class FileUtil extends FileUtilRt {
   }
 
   @NotNull
-  public static String resolveShortWindowsName(@NotNull final String path) throws IOException {
-    if (SystemInfo.isWindows) {
-      //todo: this resolves symlinks on Windows, but we'd rather not do it
-      return new File(path.replace(File.separatorChar, '/')).getCanonicalPath();
-    }
-    return path;
+  public static String resolveShortWindowsName(@NotNull String path) throws IOException {
+    return SystemInfo.isWindows && StringUtil.containsChar(path, '~') ? new File(path).getCanonicalPath() : path;
   }
 
   public static void collectMatchedFiles(@NotNull File root, @NotNull Pattern pattern, @NotNull List<File> outFiles) {