bug fix

Author: tangzx

src/main/java/com/tang/intellij/lua/codeInsight/highlighting/LuaHighlightUsagesHandlerFactory.kt

@@ -98,14 +98,8 @@ private class LoopHandler(editor: Editor, psiFile: PsiFile, val psi:PsiElement,
     override fun getTargets() = arrayListOf(psi)
 
     override fun computeUsages(list: MutableList<PsiElement>?) {
-        addOccurrence(loop.firstChild)
-        when (loop) {
-            is LuaRepeatStat -> { val until = loop.until; if (until != null) addOccurrence(until) }
-            else -> {
-                val end = loop.node.findChildByType(LuaTypes.END)
-                end?.let { addOccurrence(end.psi) }
-            }
-        }
+        loop.head?.let { addOccurrence(it) }
+        loop.end?.let { addOccurrence(it) }
         addOccurrence(psi)
     }
 

…a/com/tang/intellij/lua/psi/LuaLoop.java …ava/com/tang/intellij/lua/psi/LuaLoop.ktsrc/main/java/com/tang/intellij/lua/psi/LuaLoop.java renamed to src/main/java/com/tang/intellij/lua/psi/LuaLoop.kt src/main/java/com/tang/intellij/lua/psi/LuaLoop.java renamed to src/main/java/com/tang/intellij/lua/psi/LuaLoop.kt

@@ -14,11 +14,31 @@
  * limitations under the License.
  */
 
-package com.tang.intellij.lua.psi;
+package com.tang.intellij.lua.psi
+
+import com.intellij.psi.PsiElement
 
 /**
  * for, repeat, while
  * Created by Administrator on 2017/6/28.
  */
-public interface LuaLoop extends LuaPsiElement {
+interface LuaLoop : LuaPsiElement
+
+
+val LuaLoop.head:PsiElement? get() {
+    val type = when (this) {
+        is LuaWhileStat -> LuaTypes.WHILE
+        is LuaRepeatStat -> LuaTypes.REPEAT
+        else -> LuaTypes.FOR
+    }
+    val headNode = node.findChildByType(type)
+    return headNode?.psi
+}
+val LuaLoop.end:PsiElement? get() {
+    val type = when (this) {
+        is LuaRepeatStat -> LuaTypes.UNTIL
+        else -> LuaTypes.END
+    }
+    val endNode = node.findChildByType(type)
+    return endNode?.psi
 }