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

save all paths in .iml relatively except for the ones under USER_HOME (IDEA-60906)

Browse Source 
reason: fixes the issue and I don't see any problems it could cause
This commit is contained in:
peter.gromov
2010-11-18 19:32:31 +03:00
parent f45755e795
commit 08de853c05
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java
+1 -12
View File
@@ -45,18 +45,7 @@ public class ModulePathMacroManager extends BasePathMacroManager {
public ReplacePathToMacroMap getReplacePathMap() {
ReplacePathToMacroMap result = super.getReplacePathMap();
if (!myModule.isDisposed()) {
String projectDir = ProjectPathMacroManager.getProjectDir(myModule.getProject());
if (projectDir != null) {
projectDir = projectDir.replace('/', File.separatorChar);
}
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);
addFileHierarchyReplacements(result, PathMacrosImpl.MODULE_DIR_MACRO_NAME, getModuleDir(myModule.getModuleFilePath()), getUserHome());
}
return result;
}
platform/platform-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class BasePathMacroManager extends PathMacroManager {
}
protected static String getUserHome() {
return SystemProperties.getUserHome();
return StringUtil.trimEnd(SystemProperties.getUserHome(), "/");
}