From 8889f71a135d2ed1efbbaa12ea13ab023b3cfd38 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 2 Jan 2017 11:27:52 +0100
Subject: [PATCH] inline quotePath

---
 .../intellij/openapi/components/ExpandMacroToPathMap.java   | 3 ++-
 .../src/com/intellij/openapi/components/PathMacroMap.java   | 6 ------
 .../intellij/application/options/ReplacePathToMacroMap.java | 3 ++-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/jps/model-serialization/src/com/intellij/openapi/components/ExpandMacroToPathMap.java b/jps/model-serialization/src/com/intellij/openapi/components/ExpandMacroToPathMap.java
index b4bcef65e591..858ec25736e0 100644
--- a/jps/model-serialization/src/com/intellij/openapi/components/ExpandMacroToPathMap.java
+++ b/jps/model-serialization/src/com/intellij/openapi/components/ExpandMacroToPathMap.java
@@ -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) {
diff --git a/jps/model-serialization/src/com/intellij/openapi/components/PathMacroMap.java b/jps/model-serialization/src/com/intellij/openapi/components/PathMacroMap.java
index bd5c592f384e..30ba779e2390 100644
--- a/jps/model-serialization/src/com/intellij/openapi/components/PathMacroMap.java
+++ b/jps/model-serialization/src/com/intellij/openapi/components/PathMacroMap.java
@@ -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();
 }
diff --git a/platform/projectModel-impl/src/com/intellij/application/options/ReplacePathToMacroMap.java b/platform/projectModel-impl/src/com/intellij/application/options/ReplacePathToMacroMap.java
index 2e8533179e1d..c2d5ebdafa25 100644
--- a/platform/projectModel-impl/src/com/intellij/application/options/ReplacePathToMacroMap.java
+++ b/platform/projectModel-impl/src/com/intellij/application/options/ReplacePathToMacroMap.java
@@ -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) {