refactor: renaming for fix testS

unit-mesh · Dec 26, 2023 · f22c2f6 · f22c2f6
1 parent 301af44
commit f22c2f6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/unit-picker/src/main/kotlin/cc/unitmesh/pick/strategy/bizcode/RelatedCodeStrategyBuilder.kt b/unit-picker/src/main/kotlin/cc/unitmesh/pick/strategy/bizcode/RelatedCodeStrategyBuilder.kt
@@ -53,7 +53,7 @@ class RelatedCodeStrategyBuilder(private val context: JobContext) : CodeStrategy
                     .filter {
                         it.afterCursor.isNotBlank() && it.beforeCursor.isNotBlank()
                     }
-                    .take(context.maxCompletionInOneFile)
+                    .take(context.maxTypedCompletionSize)
                     .map {
                         RelatedCodeIns(
                             language = language,

diff --git a/unit-picker/src/main/kotlin/cc/unitmesh/pick/worker/job/InstructionFileJob.kt b/unit-picker/src/main/kotlin/cc/unitmesh/pick/worker/job/InstructionFileJob.kt
@@ -15,7 +15,6 @@ class InstructionFileJob(
     companion object {
         fun from(fileJob: FileJob): InstructionFileJob {
             val content = removeMultipleComments(fileJob.language, fileJob.content.decodeToString())
-            // todo : remove comments
             return InstructionFileJob(
                 code = content,
                 fileSummary = fileJob
@@ -38,8 +37,6 @@ fun removeMultipleComments(language: String, code: String): String {
     return when (language.lowercase()) {
         "java" -> {
             val matcher = pattern.matcher(code)
-
-            // 用空字符串替换注释
             return matcher.replaceAll("")
         }
 

diff --git a/unit-picker/src/main/kotlin/cc/unitmesh/pick/worker/job/JobContext.kt b/unit-picker/src/main/kotlin/cc/unitmesh/pick/worker/job/JobContext.kt
@@ -1,22 +1,21 @@
 package cc.unitmesh.pick.worker.job
 
-import cc.unitmesh.pick.option.InsOutputConfig
 import cc.unitmesh.core.completion.CompletionBuilderType
-import cc.unitmesh.pick.threshold.InsQualityThreshold
+import cc.unitmesh.pick.option.InsOutputConfig
 import cc.unitmesh.pick.project.ProjectContext
+import cc.unitmesh.pick.threshold.InsQualityThreshold
 import cc.unitmesh.quality.CodeQualityType
 import kotlinx.serialization.Serializable
 import org.archguard.scanner.analyser.count.FileJob
 
-
 @Serializable
 data class JobContext(
     val job: InstructionFileJob,
     val qualityTypes: List<CodeQualityType>,
     val fileTree: HashMap<String, InstructionFileJob>,
     val insOutputConfig: InsOutputConfig = InsOutputConfig(),
     val completionBuilderTypes: List<CompletionBuilderType>,
-    val maxCompletionInOneFile: Int,
+    val maxTypedCompletionSize: Int,
     val project: ProjectContext = ProjectContext(),
     val insQualityThreshold: InsQualityThreshold,
 ) {
@@ -29,7 +28,7 @@ data class JobContext(
                 qualityTypes = listOf(),
                 fileTree = fileTree,
                 completionBuilderTypes = listOf(),
-                maxCompletionInOneFile = 3,
+                maxTypedCompletionSize = InsQualityThreshold.MAX_PROJECT_TYPED_COMPLETION_SIZE,
                 insQualityThreshold = InsQualityThreshold()
             )
         }

diff --git a/...icker/src/test/kotlin/cc/unitmesh/pick/builder/strategy/RelatedCodeStrategyBuilderTest.kt b/...icker/src/test/kotlin/cc/unitmesh/pick/builder/strategy/RelatedCodeStrategyBuilderTest.kt
@@ -48,7 +48,7 @@ public class HelloController {
             fileTree = hashMapOf("" to job),
             insOutputConfig = InsOutputConfig(),
             completionBuilderTypes = listOf(CompletionBuilderType.IN_BLOCK_COMPLETION),
-            maxCompletionInOneFile = 3,
+            maxTypedCompletionSize = 3,
             insQualityThreshold = InsQualityThreshold()
         )
         val builder = RelatedCodeStrategyBuilder(context)
@@ -87,7 +87,7 @@ public class HelloController {
             fileTree = hashMapOf("" to job),
             insOutputConfig = InsOutputConfig(),
             completionBuilderTypes = listOf(CompletionBuilderType.IN_BLOCK_COMPLETION),
-            maxCompletionInOneFile = 3,
+            maxTypedCompletionSize = 3,
             insQualityThreshold = InsQualityThreshold()
         )
         val builder = RelatedCodeStrategyBuilder(context)
@@ -135,7 +135,7 @@ public class HelloController {
             ),
             insOutputConfig = InsOutputConfig(),
             completionBuilderTypes = listOf(CompletionBuilderType.IN_BLOCK_COMPLETION),
-            maxCompletionInOneFile = 3,
+            maxTypedCompletionSize = 3,
             insQualityThreshold = InsQualityThreshold()
         )
 

diff --git a/...ker/src/test/kotlin/cc/unitmesh/pick/builder/strategy/SimilarChunksStrategyBuilderTest.kt b/...ker/src/test/kotlin/cc/unitmesh/pick/builder/strategy/SimilarChunksStrategyBuilderTest.kt
@@ -45,7 +45,7 @@ public class HelloController {
             fileTree = hashMapOf("" to job),
             insOutputConfig = InsOutputConfig(),
             completionBuilderTypes = listOf(CompletionBuilderType.IN_BLOCK_COMPLETION),
-            maxCompletionInOneFile = 3,
+            maxTypedCompletionSize = 3,
             insQualityThreshold = InsQualityThreshold()
         )
         val builder = SimilarChunksStrategyBuilder(context)
@@ -93,7 +93,7 @@ public class HelloController {
             ),
             insOutputConfig = InsOutputConfig(),
             completionBuilderTypes = listOf(CompletionBuilderType.IN_BLOCK_COMPLETION),
-            maxCompletionInOneFile = 3,
+            maxTypedCompletionSize = 3,
             insQualityThreshold = InsQualityThreshold()
         )
 

diff --git a/...-picker/src/test/kotlin/cc/unitmesh/pick/builder/unittest/lang/JavaTestCodeServiceTest.kt b/...-picker/src/test/kotlin/cc/unitmesh/pick/builder/unittest/lang/JavaTestCodeServiceTest.kt
@@ -175,7 +175,7 @@ public class CompanyService {
             ),
             insOutputConfig = InsOutputConfig(),
             completionBuilderTypes = listOf(CompletionBuilderType.TEST_CODE_GEN),
-            maxCompletionInOneFile = 3,
+            maxTypedCompletionSize = 3,
             insQualityThreshold = InsQualityThreshold()
         )