MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Windows short names resolving simplified

Browse Source
This commit is contained in:
Roman Shevchenko
2012-12-06 19:09:51 +01:00
parent 3b06fed9ca
commit 0dfabb6bb5
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/openapi/util/io/FileUtil.java
+2 -7
View File
@@ -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) {