From ffc5d47e85e31d666259039d7f818d9b2d3cf3dd Mon Sep 17 00:00:00 2001
From: "Ilya.Kazakevich" <Ilya.Kazakevich@jetbrains.com>
Date: Mon, 30 Jun 2014 23:04:50 +0400
Subject: [PATCH] EA-57766 - assert: UsageTrigger.doTrigger

---
 .../internal/statistic/beans/ConvertUsagesUtil.java  |  7 ++++++-
 .../statistic/beans/ConvertUsagesUtilTest.java       | 12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 platform/smRunner/testSrc/com/intellij/internal/statistic/beans/ConvertUsagesUtilTest.java

diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/beans/ConvertUsagesUtil.java b/platform/platform-impl/src/com/intellij/internal/statistic/beans/ConvertUsagesUtil.java
index 9dd0bf6a8794..6be8a543e48a 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/beans/ConvertUsagesUtil.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/beans/ConvertUsagesUtil.java
@@ -160,7 +160,12 @@ public class ConvertUsagesUtil {
    */
   @NotNull
   public static String escapeDescriptorName(@NotNull final String name) {
-    return name.replace(" ", "_").replace(GROUP_SEPARATOR, '_').replace(GROUPS_SEPARATOR, '_').replace(GROUP_VALUE_SEPARATOR, '_');
+    return name.replace(" ", "_").
+      replace(GROUP_SEPARATOR, '_').
+      replace(GROUPS_SEPARATOR, '_').
+      replace(GROUP_VALUE_SEPARATOR, '_')
+      .replace("'", " ")
+      .replace("\"", " ");
   }
 
   private static class StringPair {
diff --git a/platform/smRunner/testSrc/com/intellij/internal/statistic/beans/ConvertUsagesUtilTest.java b/platform/smRunner/testSrc/com/intellij/internal/statistic/beans/ConvertUsagesUtilTest.java
new file mode 100644
index 000000000000..976fb293fcaa
--- /dev/null
+++ b/platform/smRunner/testSrc/com/intellij/internal/statistic/beans/ConvertUsagesUtilTest.java
@@ -0,0 +1,12 @@
+package com.intellij.internal.statistic.beans;
+
+import junit.framework.TestCase;
+
+public class ConvertUsagesUtilTest extends TestCase {
+
+  public void testEscapeDescriptorName() throws Exception {
+      ConvertUsagesUtil.assertDescriptorName(ConvertUsagesUtil.escapeDescriptorName("'Copy'_on_Steroids"));
+      ConvertUsagesUtil.assertDescriptorName(ConvertUsagesUtil.escapeDescriptorName("Some config name"));
+      ConvertUsagesUtil.assertDescriptorName(ConvertUsagesUtil.escapeDescriptorName("\"config\""));
+  }
+}
\ No newline at end of file