Skip to content

Commit 9a86ee8

Browse files
committed
Null check for virtualFile
1 parent adb10c1 commit 9a86ee8

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/main/kotlin/org/domaframework/doma/intellij/common/FileTypeCheck.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ fun getExtension(type: String): String =
3737
* Does it match the Dao file type condition?
3838
*/
3939
fun isJavaOrKotlinFileType(daoFile: PsiFile): Boolean {
40+
if (daoFile.virtualFile == null) return false
4041
val fileType = FileTypeManager.getInstance().getFileTypeByFile(daoFile.virtualFile)
4142
return when (fileType.name) {
4243
"JAVA", "Kotlin" -> true
@@ -57,7 +58,7 @@ fun isSupportFileType(file: PsiFile): Boolean {
5758

5859
fun isInjectionSqlFile(file: PsiFile): Boolean {
5960
val extension = file.fileType.defaultExtension
60-
val filePath = file.virtualFile.path
61+
val filePath = file.virtualFile?.path ?: return false
6162
return when (extension) {
6263
"sql" -> true
6364
else -> false

src/main/kotlin/org/domaframework/doma/intellij/common/dao/DaoMethodUtil.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ fun formatDaoPathFromSqlFilePath(
110110
if (isInjectionSqlFile(relativeBaseSqlFile)) {
111111
return ""
112112
}
113-
val sqlPath = relativeBaseSqlFile.virtualFile.path
113+
val sqlPath = relativeBaseSqlFile.virtualFile?.path ?: return ""
114114
var relativeFilePath = sqlPath.substring(projectRootPath.length)
115115
if (!relativeFilePath.startsWith("/")) {
116116
relativeFilePath = "/$relativeFilePath"

0 commit comments

Comments
 (0)