enter between range block

Author: tangzx

…/LuaEnterAfterUnmatchedBraceHandler.java …/LuaEnterAfterUnmatchedBraceHandler.javasrc/main/java/com/tang/intellij/lua/codeInsight/LuaEnterAfterUnmatchedBraceHandler.java renamed to src/main/java/com/tang/intellij/lua/editor/LuaEnterAfterUnmatchedBraceHandler.java src/main/java/com/tang/intellij/lua/codeInsight/LuaEnterAfterUnmatchedBraceHandler.java renamed to src/main/java/com/tang/intellij/lua/editor/LuaEnterAfterUnmatchedBraceHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.tang.intellij.lua.codeInsight;
+package com.tang.intellij.lua.editor;
 
 import com.intellij.codeInsight.editorActions.enter.EnterHandlerDelegate;
 import com.intellij.lang.ASTNode;

…nsight/LuaEnterBetweenBracesHandler.java …editor/LuaEnterBetweenBracesHandler.javasrc/main/java/com/tang/intellij/lua/codeInsight/LuaEnterBetweenBracesHandler.java renamed to src/main/java/com/tang/intellij/lua/editor/LuaEnterBetweenBracesHandler.java src/main/java/com/tang/intellij/lua/codeInsight/LuaEnterBetweenBracesHandler.java renamed to src/main/java/com/tang/intellij/lua/editor/LuaEnterBetweenBracesHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.tang.intellij.lua.codeInsight;
+package com.tang.intellij.lua.editor;
 
 import com.intellij.codeInsight.editorActions.enter.EnterBetweenBracesHandler;
 import com.intellij.openapi.actionSystem.DataContext;

src/main/java/com/tang/intellij/lua/editor/LuaEnterBetweenRangeBlockHandler.kt

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2017. tangzx(love.tangzx@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.tang.intellij.lua.editor
+
+import com.intellij.codeInsight.editorActions.enter.EnterHandlerDelegate
+import com.intellij.codeInsight.editorActions.enter.EnterHandlerDelegateAdapter
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.actionSystem.EditorActionHandler
+import com.intellij.openapi.util.Ref
+import com.intellij.psi.PsiDocumentManager
+import com.intellij.psi.PsiFile
+import com.intellij.psi.codeStyle.CodeStyleManager
+import com.intellij.util.IncorrectOperationException
+import com.intellij.util.text.CharArrayUtil
+import com.tang.intellij.lua.lang.LuaLanguage
+import com.tang.intellij.lua.psi.LuaBlock
+import com.tang.intellij.lua.psi.LuaIndentRange
+
+class LuaEnterBetweenRangeBlockHandler : EnterHandlerDelegateAdapter() {
+
+    override fun preprocessEnter(psiFile: PsiFile,
+                                 editor: Editor,
+                                 caretOffsetRef: Ref<Int>,
+                                 caretAdvance: Ref<Int>,
+                                 dataContext: DataContext,
+                                 originalHandler: EditorActionHandler?): EnterHandlerDelegate.Result {
+        if (!psiFile.language.`is`(LuaLanguage.INSTANCE)) {
+            return EnterHandlerDelegate.Result.Continue
+        }
+
+        val caretOffset = caretOffsetRef.get()
+        val document = editor.document
+        val text = document.charsSequence
+        val prevCharOffset = CharArrayUtil.shiftBackward(text, caretOffset - 1, " \t")
+        val nextCharOffset = CharArrayUtil.shiftForward(text, caretOffset, " \t")
+
+        val prev = psiFile.findElementAt(prevCharOffset)
+        val next = psiFile.findElementAt(nextCharOffset)
+        if (prev != next &&
+                prev != null &&
+                next != null &&
+                prev.parent == next.parent &&
+                prev.parent is LuaIndentRange &&
+                prev.nextSibling is LuaBlock) {
+            originalHandler?.execute(editor, editor.caretModel.currentCaret, dataContext)
+            PsiDocumentManager.getInstance(psiFile.project).commitDocument(editor.document)
+            try {
+                CodeStyleManager.getInstance(psiFile.project).adjustLineIndent(psiFile, editor.caretModel.offset)
+            } catch (e: IncorrectOperationException) {
+            }
+
+            return EnterHandlerDelegate.Result.DefaultForceIndent
+        }
+        return EnterHandlerDelegate.Result.Continue
+    }
+}

…ua/codeInsight/LuaEnterInDocHandler.java …lij/lua/editor/LuaEnterInDocHandler.javasrc/main/java/com/tang/intellij/lua/codeInsight/LuaEnterInDocHandler.java renamed to src/main/java/com/tang/intellij/lua/editor/LuaEnterInDocHandler.java src/main/java/com/tang/intellij/lua/codeInsight/LuaEnterInDocHandler.java renamed to src/main/java/com/tang/intellij/lua/editor/LuaEnterInDocHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.tang.intellij.lua.codeInsight;
+package com.tang.intellij.lua.editor;
 
 import com.intellij.codeInsight.editorActions.enter.EnterHandlerDelegate;
 import com.intellij.lang.ASTNode;

src/main/resources/META-INF/plugin.xml

@@ -144,9 +144,10 @@
         <highlightUsagesHandlerFactory implementation="com.tang.intellij.lua.codeInsight.highlighting.LuaHighlightUsagesHandlerFactory"/>
 
         <!--editor handlers-->
-        <enterHandlerDelegate implementation="com.tang.intellij.lua.codeInsight.LuaEnterAfterUnmatchedBraceHandler" />
-        <enterHandlerDelegate implementation="com.tang.intellij.lua.codeInsight.LuaEnterInDocHandler"/>
-        <enterHandlerDelegate implementation="com.tang.intellij.lua.codeInsight.LuaEnterBetweenBracesHandler"/>
+        <enterHandlerDelegate implementation="com.tang.intellij.lua.editor.LuaEnterAfterUnmatchedBraceHandler" />
+        <enterHandlerDelegate implementation="com.tang.intellij.lua.editor.LuaEnterInDocHandler"/>
+        <enterHandlerDelegate implementation="com.tang.intellij.lua.editor.LuaEnterBetweenBracesHandler"/>
+        <enterHandlerDelegate implementation="com.tang.intellij.lua.editor.LuaEnterBetweenRangeBlockHandler"/>
         <backspaceHandlerDelegate implementation="com.tang.intellij.lua.codeInsight.LuaBackspaceHandlerDelegate"/>
         <typedHandler implementation="com.tang.intellij.lua.editor.LuaAutoPopupHandler"/>
         <typedHandler implementation="com.tang.intellij.lua.editor.LuaAutoIndentHandler"/>