From ef9997e8512633bbdc5bb16d90742935debde7f7 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sat, 9 Jun 2012 21:21:36 +0400 Subject: [PATCH] Not the right place for canonical paths --- .../openapi/components/impl/BasePathMacroManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java index 0ef62c27ae24..7df0aeeecc55 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java @@ -49,7 +49,7 @@ public class BasePathMacroManager extends PathMacroManager { if (f == null) return; addFileHierarchyReplacements(result, f.getParent(), macro + "/.."); - final String path = FileUtil.toSystemIndependentName(f.getCanonicalPath()); + final String path = FileUtil.toSystemIndependentName(f.getPath()); String s = macro; if (StringUtil.endsWithChar(path, '/')) s += "/"; result.put(s, path); @@ -62,7 +62,7 @@ public class BasePathMacroManager extends PathMacroManager { VirtualFile dir = StandardFileSystems.local().findFileByPath(path); boolean check = false; while (dir != null && dir.getParent() != null) { - path = FileUtil.toSystemIndependentName(dir.getCanonicalPath()); + path = dir.getPath(); String s = macro; if (StringUtil.endsWithChar(path, '/')) s += "/";