@@ -93,19 +93,17 @@ class SqlBindVariableValidInspector : LocalInspectionTool() {
9393 isOnTheFly : Boolean ,
9494 ): SqlVisitor = sqlVisitor(holder)
9595
96- fun sqlVisitor (holder : ProblemsHolder ): SqlVisitor {
96+ private fun sqlVisitor (holder : ProblemsHolder ): SqlVisitor {
9797 return object : SqlVisitor () {
98- override fun visitElement (o : PsiElement ) {
99- var file = o.containingFile ? : return
100- if (isJavaOrKotlinFileType(file) && o is PsiLiteralExpression ) {
101- val injectionFile = initInjectionElement(file, o.project, o)
102- if (injectionFile == null ) return
103-
98+ override fun visitElement (element : PsiElement ) {
99+ val file = element.containingFile ? : return
100+ if (isJavaOrKotlinFileType(file) && element is PsiLiteralExpression ) {
101+ val injectionFile = initInjectionElement(file, element.project, element) ? : return
104102 injectionFile.accept(this )
105- super .visitElement(o )
103+ super .visitElement(element )
106104 }
107105 if (isInjectionSqlFile(file)) {
108- o .acceptChildren(this )
106+ element .acceptChildren(this )
109107 }
110108 }
111109
@@ -130,21 +128,19 @@ class SqlBindVariableValidInspector : LocalInspectionTool() {
130128 false -> null
131129 }
132130
133- override fun visitElStaticFieldAccessExpr (o : SqlElStaticFieldAccessExpr ) {
134- super .visitElStaticFieldAccessExpr(o)
135- var targetElement = o
136- checkStaticFieldAndMethodAccess(targetElement, holder)
131+ override fun visitElStaticFieldAccessExpr (element : SqlElStaticFieldAccessExpr ) {
132+ super .visitElStaticFieldAccessExpr(element)
133+ checkStaticFieldAndMethodAccess(element, holder)
137134 }
138135
139- override fun visitElFieldAccessExpr (o : SqlElFieldAccessExpr ) {
140- super .visitElFieldAccessExpr(o)
141- var file = o.containingFile ? : return
142- var targetElement = o
136+ override fun visitElFieldAccessExpr (element : SqlElFieldAccessExpr ) {
137+ super .visitElFieldAccessExpr(element)
138+ val file = element.containingFile ? : return
143139
144140 // Get element inside block comment
145141 val blockElement =
146142 PsiTreeUtil
147- .getChildrenOfTypeAsList(targetElement , PsiElement ::class .java)
143+ .getChildrenOfTypeAsList(element , PsiElement ::class .java)
148144 .filter {
149145 it.elementType != SqlTypes .EL_DOT &&
150146 it.elementType != SqlTypes .EL_LEFT_PAREN &&
@@ -160,30 +156,29 @@ class SqlBindVariableValidInspector : LocalInspectionTool() {
160156 checkAccessFieldAndMethod(holder, blockElement, file)
161157 }
162158
163- override fun visitElPrimaryExpr (o : SqlElPrimaryExpr ) {
164- super .visitElPrimaryExpr(o)
165- var file = o.containingFile ? : return
166- var targetElement = o
167- val project = o.project
159+ override fun visitElPrimaryExpr (element : SqlElPrimaryExpr ) {
160+ super .visitElPrimaryExpr(element)
161+ val file = element.containingFile ? : return
162+ val project = element.project
168163
169164 // Exclude fixed Literal
170- if (isLiteralOrStatic(targetElement )) return
165+ if (isLiteralOrStatic(element )) return
171166
172167 // TODO Check function parameters in the same way as bind variables.
173- if (targetElement .findNodeParent(SqlTypes .EL_PARAMETERS ) != null ) return
168+ if (element .findNodeParent(SqlTypes .EL_PARAMETERS ) != null ) return
174169
175170 // For static property references, match against properties in the class definition
176- if (targetElement .parent is SqlElStaticFieldAccessExpr ) {
171+ if (element .parent is SqlElStaticFieldAccessExpr ) {
177172 checkStaticFieldAndMethodAccess(
178- targetElement .parent as SqlElStaticFieldAccessExpr ,
173+ element .parent as SqlElStaticFieldAccessExpr ,
179174 holder,
180175 )
181176 return
182177 }
183- if (checkInForDirectiveBlock(targetElement )) return
178+ if (checkInForDirectiveBlock(element )) return
184179 val identify =
185180 PsiTreeUtil
186- .getChildrenOfType(targetElement , PsiElement ::class .java)
181+ .getChildrenOfType(element , PsiElement ::class .java)
187182 ?.firstOrNull() ? : return
188183 val daoMethod = findDaoMethod(file) ? : return
189184 val params = daoMethod.methodParameters
0 commit comments