Test for the comment-handler if the offset is inside comment element

This fixes #94

Author: halirutan

src/de/halirutan/mathematica/codeinsight/editoractions/enter/CommentStarInsertEnterHandler.kt

@@ -34,10 +34,8 @@ import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiFile
 
-/**/
-
 /**
- *
+ * Inserts a * in each new line of a multi-line comment
  * @author patrick (04.12.17).
  */
 class CommentStarInsertEnterHandler : MathematicaEnterHandler() {
@@ -47,14 +45,18 @@ class CommentStarInsertEnterHandler : MathematicaEnterHandler() {
     val offset = caretModel.offset
     val project = dataContext.getData(CommonDataKeys.PROJECT) ?: return EnterHandlerDelegate.Result.Continue
     val psiDocManager = PsiDocumentManager.getInstance(project)
-    val element = file.findElementAt(offset) ?: return EnterHandlerDelegate.Result.Continue
-    if (element is PsiComment) {
+
+    val comment = file.findElementAt(offset) ?: return EnterHandlerDelegate.Result.Continue
+    val commentRange = comment.textRange ?: return EnterHandlerDelegate.Result.Continue
+
+    if (comment is PsiComment && offset >= commentRange.startOffset + 2 && offset <= commentRange.endOffset - 2) {
+
       val document = editor.document
       val textLength = document.textLength
 
       // The case that we opened a comment with (*|) and therefore the complete file is commented
       // We insert the missing *
-      if (element.textRange.endOffset == textLength && offset < textLength && document.getText(TextRange.create(offset, offset + 1)) == ")") {
+      if (comment.textRange.endOffset == textLength && offset < textLength && document.getText(TextRange.create(offset, offset + 1)) == ")") {
         document.insertString(offset, " * \n *")
         caretModel.moveToOffset(offset + 3)
         psiDocManager.commitDocument(document)
@@ -63,8 +65,8 @@ class CommentStarInsertEnterHandler : MathematicaEnterHandler() {
 
 
       val lineNumber = document.getLineNumber(offset)
-      val elementStartLine = document.getLineNumber(element.textOffset)
-      val elementEndLine = document.getLineNumber(element.textOffset + element.textLength)
+      val elementStartLine = document.getLineNumber(comment.textOffset)
+      val elementEndLine = document.getLineNumber(comment.textOffset + comment.textLength)
 
       val insertString: String
       val move: Int
@@ -79,7 +81,7 @@ class CommentStarInsertEnterHandler : MathematicaEnterHandler() {
       caretModel.moveToOffset(offset + move)
 
       if (lineNumber == elementEndLine) {
-        document.insertString(offset + move, "\n ")
+        document.insertString(commentRange.endOffset + move - 2, "\n ")
       }
       psiDocManager.commitDocument(document)
       return EnterHandlerDelegate.Result.DefaultSkipIndent

src/de/halirutan/mathematica/lang/psi/impl/SymbolImpl.java

@@ -179,13 +179,13 @@ public ResolveResult[] multiResolve(boolean incompleteCode) {
     final PsiFile containingFile = getContainingFile();
     final ResolveResult[] localResult =
         myResolveCache.resolveWithCaching(this, LOCAL_SYMBOL_RESOLVER, true, incompleteCode, containingFile);
-    if (!Arrays.equals(ResolveResult.EMPTY_ARRAY, localResult)) {
+    if (!Arrays.equals(ResolveResult.EMPTY_ARRAY, localResult) && localResult[0] instanceof SymbolResolveResult) {
       cacheScope(localResult[0]);
       return localResult;
     }
 
     final ResolveResult[] globalResult = GLOBAL_SYMBOL_RESOLVER.resolve(this, containingFile);
-    if (!Arrays.equals(ResolveResult.EMPTY_ARRAY, globalResult)) {
+    if (!Arrays.equals(ResolveResult.EMPTY_ARRAY, globalResult) && globalResult[0] instanceof SymbolResolveResult) {
       cacheScope(globalResult[0]);
       return globalResult;
     }

src/de/halirutan/mathematica/settings/MathematicaSettingsConfigurable.java

@@ -22,7 +22,6 @@
 package de.halirutan.mathematica.settings;
 
 import com.intellij.openapi.options.BaseConfigurable;
-import com.intellij.openapi.options.ConfigurationException;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.Nullable;
 
@@ -56,7 +55,7 @@ public JComponent createComponent() {
   }
 
   @Override
-  public void apply() throws ConfigurationException {
+  public void apply() {
     if (mySettingsUI != null) {
       final MathematicaSettings instance = MathematicaSettings.getInstance();
       instance.loadState(mySettingsUI.getSettings());