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

inline quotePath

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-01-02 11:27:52 +01:00
parent d2859948fa
commit 8889f71a13
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/model-serialization/src/com/intellij/openapi/components/ExpandMacroToPathMap.java
+2 -1
View File
@@ -16,6 +16,7 @@
package com.intellij.openapi.components;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.ContainerUtilRt;
@@ -32,7 +33,7 @@ public class ExpandMacroToPathMap extends PathMacroMap {
private final Map<String, String> myMacroExpands = ContainerUtil.newHashMap();
public void addMacroExpand(@NotNull String macroName, @NotNull String path) {
myMacroExpands.put(macroName, PathMacroMap.quotePath(path));
myMacroExpands.put(macroName, FileUtil.toSystemIndependentName(path));
}
public void put(@NotNull String fromText, @NotNull String toText) {
jps/model-serialization/src/com/intellij/openapi/components/PathMacroMap.java
-6
View File
@@ -17,7 +17,6 @@ package com.intellij.openapi.components;
import com.intellij.openapi.application.PathMacroFilter;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.io.FileUtil;
import org.jdom.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -91,10 +90,5 @@ public abstract class PathMacroMap {
return substitute(text, caseSensitive);
}
@NotNull
protected static String quotePath(@NotNull String path) {
return FileUtil.toSystemIndependentName(path);
}
public abstract int hashCode();
}
platform/projectModel-impl/src/com/intellij/application/options/ReplacePathToMacroMap.java
+2 -1
View File
@@ -17,6 +17,7 @@ package com.intellij.application.options;
import com.intellij.openapi.components.PathMacroMap;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
@@ -55,7 +56,7 @@ public class ReplacePathToMacroMap extends PathMacroMap {
}
public void addMacroReplacement(String path, String macroName) {
addReplacement(quotePath(path), "$" + macroName + "$", true);
addReplacement(FileUtil.toSystemIndependentName(path), "$" + macroName + "$", true);
}
public void addReplacement(String path, String macroExpr, boolean overwrite) {