Reworked smart enter

Built smart enter for comments which replaces the normal enter at the end of a comment

Author: halirutan

resources/META-INF/plugin.xml

@@ -23,7 +23,7 @@
   <id>de.halirutan.mathematica</id>
   <name>Mathematica Support</name>
   <category>Custom Language</category>
-  <version>2.0.31</version>
+  <version>2.0.32</version>
   <idea-version since-build="163"/>
   <vendor email="patrick@halirutan.de" url="http://mathematicaplugin.halirutan.de">Patrick Scheibe</vendor>
   <depends>com.intellij.modules.lang</depends>
@@ -32,7 +32,7 @@
     <br/>
     <br/>
     <a href="https://github.com/halirutan/Mathematica-IntelliJ-Plugin">GitHub</a> |
-    <a href="http://halirutan.myjetbrains.com/youtrack/issues/MMAP">Bug Tracker</a> |
+    <a href="https://github.com/halirutan/Mathematica-IntelliJ-Plugin/issues">Bug Tracker</a> |
     <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=876XDFGUQHKH6">Donate</a>
     <br/>
     <br/>
@@ -155,9 +155,6 @@
     <enterHandlerDelegate
         implementation="de.halirutan.mathematica.codeinsight.editoractions.enter.MathematicaEnterAfterOperatorHandler"/>
 
-    <enterHandlerDelegate
-        implementation="de.halirutan.mathematica.codeinsight.editoractions.enter.MathematicaEnterInsideCommentHandler"/>
-
     <!-- Code-style and colors-->
     <colorSettingsPage
         implementation="de.halirutan.mathematica.codeinsight.highlighting.MathematicaColorSettingsPage"/>

src/de/halirutan/mathematica/codeinsight/editoractions/enter/MathematicaEnterInsideCommentHandler.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2017 Patrick Scheibe
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package de.halirutan.mathematica.codeinsight.editoractions.smartenter;
+
+import com.intellij.lang.SmartEnterProcessorWithFixers.Fixer;
+import com.intellij.openapi.editor.CaretModel;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.psi.PsiComment;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Provides the ability to press SmartEnter inside comments and jump to the next line again being inside a new comment.
+ * This is a very convenient functionality.
+ *
+ * @author patrick (11/12/13)
+ */
+class CommentFixer extends Fixer<MathematicaSmartEnter> {
+  @Override
+  public void apply(@NotNull Editor editor, @NotNull MathematicaSmartEnter processor, @NotNull PsiElement element) throws IncorrectOperationException {
+    Document doc = editor.getDocument();
+    final CaretModel caretModel = editor.getCaretModel();
+    if (element instanceof PsiComment && !PsiTreeUtil.hasErrorElements(element)) {
+      int endOffset = element.getTextOffset() + element.getTextLength();
+      doc.insertString(endOffset, "\n(*  *)");
+      caretModel.moveToOffset(endOffset + 4);
+      processor.commit(editor);
+    }
+  }
+}

src/de/halirutan/mathematica/codeinsight/editoractions/smartenter/CommentFixer.java

@@ -24,8 +24,10 @@
 import com.intellij.lang.SmartEnterProcessorWithFixers.Fixer;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.text.CharArrayUtil;
 import de.halirutan.mathematica.parsing.psi.api.CompoundExpression;
 import org.jetbrains.annotations.NotNull;
 
@@ -38,12 +40,19 @@ class CompoundExpressionFixer extends Fixer<MathematicaSmartEnter> {
   @Override
   public void apply(@NotNull Editor editor, @NotNull MathematicaSmartEnter processor, @NotNull PsiElement element) throws IncorrectOperationException {
     Document doc = editor.getDocument();
-    if (element instanceof CompoundExpression && element.getTextOffset()+element.getTextLength() == editor.getCaretModel().getOffset()) {
+    final int caretOffset = editor.getCaretModel().getOffset();
+    if (element instanceof CompoundExpression) {
       final PsiElement lastChild = element.getLastChild();
+      final TextRange lastChildRange = lastChild.getTextRange();
+
       if (!lastChild.getNode().getElementType().equals(SEMICOLON)) {
-        final int offset = lastChild.getTextOffset() + lastChild.getTextLength();
-        doc.insertString(offset, ";\n");
-        editor.getCaretModel().moveToOffset(offset + 2);
+        if (lastChildRange.containsOffset(caretOffset) || lastChildRange.getEndOffset() < caretOffset) {
+          int offset = lastChild.getTextOffset() + lastChild.getTextLength();
+          offset = CharArrayUtil.shiftBackward(editor.getDocument().getCharsSequence(), offset - 1, " \t\n") + 1;
+          doc.insertString(offset, ";");
+          editor.getCaretModel().moveToOffset(offset + 1);
+          processor.commit(editor);
+        }
       }
     }
   }

src/de/halirutan/mathematica/codeinsight/editoractions/smartenter/CompoundExpressionFixer.java

@@ -69,4 +69,6 @@ public void apply(@NotNull Editor editor, @NotNull MathematicaSmartEnter process
 
     }
   }
+
+
 }