Remove Node.TypeArg.type extension

orangain · Jul 9, 2022 · ea3fe8c · ea3fe8c
1 parent 02e721b
commit ea3fe8c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/ktcodeshift-cli/src/test/resources/examples/GenerateBuilders.transform.kts b/ktcodeshift-cli/src/test/resources/examples/GenerateBuilders.transform.kts
@@ -1,7 +1,10 @@
 import ktast.ast.Node
 import ktast.ast.Visitor
 import ktast.ast.Writer
-import ktcodeshift.*
+import ktcodeshift.Api
+import ktcodeshift.isDataClass
+import ktcodeshift.toSource
+import ktcodeshift.transform
 import org.jetbrains.kotlin.util.capitalizeDecapitalize.decapitalizeSmart
 import java.nio.charset.StandardCharsets
 
@@ -47,7 +50,7 @@ transform { fileInfo ->
                                         typeArg.copy(
                                             typeRef = typeArg.typeRef?.copy(
                                                 type = toFqNameType(
-                                                    typeArg.type as Node.Type.Simple,
+                                                    typeArg.typeRef?.type as Node.Type.Simple,
                                                     nestedNames
                                                 ),
                                             ),
@@ -141,7 +144,8 @@ transform { fileInfo ->
                                 val firstParamType = firstParam.typeRef?.type as? Node.Type.Simple
                                 if (firstParamType != null) {
                                     if (firstParamType.pieces.firstOrNull()?.name?.name == "List") {
-                                        val listElementType = firstParamType.pieces.first().typeArgs!!.elements[0].type
+                                        val listElementType =
+                                            firstParamType.pieces.first().typeArgs!!.elements[0].typeRef?.type
                                         if (listElementType != null) {
                                             val varargFunc = functionDeclaration(
                                                 name = nameExpression(functionName),

diff --git a/ktcodeshift-dsl/src/main/kotlin/ktcodeshift/NodeExtension.kt b/ktcodeshift-dsl/src/main/kotlin/ktcodeshift/NodeExtension.kt
@@ -10,6 +10,3 @@ val Node.WithModifiers.keywordModifiers: List<Node.Modifier.Keyword>
 
 val Node.Declaration.Class.isDataClass: Boolean
     get() = isClass && keywordModifiers.contains(Node.Modifier.Keyword(Node.Modifier.Keyword.Token.DATA))
-
-val Node.TypeArg.type: Node.Type?
-    get() = (this as? Node.TypeArg)?.typeRef?.type