Clarification of return with null check

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/action/dao/GenerateSqlAction.kt

@@ -39,7 +39,7 @@ class GenerateSqlAction : AnAction() {
         val editor = e.getData(CommonDataKeys.EDITOR) ?: return
         val project = e.project ?: return
         val file: PsiFile = currentFile ?: return
-        getDaoClass(file) ?: return
+        if (getDaoClass(file) == null) return
         val element = file.findElementAt(editor.caretModel.offset) ?: return
         val method = PsiTreeUtil.getParentOfType(element, PsiMethod::class.java) ?: return
 

src/main/kotlin/org/domaframework/doma/intellij/action/dao/JumpToSQLFromDaoAction.kt

@@ -36,8 +36,7 @@ class JumpToSQLFromDaoAction : AnAction() {
         currentFile = e.getData(CommonDataKeys.PSI_FILE) ?: return
         val file: PsiFile = currentFile ?: return
 
-        if (!isJavaOrKotlinFileType(file)) return
-        getDaoClass(file) ?: return
+        if (!isJavaOrKotlinFileType(file) || getDaoClass(file) == null) return
 
         val editor = e.getData(CommonDataKeys.EDITOR) ?: return
         val element = file.findElementAt(editor.caretModel.offset) ?: return

src/main/kotlin/org/domaframework/doma/intellij/action/sql/JumpToDaoFromSQLAction.kt

@@ -36,7 +36,7 @@ class JumpToDaoFromSQLAction : AnAction() {
         e.presentation.isEnabledAndVisible = false
         currentFile = e.getData(CommonDataKeys.PSI_FILE) ?: return
         val file = currentFile ?: return
-        findDaoMethod(file) ?: return
+        if (findDaoMethod(file) == null) return
         e.presentation.isEnabledAndVisible =
             isSupportFileType(file)
     }

src/main/kotlin/org/domaframework/doma/intellij/action/sql/JumpToDeclarationFromSqlAction.kt

@@ -76,7 +76,7 @@ class JumpToDeclarationFromSqlAction : AnAction() {
             file = currentFile ?: return
             element = file.findElementAt(countInjectionOffset(literal, caretOffset)) ?: return
         }
-        findDaoMethod(file) ?: return
+        if (findDaoMethod(file) == null) return
 
         val elm = element ?: return
         val elementText = elm.text ?: ""

src/main/kotlin/org/domaframework/doma/intellij/gutter/dao/DaoMethodProvider.kt

@@ -74,7 +74,7 @@ class DaoMethodProvider : RelatedItemLineMarkerProvider() {
         if (!isJavaOrKotlinFileType(e.containingFile) && !isFunction(e)) {
             return false
         }
-        getDaoClass(e.containingFile) ?: return false
+        if (getDaoClass(e.containingFile) == null) return false
         return e is PsiMethod
     }
 

src/main/kotlin/org/domaframework/doma/intellij/gutter/sql/SqlLineMakerProvider.kt

@@ -56,7 +56,7 @@ class SqlLineMakerProvider : RelatedItemLineMarkerProvider() {
         val identifier = e.firstChild ?: e
         val daoFile =
             findDaoFile(project, file)?.let {
-                findDaoMethod(e.containingFile) ?: return
+                if (findDaoMethod(e.containingFile) == null) return
                 it
             } ?: return
 

src/main/kotlin/org/domaframework/doma/intellij/inspection/dao/inspector/DaoMethodVariableInspector.kt

@@ -59,8 +59,7 @@ class DaoMethodVariableInspector : AbstractBaseJavaLocalInspectionTool() {
             override fun visitMethod(method: PsiMethod) {
                 super.visitMethod(method)
                 val file = method.containingFile
-                if (!isJavaOrKotlinFileType(file)) return
-                getDaoClass(file) ?: return
+                if (!isJavaOrKotlinFileType(file) || getDaoClass(file) == null) return
 
                 val psiDaoMethod = PsiDaoMethod(method.project, method)
                 if (!psiDaoMethod.useSqlAnnotation() && !psiDaoMethod.isUseSqlFileMethod()) return

src/main/kotlin/org/domaframework/doma/intellij/inspection/dao/inspector/SqlFileExistInspector.kt

@@ -50,8 +50,7 @@ class SqlFileExistInspector : AbstractBaseJavaLocalInspectionTool() {
             override fun visitMethod(method: PsiMethod) {
                 super.visitMethod(method)
                 val file = method.containingFile
-                if (!isJavaOrKotlinFileType(file)) return
-                getDaoClass(file) ?: return
+                if (!isJavaOrKotlinFileType(file) || getDaoClass(file) == null) return
 
                 val psiDaoMethod = PsiDaoMethod(method.project, method)
                 if (psiDaoMethod.isUseSqlFileMethod()) {