From f619ad8d0a73c89043cbb69e115774aca4569da5 Mon Sep 17 00:00:00 2001 From: Imran Malic Settuba <46971368+i-walker@users.noreply.github.com> Date: Wed, 9 Mar 2022 13:14:14 +0100 Subject: [PATCH] File name generation fix (#2681) --- .../src/main/kotlin/arrow/optics/plugin/internals/dsl.kt | 6 +++--- .../src/main/kotlin/arrow/optics/plugin/internals/isos.kt | 2 +- .../src/main/kotlin/arrow/optics/plugin/internals/lenses.kt | 2 +- .../src/main/kotlin/arrow/optics/plugin/internals/prism.kt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/dsl.kt b/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/dsl.kt index 69cf6e992d2..9c412bb07e2 100644 --- a/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/dsl.kt +++ b/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/dsl.kt @@ -3,21 +3,21 @@ package arrow.optics.plugin.internals fun generateLensDsl(ele: ADT, optic: DataClassDsl): Snippet = Snippet( `package` = ele.packageName, - name = ele.sourceClassName, + name = ele.simpleName, content = processLensSyntax(ele, optic.foci) ) fun generateOptionalDsl(ele: ADT, optic: DataClassDsl): Snippet = Snippet( `package` = ele.packageName, - name = ele.sourceClassName, + name = ele.simpleName, content = processOptionalSyntax(ele, optic) ) fun generatePrismDsl(ele: ADT, isoOptic: SealedClassDsl): Snippet = Snippet( `package` = ele.packageName, - name = ele.sourceClassName, + name = ele.simpleName, content = processPrismSyntax(ele, isoOptic) ) diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/isos.kt b/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/isos.kt index 40ef5656d2b..8d03c00fd4a 100644 --- a/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/isos.kt +++ b/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/isos.kt @@ -1,7 +1,7 @@ package arrow.optics.plugin.internals internal fun generateIsos(ele: ADT, target: IsoTarget) = - Snippet(`package` = ele.packageName, name = ele.sourceClassName, content = processElement(ele, target)) + Snippet(`package` = ele.packageName, name = ele.simpleName, content = processElement(ele, target)) inline val Target.targetNames inline get() = foci.map(Focus::className) diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/lenses.kt b/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/lenses.kt index db1c8a2381c..ee56194d6ed 100644 --- a/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/lenses.kt +++ b/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/lenses.kt @@ -5,7 +5,7 @@ import java.util.Locale internal fun generateLenses(ele: ADT, target: LensTarget) = Snippet( `package` = ele.packageName, - name = ele.sourceClassName, + name = ele.simpleName, content = processElement(ele, target.foci) ) diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/prism.kt b/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/prism.kt index 77fa0b377d1..19bbaae8e88 100644 --- a/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/prism.kt +++ b/arrow-libs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/prism.kt @@ -3,7 +3,7 @@ package arrow.optics.plugin.internals internal fun generatePrisms(ele: ADT, target: PrismTarget) = Snippet( `package` = ele.packageName, - name = ele.sourceClassName, + name = ele.simpleName, imports = setOf("import arrow.core.left", "import arrow.core.right", "import arrow.core.identity"), content = processElement(ele, target.foci)