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

fix macro replacements: skip relative paths to root to not walk relatively under root dir

Browse Source
This commit is contained in:
Alexey Pegov
2009-10-22 19:34:44 +04:00
parent d35a4b83e3
commit 16b2124e70
2 changed files with 2 additions and 4 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 -2
View File
@@ -86,12 +86,11 @@ public class ModulePathMacroManager extends BasePathMacroManager /*ProjectPathMa
String macro = "$" + PathMacrosImpl.MODULE_DIR_MACRO_NAME + "$";
boolean check = false;
while (f != null) {
while (f != null && f.getParentFile() != null) {
@NonNls String path = PathMacroMap.quotePath(f.getAbsolutePath());
String s = macro;
if (StringUtil.endsWithChar(path, '/')) s += "/";
if (path.equals("/")) break;
putIfAbsent(result, "file://" + path, "file://" + s, check);
putIfAbsent(result, "file:/" + path, "file:/" + s, check);
platform/platform-impl/src/com/intellij/openapi/components/impl/ProjectPathMacroManager.java
+1 -2
View File
@@ -57,12 +57,11 @@ public class ProjectPathMacroManager extends BasePathMacroManager {
String macro = "$" + PathMacrosImpl.PROJECT_DIR_MACRO_NAME + "$";
boolean check = false;
while (f != null) {
while (f != null && f.getParentFile() != null) {
String path = PathMacroMap.quotePath(f.getAbsolutePath());
String s = macro;
if (StringUtil.endsWithChar(path, '/')) s += "/";
if (path.equals("/")) break;
putIfAbsent(result, "file://" + path, "file://" + s, check);
putIfAbsent(result, "file:/" + path, "file:/" + s, check);