diff --git a/idealingua-v1/idealingua-v1-transpilers/src/main/scala/izumi/idealingua/translator/tocsharp/layout/CSharpLayouter.scala b/idealingua-v1/idealingua-v1-transpilers/src/main/scala/izumi/idealingua/translator/tocsharp/layout/CSharpLayouter.scala index 34f5e95..98320d9 100644 --- a/idealingua-v1/idealingua-v1-transpilers/src/main/scala/izumi/idealingua/translator/tocsharp/layout/CSharpLayouter.scala +++ b/idealingua-v1/idealingua-v1-transpilers/src/main/scala/izumi/idealingua/translator/tocsharp/layout/CSharpLayouter.scala @@ -67,8 +67,8 @@ class CSharpLayouter(options: CSharpTranslatorOptions) extends TranslationLayout val csdeps = t.typespace.domain.meta.directImports.map { i => val id = i.id - val prjDirName = s"${naming.projectDirName(id)}" - val prjName = prjDirName + val prjDirName = naming.projectDirName(id) + val prjName = naming.projectId(id) s"src/$prjDirName/$prjName.csproj" } ++ Seq(s"src/${naming.irtDir}/${naming.irtDir}.csproj") @@ -82,7 +82,7 @@ class CSharpLayouter(options: CSharpTranslatorOptions) extends TranslationLayout val csdepsTest = t.typespace.domain.meta.directImports.map { i => val id = i.id - val prjDirName = s"${naming.projectDirName(id)}" + val prjDirName = naming.projectDirName(id) val prjTestName = s"${naming.projectDirName(id)}.Test" s"tests/$prjDirName/$prjTestName.csproj" @@ -135,8 +135,8 @@ class CSharpLayouter(options: CSharpTranslatorOptions) extends TranslationLayout out => val id = out.typespace.domain.id - val prjDirName = s"${naming.projectDirName(id)}" - val prjName = prjDirName + val prjDirName = naming.projectDirName(id) + val prjName = naming.projectId(id) val prjTestName = s"$prjDirName.Test" Seq( diff --git a/idealingua-v1/idealingua-v1-transpilers/src/main/scala/izumi/idealingua/translator/tocsharp/layout/CSharpNamingConvention.scala b/idealingua-v1/idealingua-v1-transpilers/src/main/scala/izumi/idealingua/translator/tocsharp/layout/CSharpNamingConvention.scala index 0eb2d87..3e7aa6c 100644 --- a/idealingua-v1/idealingua-v1-transpilers/src/main/scala/izumi/idealingua/translator/tocsharp/layout/CSharpNamingConvention.scala +++ b/idealingua-v1/idealingua-v1-transpilers/src/main/scala/izumi/idealingua/translator/tocsharp/layout/CSharpNamingConvention.scala @@ -40,7 +40,7 @@ class CSharpNamingConvention(rule: ProjectNamingRule) { } def projectDirName(did: DomainId): String = { - naming.baseProjectId(did).map(_.capitalize).mkString(".") + naming.baseProjectId(did).map(_.capitalize).mkString } }