Skip to content

Commit 491545a

Browse files
xteraoxterao
authored
Merge branch 'main' into feature/reference-doma-compile-config
2 parents 65e76e7 + 031e708 commit 491545a

File tree

4 files changed

+48
-36
lines changed

4 files changed

+48
-36
lines changed

‎src/main/kotlin/org/domaframework/doma/intellij/common/sql/directive/collector/StaticBuildFunctionCollector.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.domaframework.doma.intellij.common.sql.directive.collector
1717

18+
import com.intellij.codeInsight.lookup.AutoCompletionPolicy
1819
import com.intellij.codeInsight.lookup.LookupElement
1920
import com.intellij.codeInsight.lookup.LookupElementBuilder
2021
import com.intellij.openapi.project.Project
@@ -74,6 +75,7 @@ class StaticBuildFunctionCollector(
7475
})",
7576
true,
7677
).withTypeText(it.returnType?.presentableText ?: "void")
78+
.withAutoCompletionPolicy(AutoCompletionPolicy.ALWAYS_AUTOCOMPLETE)
7779
}
7880
}
7981

‎src/test/kotlin/org/domaframework/doma/intellij/complate/sql/SqlCompleteTest.kt‎

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import org.domaframework.doma.intellij.DomaSqlTest
2121
* Code completion testing in SQL
2222
*/
2323
class SqlCompleteTest : DomaSqlTest() {
24-
private val testDapName = "SqlCompleteTestDao"
24+
private val testDaoName = "SqlCompleteTestDao"
2525

2626
override fun setUp() {
2727
super.setUp()
2828
addDaoJavaFile(
29-
"$testDapName.java",
29+
"$testDaoName.java",
3030
)
3131
addSqlFile(
3232
"$testDapName/completeDaoArgument.sql",
@@ -60,11 +60,12 @@ class SqlCompleteTest : DomaSqlTest() {
6060
"$testDapName/completeForDirectiveItem.sql",
6161
"$testDapName/completeImplementCustomFunction.sql",
6262
"$testDapName/completeNotImplementCustomFunction.sql",
63+
6364
)
6465
}
6566

6667
fun testCompleteDaoArgument() {
67-
val sqlFile = findSqlFile("$testDapName/completeDaoArgument.sql")
68+
val sqlFile = findSqlFile("$testDaoName/completeDaoArgument.sql")
6869
assertNotNull("Not Found SQL File", sqlFile)
6970
if (sqlFile == null) return
7071

@@ -86,7 +87,7 @@ class SqlCompleteTest : DomaSqlTest() {
8687

8788
fun testCompleteInstancePropertyFromDaoArgumentClass() {
8889
innerDirectiveCompleteTest(
89-
"$testDapName/completeInstancePropertyFromDaoArgumentClass.sql",
90+
"$testDaoName/completeInstancePropertyFromDaoArgumentClass.sql",
9091
listOf(
9192
"employeeId",
9293
"employeeName",
@@ -101,7 +102,7 @@ class SqlCompleteTest : DomaSqlTest() {
101102

102103
fun testCompleteJavaPackageClass() {
103104
innerDirectiveCompleteTest(
104-
"$testDapName/completeJavaPackageClass.sql",
105+
"$testDaoName/completeJavaPackageClass.sql",
105106
listOf(
106107
"CASE_INSENSITIVE_ORDER",
107108
"toString()",
@@ -117,7 +118,7 @@ class SqlCompleteTest : DomaSqlTest() {
117118

118119
fun testCompleteForItemHasNext() {
119120
innerDirectiveCompleteTest(
120-
"$testDapName/completeForItemHasNext.sql",
121+
"$testDaoName/completeForItemHasNext.sql",
121122
emptyList(),
122123
listOf(
123124
"get()",
@@ -136,7 +137,7 @@ class SqlCompleteTest : DomaSqlTest() {
136137

137138
fun testCompleteForItemIndex() {
138139
innerDirectiveCompleteTest(
139-
"$testDapName/completeForItemIndex.sql",
140+
"$testDaoName/completeForItemIndex.sql",
140141
emptyList(),
141142
listOf(
142143
"get()",
@@ -156,7 +157,7 @@ class SqlCompleteTest : DomaSqlTest() {
156157

157158
fun testCompleteDirective() {
158159
innerDirectiveCompleteTest(
159-
"$testDapName/completeDirective.sql",
160+
"$testDaoName/completeDirective.sql",
160161
listOf(
161162
"elseif",
162163
"else",
@@ -175,7 +176,7 @@ class SqlCompleteTest : DomaSqlTest() {
175176

176177
fun testCompleteBatchInsert() {
177178
innerDirectiveCompleteTest(
178-
"$testDapName/completeBatchInsert.sql",
179+
"$testDaoName/completeBatchInsert.sql",
179180
listOf(
180181
"employeeId",
181182
"employeeName",
@@ -190,7 +191,7 @@ class SqlCompleteTest : DomaSqlTest() {
190191

191192
fun testCompleteStaticPropertyFromStaticPropertyCall() {
192193
innerDirectiveCompleteTest(
193-
"$testDapName/completeStaticPropertyFromStaticPropertyCall.sql",
194+
"$testDaoName/completeStaticPropertyFromStaticPropertyCall.sql",
194195
listOf(
195196
"members",
196197
"projectNumber",
@@ -207,7 +208,7 @@ class SqlCompleteTest : DomaSqlTest() {
207208

208209
fun testCompleteCallStaticPropertyClassPackage() {
209210
innerDirectiveCompleteTest(
210-
"$testDapName/completeCallStaticPropertyClassPackage.sql",
211+
"$testDaoName/completeCallStaticPropertyClassPackage.sql",
211212
listOf(
212213
"doma",
213214
"com",
@@ -219,7 +220,7 @@ class SqlCompleteTest : DomaSqlTest() {
219220
)
220221

221222
innerDirectiveCompleteTest(
222-
"$testDapName/completeCallStaticPropertyClass.sql",
223+
"$testDaoName/completeCallStaticPropertyClass.sql",
223224
listOf(
224225
"doma.example.entity.Employee",
225226
"doma.example.entity.EmployeeSummary",
@@ -244,7 +245,7 @@ class SqlCompleteTest : DomaSqlTest() {
244245

245246
fun testCompletePropertyAfterStaticPropertyCall() {
246247
innerDirectiveCompleteTest(
247-
"$testDapName/completePropertyAfterStaticPropertyCall.sql",
248+
"$testDaoName/completePropertyAfterStaticPropertyCall.sql",
248249
listOf(
249250
"managerId",
250251
),
@@ -257,7 +258,7 @@ class SqlCompleteTest : DomaSqlTest() {
257258

258259
fun testCompleteBuiltinFunction() {
259260
innerDirectiveCompleteTest(
260-
"$testDapName/completeBuiltinFunction.sql",
261+
"$testDaoName/completeBuiltinFunction.sql",
261262
listOf(
262263
"isEmpty()",
263264
"isNotEmpty()",
@@ -281,35 +282,35 @@ class SqlCompleteTest : DomaSqlTest() {
281282

282283
fun testCompleteDirectiveInside() {
283284
innerDirectiveCompleteTest(
284-
"$testDapName/completeDirectiveInsideIf.sql",
285+
"$testDaoName/completeDirectiveInsideIf.sql",
285286
listOf("employee"),
286287
listOf("project"),
287288
)
288289
innerDirectiveCompleteTest(
289-
"$testDapName/completeDirectiveInsideElseIf.sql",
290+
"$testDaoName/completeDirectiveInsideElseIf.sql",
290291
listOf("employee", "project"),
291292
emptyList(),
292293
)
293294
innerDirectiveCompleteTest(
294-
"$testDapName/completeDirectiveInsideFor.sql",
295+
"$testDaoName/completeDirectiveInsideFor.sql",
295296
listOf("project"),
296297
listOf("employee", "member", "%for"),
297298
)
298299
}
299300

300301
fun testCompleteDirectiveFieldInside() {
301302
innerDirectiveCompleteTest(
302-
"$testDapName/completeDirectiveFieldInsideIf.sql",
303+
"$testDaoName/completeDirectiveFieldInsideIf.sql",
303304
listOf("startsWith()"),
304305
listOf("employee", "project", "toLowCase"),
305306
)
306307
innerDirectiveCompleteTest(
307-
"$testDapName/completeDirectiveFieldInsideElseIf.sql",
308+
"$testDaoName/completeDirectiveFieldInsideElseIf.sql",
308309
listOf("department"),
309310
listOf("employee", "project"),
310311
)
311312
innerDirectiveCompleteTest(
312-
"$testDapName/completeDirectiveFieldInsideFor.sql",
313+
"$testDaoName/completeDirectiveFieldInsideFor.sql",
313314
listOf(
314315
"projectId",
315316
"projectName",
@@ -326,79 +327,79 @@ class SqlCompleteTest : DomaSqlTest() {
326327

327328
fun testCompleteConcatenationOperator() {
328329
innerDirectiveCompleteTest(
329-
"$testDapName/completeConcatenationOperator.sql",
330+
"$testDaoName/completeConcatenationOperator.sql",
330331
listOf("rank"),
331332
listOf("employee", "employeeId", "department"),
332333
)
333334

334335
innerDirectiveCompleteTest(
335-
"$testDapName/completeComparisonOperator.sql",
336+
"$testDaoName/completeComparisonOperator.sql",
336337
listOf("rank"),
337338
listOf("employee", "employeeId", "department"),
338339
)
339340
}
340341

341342
fun testCompleteParameter() {
342343
innerDirectiveCompleteTest(
343-
"$testDapName/completeParameterFirst.sql",
344+
"$testDaoName/completeParameterFirst.sql",
344345
listOf("employee"),
345346
listOf("employeeId", "department", "rank", "startWith"),
346347
)
347348

348349
innerDirectiveCompleteTest(
349-
"$testDapName/completeParameterFirstProperty.sql",
350+
"$testDaoName/completeParameterFirstProperty.sql",
350351
listOf("employeeId", "department", "rank"),
351352
listOf("employee"),
352353
)
353354

354355
innerDirectiveCompleteTest(
355-
"$testDapName/completeParameterSecond.sql",
356+
"$testDaoName/completeParameterSecond.sql",
356357
listOf("employee"),
357358
listOf("employeeId", "department", "rank", "startWith"),
358359
)
359360

360361
innerDirectiveCompleteTest(
361-
"$testDapName/completeParameterSecondProperty.sql",
362+
"$testDaoName/completeParameterSecondProperty.sql",
362363
listOf("managerId"),
363364
listOf("employee", "department", "rank"),
364365
)
365366
}
366367

367368
fun testCompleteOptionalDaoParam() {
368369
innerDirectiveCompleteTest(
369-
"$testDapName/completeOptionalDaoParam.sql",
370+
"$testDaoName/completeOptionalDaoParam.sql",
370371
listOf("manager", "projectNumber", "getFirstEmployee()"),
371372
listOf("get()", "orElseGet()", "isPresent()"),
372373
)
373374
}
374375

375376
fun testCompleteOptionalStaticProperty() {
376377
innerDirectiveCompleteTest(
377-
"$testDapName/completeOptionalStaticProperty.sql",
378+
"$testDaoName/completeOptionalStaticProperty.sql",
378379
listOf("userId", "userName", "email", "getUserNameFormat()"),
379380
listOf("get()", "orElseGet()", "isPresent()"),
380381
)
381382
}
382383

383384
fun testCompleteOptionalByForItem() {
384385
innerDirectiveCompleteTest(
385-
"$testDapName/completeOptionalByForItem.sql",
386+
"$testDaoName/completeOptionalByForItem.sql",
386387
listOf("manager", "projectNumber", "getFirstEmployee()"),
387388
listOf("get()", "orElseGet()", "isPresent()"),
388389
)
389390
}
390391

391392
fun testCompleteOptionalBatchAnnotation() {
392393
innerDirectiveCompleteTest(
393-
"$testDapName/completeOptionalBatchAnnotation.sql",
394+
"$testDaoName/completeOptionalBatchAnnotation.sql",
394395
listOf("optionalIds"),
395396
listOf("get()", "orElseGet()", "isPresent()", "projectId"),
396397
)
397398
}
398399

399400
fun testCompleteForDirectiveItem() {
400401
innerDirectiveCompleteTest(
401-
"$testDapName/completeForDirectiveItem.sql",
402+
"$testDaoName/completeForDirectiveItem.sql",
402403
listOf("projects", "project", "project_has_next", "project_index"),
403404
listOf("get()", "size()", "toString()", "projectId"),
404405
)
@@ -407,9 +408,19 @@ class SqlCompleteTest : DomaSqlTest() {
407408
fun testCompleteImplementCustomFunction() {
408409
addResourceCompileFile("doma.compile.config")
409410
innerDirectiveCompleteTest(
410-
"$testDapName/completeImplementCustomFunction.sql",
411-
listOf("userId()", "userName()", "userAge()", "langCode()", "isGest()", "isBlank()", "isNotBlank()"),
412-
listOf("getId()", "getName()", "getAge()", "getLangCode()", "isManager()"),
411+
"$testDaoName/completeImplementCustomFunction.sql",
412+
listOf("userId()", "userName()", "userAge()"),
413+
listOf(
414+
"getId()",
415+
"getName()",
416+
"getAge()",
417+
"getLangCode()",
418+
"isManager()",
419+
"langCode()",
420+
"isGest()",
421+
"isBlank()",
422+
"isNotBlank()",
423+
),
413424
)
414425
}
415426

‎src/test/testData/src/main/java/doma/example/dao/SqlCompleteTestDao.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,4 @@ interface SqlCompleteTestDao {
105105

106106
@Select
107107
Employee completeNotImplementCustomFunction(Project project);
108-
109108
}

‎src/test/testData/src/main/resources/META-INF/doma/example/dao/SqlCompleteTestDao/completeImplementCustomFunction.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
SELECT * FROM project
22
WHERE project_id = /* project.projectId */0
33
AND manager = /* project.manager.userId */0
4-
AND lang = /* @<caret>() */'en'
4+
AND lang = /* @<caret>() */'en'

0 commit comments

Comments
 (0)