Skip to content

Chore/sql format refactor block class #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 1, 2025
Merged

Chore/sql format refactor block class #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f569bc2
Add SQL conflict clause and do group block support
xterao Jun 30, 2025
f85d5da
Refactor SQL block structure and introduce new group blocks for impro…
xterao Jul 1, 2025
29fcf34
Refactor SQL block classes to remove unused conflict handling and str…
xterao Jul 1, 2025
5744c7b
Modify the formatting so that the equals sign (`=`) block in a bulk u…
xterao Jul 1, 2025
ae7dce7
Rename functions in SQL utility classes for consistency and clarity
xterao Jul 1, 2025
3247255
Implemented an override method to set child block properties into the…
xterao Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/main/kotlin/org/domaframework/doma/intellij/common/util/TypeUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import org.domaframework.doma.intellij.extension.getJavaClazz
import org.domaframework.doma.intellij.extension.psi.getClassAnnotation
import org.domaframework.doma.intellij.extension.psi.isDomain
import org.domaframework.doma.intellij.extension.psi.isEntity
import org.domaframework.doma.intellij.formatter.block.SqlBlock
import kotlin.reflect.KClass

object TypeUtil {
/**
Expand Down Expand Up @@ -94,4 +96,15 @@ object TypeUtil {
if (type == null) return false
return PsiTypeChecker.isBaseClassType(type) || DomaClassName.isOptionalWrapperType(type.canonicalText)
}

/**
* Determines whether the specified class instance matches.
*/
fun isExpectedClassType(
expectedClasses: List<KClass<*>>,
childBlock: SqlBlock,
): Boolean =
expectedClasses.any { clazz ->
clazz.isInstance(childBlock)
}
}
303 changes: 0 additions & 303 deletions src/main/kotlin/org/domaframework/doma/intellij/formatter/SqlBlockUtil.kt
View file
Open in desktop

This file was deleted.

Loading
Loading