@@ -248,7 +248,7 @@ class CommunicationKspSymbolProcessor(
248248 val classMapTypeNames = paramsClazz.toTypedArray()
249249 val paramListStr = " val paramsInfoList = mutableListOf<%T>()"
250250// logger.error("paramsInfoStringBuilder=$paramsInfoStringBuilder")
251- if (isSubtype(symbol, " android.app.Activity" )){
251+ if (symbol. isSubtype(" android.app.Activity" )){
252252 val classFunName = " get${classKey} Class"
253253 val whatsMyName1 = whatsMyName(" go$routeClassName " )
254254 if (! emptyRoute){
@@ -344,7 +344,7 @@ class CommunicationKspSymbolProcessor(
344344 }
345345
346346 routeBuilder.addFunction(whatsMyName1.build())
347- }else if (isSubtype(symbol, " androidx.fragment.app.Fragment" ) || isSubtype(symbol, " android.app.Fragment" )){
347+ }else if (symbol. isSubtype(" androidx.fragment.app.Fragment" ) || symbol. isSubtype(" android.app.Fragment" )){
348348 val classFunName = " new${classKey} "
349349 val anyClassName = ClassName .bestGuess(Any ::class .qualifiedName!! )
350350 val whatsMyName2 = whatsMyName(" new$routeClassName " )
@@ -364,7 +364,7 @@ class CommunicationKspSymbolProcessor(
364364 symbol.toString()
365365 )
366366
367- if (isSubtype(symbol, " androidx.fragment.app.Fragment" )){
367+ if (symbol. isSubtype(" androidx.fragment.app.Fragment" )){
368368 activityBuilder.superclass(ClassName .bestGuess(" androidx.fragment.app.Fragment" ))
369369 }else {
370370 activityBuilder.superclass(ClassName .bestGuess(" android.app.Fragment" ))
@@ -395,7 +395,7 @@ class CommunicationKspSymbolProcessor(
395395 }
396396 }
397397
398- if (isSubtype(symbol, " androidx.fragment.app.Fragment" )){
398+ if (symbol. isSubtype(" androidx.fragment.app.Fragment" )){
399399 whatsMyName2.addStatement(
400400 " if (instance is %T) {"
401401 ,ClassName .bestGuess(
@@ -476,17 +476,6 @@ class CommunicationKspSymbolProcessor(
476476 return symbols.filter { ! it.validate() }.toList()
477477 }
478478
479- private fun isSubtype (symbol : KSClassDeclaration ,superType : String ):Boolean {
480- symbol.getAllSuperTypes().toList().forEach {
481- val className = " ${it.declaration.packageName.asString()} .${it} "
482- if (className == superType){
483- return true
484- }
485- // logger.error("symbol=${symbol},superTypes= ${it.declaration.packageName.asString()+"."+it}")
486- }
487- return false
488- }
489-
490479 private val routeParamsMap = mutableMapOf<String ,MutableMap <String ,RouteParamsConfig >>()
491480 private fun processRouteParams (resolver : Resolver ): List <KSAnnotated > {
492481 val symbols =
@@ -513,7 +502,7 @@ class CommunicationKspSymbolProcessor(
513502 map[key] = config
514503// logger.error("annotationMap=$annotationMap")
515504// logger.error("symbolLocation=$className${symbol}")
516- // logger.error("symbolType=${symbol.type.resolve().declaration.packageName.asString()}.${symbol.type }")
505+ // logger.error("symbolType=${( symbol.type.resolve().declaration as KSClassDeclaration).superTypes }")
517506
518507 }
519508 return symbols.filter { ! it.validate() }.toList()
0 commit comments