From a7014147071ab63da0bc2900d8ee546eac47dd1e Mon Sep 17 00:00:00 2001
From: Yuichi Araki <yaraki@google.com>
Date: Tue, 13 Feb 2024 15:38:32 +0900
Subject: [PATCH 1/2] Reproduce the processor issue

---
 .idea/kotlinc.xml                             |  2 +-
 .../catalog/app/activity/AdditionalSample.kt  | 30 +++++++++++++++++++
 .../framework/processor/SampleProcessor.kt    | 14 ++++-----
 3 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 app-catalog/samples/activity/src/main/java/com/google/android/catalog/app/activity/AdditionalSample.kt

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 9c5cf78..8491b65 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -4,6 +4,6 @@
     <option name="jvmTarget" value="1.8" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.10" />
+    <option name="version" value="1.9.22" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app-catalog/samples/activity/src/main/java/com/google/android/catalog/app/activity/AdditionalSample.kt b/app-catalog/samples/activity/src/main/java/com/google/android/catalog/app/activity/AdditionalSample.kt
new file mode 100644
index 0000000..4a7bfa0
--- /dev/null
+++ b/app-catalog/samples/activity/src/main/java/com/google/android/catalog/app/activity/AdditionalSample.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.catalog.app.activity
+
+import androidx.compose.runtime.Composable
+import com.google.android.catalog.framework.annotations.Sample
+
+@Sample(
+    name = "Compose sample",
+    description = "Shows how to add an additional compose target in the catalog",
+    documentation = "https://github.com/google/casa-android#create-sample-modules"
+)
+@Composable
+fun AdditionalSample() {
+    println("a")
+}
diff --git a/framework/processor/src/main/java/com/google/android/catalog/framework/processor/SampleProcessor.kt b/framework/processor/src/main/java/com/google/android/catalog/framework/processor/SampleProcessor.kt
index 023e643..5ef2dd3 100644
--- a/framework/processor/src/main/java/com/google/android/catalog/framework/processor/SampleProcessor.kt
+++ b/framework/processor/src/main/java/com/google/android/catalog/framework/processor/SampleProcessor.kt
@@ -50,18 +50,18 @@ class SampleProcessor(
 
     override fun process(resolver: Resolver): List<KSAnnotated> {
         val symbols = resolver.getSymbolsWithAnnotation(Sample::class.java.name)
-            .filter {
-                val isValid = it.validate { first, second ->
+            .filter { symbol ->
+                val isValid = symbol.validate { data, declaration ->
                     // Skip checking fields of a class since its causing issues with viewBinding
-                    !(first is KSClassDeclaration && second is KSPropertyDeclaration)
+                    !(data is KSClassDeclaration && declaration is KSPropertyDeclaration)
                 }
                 if (!isValid) {
-                    logger.warn("Annotated sample is not valid ${it.containingFile?.filePath}")
+                    logger.warn("Annotated sample is not valid ${symbol.containingFile?.filePath}")
                 }
-                (it is KSFunctionDeclaration || it is KSClassDeclaration) &&
+                (symbol is KSFunctionDeclaration || symbol is KSClassDeclaration) &&
                     isValid &&
-                    it !in visited &&
-                    !it.isAnnotationPresent(Deprecated::class)
+                    symbol !in visited &&
+                    !symbol.isAnnotationPresent(Deprecated::class)
             }
         for (symbol in symbols) {
             symbol.accept(visitor, Unit)

From 498256eb318f80718cdcc223abf0b1e39130e81f Mon Sep 17 00:00:00 2001
From: Yuichi Araki <yaraki@google.com>
Date: Wed, 14 Feb 2024 14:36:22 +0900
Subject: [PATCH 2/2] Fix SampleProcessor

Incremental builds causes subsequent KSP processing to receive only modified files. Unmodified files
were not processed, so they were missing.
---
 .gitignore                                    |  1 +
 app-catalog/app/build.gradle                  |  2 +-
 .../catalog/app/activity/AdditionalSample.kt  | 30 -------------------
 .../framework/processor/SampleProcessor.kt    | 11 +++----
 .../framework/processor/SampleVisitor.kt      |  2 +-
 5 files changed, 9 insertions(+), 37 deletions(-)
 delete mode 100644 app-catalog/samples/activity/src/main/java/com/google/android/catalog/app/activity/AdditionalSample.kt

diff --git a/.gitignore b/.gitignore
index e96b948..8795658 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ captures
 .idea/compiler.xml
 .idea/jarRepositories.xml
 .idea/deploymentTargetDropDown.xml
+.idea/deploymentTargetSelector.xml
 .idea/misc.xml
 .idea/androidTestResultsUserPreferences.xml
 .idea/appInsightsSettings.xml
diff --git a/app-catalog/app/build.gradle b/app-catalog/app/build.gradle
index 01dafc5..f0a5851 100644
--- a/app-catalog/app/build.gradle
+++ b/app-catalog/app/build.gradle
@@ -77,7 +77,7 @@ dependencies {
     implementation libs.hilt.android
     ksp libs.hilt.compiler
 
-    // Include all available samples dynamically importend in settings.gradle
+    // Include all available samples dynamically imported in settings.gradle
     gradle.ext.samples.each {
         implementation project("$it")
     }
diff --git a/app-catalog/samples/activity/src/main/java/com/google/android/catalog/app/activity/AdditionalSample.kt b/app-catalog/samples/activity/src/main/java/com/google/android/catalog/app/activity/AdditionalSample.kt
deleted file mode 100644
index 4a7bfa0..0000000
--- a/app-catalog/samples/activity/src/main/java/com/google/android/catalog/app/activity/AdditionalSample.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2024 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.catalog.app.activity
-
-import androidx.compose.runtime.Composable
-import com.google.android.catalog.framework.annotations.Sample
-
-@Sample(
-    name = "Compose sample",
-    description = "Shows how to add an additional compose target in the catalog",
-    documentation = "https://github.com/google/casa-android#create-sample-modules"
-)
-@Composable
-fun AdditionalSample() {
-    println("a")
-}
diff --git a/framework/processor/src/main/java/com/google/android/catalog/framework/processor/SampleProcessor.kt b/framework/processor/src/main/java/com/google/android/catalog/framework/processor/SampleProcessor.kt
index 5ef2dd3..928d835 100644
--- a/framework/processor/src/main/java/com/google/android/catalog/framework/processor/SampleProcessor.kt
+++ b/framework/processor/src/main/java/com/google/android/catalog/framework/processor/SampleProcessor.kt
@@ -49,8 +49,9 @@ class SampleProcessor(
     private val visited = mutableListOf<KSAnnotated>()
 
     override fun process(resolver: Resolver): List<KSAnnotated> {
-        val symbols = resolver.getSymbolsWithAnnotation(Sample::class.java.name)
-            .filter { symbol ->
+        val (validSymbols, invalidSymbols) = resolver
+            .getSymbolsWithAnnotation(Sample::class.java.name)
+            .partition { symbol ->
                 val isValid = symbol.validate { data, declaration ->
                     // Skip checking fields of a class since its causing issues with viewBinding
                     !(data is KSClassDeclaration && declaration is KSPropertyDeclaration)
@@ -63,11 +64,11 @@ class SampleProcessor(
                     symbol !in visited &&
                     !symbol.isAnnotationPresent(Deprecated::class)
             }
-        for (symbol in symbols) {
+        for (symbol in validSymbols) {
             symbol.accept(visitor, Unit)
         }
-        visited.addAll(symbols)
+        visited.addAll(validSymbols)
 
-        return symbols.toList()
+        return invalidSymbols
     }
 }
diff --git a/framework/processor/src/main/java/com/google/android/catalog/framework/processor/SampleVisitor.kt b/framework/processor/src/main/java/com/google/android/catalog/framework/processor/SampleVisitor.kt
index f4526aa..9fad8a1 100644
--- a/framework/processor/src/main/java/com/google/android/catalog/framework/processor/SampleVisitor.kt
+++ b/framework/processor/src/main/java/com/google/android/catalog/framework/processor/SampleVisitor.kt
@@ -38,7 +38,6 @@ internal class SampleVisitor(
     override fun visitClassDeclaration(classDeclaration: KSClassDeclaration, data: Unit) {
         val target = classDeclaration.getAllSuperTypes().firstNotNullOfOrNull {
             val className = it.declaration.qualifiedName?.asString().orEmpty()
-            logger.warn(className)
             when (className) {
                 "android.app.Activity" -> {
                     "targetActivity<${classDeclaration.toFullPath()}>()"
@@ -83,6 +82,7 @@ internal class SampleVisitor(
         val file = codeGenerator.createNewFile(
             dependencies = Dependencies(
                 aggregating = true,
+                functionSample.containingFile!!
             ),
             packageName = packageName,
             fileName = "${sampleFile}Module"