Skip to content

Commit e6d2363

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

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ import org.domaframework.doma.intellij.extension.getModule
3939
*/
4040
fun findDaoMethod(originalFile: PsiFile): PsiMethod? {
4141
val project = originalFile.project
42-
val module = project.getModule(originalFile.virtualFile) ?: return null
42+
val virtualFile = originalFile.virtualFile ?: return null
43+
val module = project.getModule(virtualFile) ?: return null
4344

4445
if (isInjectionSqlFile(originalFile)) {
4546
originalFile.let {
@@ -52,7 +53,7 @@ fun findDaoMethod(originalFile: PsiFile): PsiMethod? {
5253
val relativePath =
5354
formatDaoPathFromSqlFilePath(
5455
originalFile,
55-
project.getContentRoot(originalFile.virtualFile)?.path ?: "",
56+
project.getContentRoot(virtualFile)?.path ?: "",
5657
fileTypeName,
5758
)
5859
val daoClassName: String =

src/main/kotlin/org/domaframework/doma/intellij/common/psi/PsiDaoMethod.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class PsiDaoMethod(
166166
PsiManager
167167
.getInstance(psiProject)
168168
.findDirectory(virtualFile) ?: return@runWriteCommandAction
169-
val sqlVirtualFile = sqlOutputDirPath.createFile(sqlFileName).virtualFile
169+
val sqlVirtualFile = sqlOutputDirPath.createFile(sqlFileName).virtualFile ?: return@runWriteCommandAction
170170
FileEditorManager
171171
.getInstance(psiProject)
172172
.openFile(sqlVirtualFile, true)

src/main/kotlin/org/domaframework/doma/intellij/refactoring/dao/DaoRenameProcessor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class DaoRenameProcessor : RenameJavaClassProcessor() {
4242
val daoClass = getDaoClass(element.containingFile) ?: return
4343

4444
val project = element.project
45-
val virtualFile = element.containingFile.virtualFile
45+
val virtualFile = element.containingFile.virtualFile ?: return
4646
project.getContentRoot(virtualFile)?.let {
4747
element.module?.getPackagePathFromDaoPath(virtualFile)?.let {
4848
if (it.name == daoClass.name) {

0 commit comments

Comments
 (0)