From cd3df996f13322f05ea42841b12102bfb5f89921 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Fri, 12 Feb 2016 14:55:56 +0300
Subject: [PATCH] gradle: don't replace '-' in module names

---
 .../project/BaseGradleProjectResolverExtension.java    |  2 +-
 .../importing/GradleDependenciesImportingTest.java     | 10 +++++-----
 .../gradle/importing/GradleMiscImportingTest.java      |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
index 9f67df07d689..4d048250f202 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
@@ -235,7 +235,7 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
 
   @NotNull
   private static String getInternalModuleName(@NotNull IdeaModule gradleModule, @NotNull String sourceSetName) {
-    return FileUtil.sanitizeFileName(gradleModule.getName() + "_" + sourceSetName);
+    return PathUtilRt.suggestFileName(gradleModule.getName() + "_" + sourceSetName, true, false);
   }
 
   @Override
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
index b310e13801f0..b44bfe8f11fd 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
@@ -269,11 +269,11 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
       "}\n"
     );
 
-    assertModules("project", "project1", "project1_main", "project1_test", "project2", "project2_main", "project2_test", "project-tests", "project_tests_main", "project_tests_test");
+    assertModules("project", "project1", "project1_main", "project1_test", "project2", "project2_main", "project2_test", "project-tests", "project-tests_main", "project-tests_test");
 
-    assertModuleModuleDepScope("project_tests_main", "project1_main", DependencyScope.COMPILE);
-    assertModuleModuleDepScope("project_tests_main", "project2_main", DependencyScope.RUNTIME);
-    assertModuleLibDepScope("project_tests_main", "Gradle: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.0", DependencyScope.COMPILE);
-    assertModuleLibDepScope("project_tests_main", "Gradle: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1", DependencyScope.RUNTIME);
+    assertModuleModuleDepScope("project-tests_main", "project1_main", DependencyScope.COMPILE);
+    assertModuleModuleDepScope("project-tests_main", "project2_main", DependencyScope.RUNTIME);
+    assertModuleLibDepScope("project-tests_main", "Gradle: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.0", DependencyScope.COMPILE);
+    assertModuleLibDepScope("project-tests_main", "Gradle: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1", DependencyScope.RUNTIME);
   }
 }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleMiscImportingTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleMiscImportingTest.java
index 88c0cb575d43..6fb88e2b4e74 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleMiscImportingTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleMiscImportingTest.java
@@ -66,11 +66,11 @@ public class GradleMiscImportingTest extends GradleImportingTestCase {
       "apply plugin: 'java'"
     );
 
-    assertModules("my-project", "my_project_main", "my_project_test");
+    assertModules("my-project", "my-project_main", "my-project_test");
 
-    final Module testModule = getModule("my_project_test");
+    final Module testModule = getModule("my-project_test");
     TestModuleProperties testModuleProperties = TestModuleProperties.getInstance(testModule);
-    assertEquals("my_project_main", testModuleProperties.getProductionModuleName());
+    assertEquals("my-project_main", testModuleProperties.getProductionModuleName());
   }
 
   @Test