under USER_HOME, prefer storing paths relatively MODULE_DIR unless the common ancesto...

diff --git a/platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java b/platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java
index a5ed8206ea55dbc109fc63f17dd2340bc71c4b0c..b51364ca829f9324b7ed995a23332a2c69d59cc5 100644 (file)
--- a/platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java
+++ b/platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java
@@ -49,7 +49,14 @@ public class ModulePathMacroManager extends BasePathMacroManager {
       if (projectDir != null) {
         projectDir = projectDir.replace('/', File.separatorChar);
       }
-      addFileHierarchyReplacements(result, PathMacrosImpl.MODULE_DIR_MACRO_NAME, getModuleDir(myModule.getModuleFilePath()), projectDir);
+      String stopAt = projectDir;
+
+      final String userHome = getUserHome();
+      if (stopAt != null && stopAt.startsWith(userHome)) {
+        stopAt = userHome;
+      }
+
+      addFileHierarchyReplacements(result, PathMacrosImpl.MODULE_DIR_MACRO_NAME, getModuleDir(myModule.getModuleFilePath()), stopAt);
     }
     return result;
   }

diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java
index b06b4219704056f661fbdf8340c930f0b9622371..6cd1318ef1f84c25396e8009e7f75e337a561365 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java
@@ -75,17 +75,21 @@ public class BasePathMacroManager extends PathMacroManager {
   public ExpandMacroToPathMap getExpandMacroMap() {
     ExpandMacroToPathMap result = new ExpandMacroToPathMap();
     result.addMacroExpand(PathMacrosImpl.APPLICATION_HOME_MACRO_NAME, PathManager.getHomePath());
-    result.addMacroExpand(PathMacrosImpl.USER_HOME_MACRO_NAME, SystemProperties.getUserHome());
+    result.addMacroExpand(PathMacrosImpl.USER_HOME_MACRO_NAME, getUserHome());
     getPathMacros().addMacroExpands(result);
     return result;
   }
 
+  protected static String getUserHome() {
+    return SystemProperties.getUserHome();
+  }
+
 
   public ReplacePathToMacroMap getReplacePathMap() {
     ReplacePathToMacroMap result = new ReplacePathToMacroMap();
 
     result.addMacroReplacement(PathManager.getHomePath(), PathMacrosImpl.APPLICATION_HOME_MACRO_NAME);
-    result.addMacroReplacement(SystemProperties.getUserHome(), PathMacrosImpl.USER_HOME_MACRO_NAME);
+    result.addMacroReplacement(getUserHome(), PathMacrosImpl.USER_HOME_MACRO_NAME);
     getPathMacros().addMacroReplacements(result);
     return result;
   }