New version 2.1 with enhanced comment logic.

This includes that now comments and be folded based on section comments like (* ::Section:: *).
Beside this improved highlighter and completion logic for comments.

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.32</version>
+  <version>2.1</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>
@@ -67,6 +67,7 @@
       <i>New features and bug-fixes:</i>
       <br/>
       <ul>
+      <li>Code folding based on section comments like (* ::Section:: *)</li>
       <li>SurroundWith (Ctrl+Alt+T) will now do something useful when pressed without an active selection</li>
       <li>Added Ctrl+Space completion inside comments</li>
       <li>Reimplemented parsing of comments and comment annotation</li>

src/de/halirutan/mathematica/codeinsight/folding/MathematicaExpressionFoldingBuilder.java

@@ -195,6 +195,20 @@ private void collectCommentRegion(@NotNull ASTNode node,
     final int currentLine = document.getLineNumber(comment.getTextOffset());
     int endOffset = document.getTextLength();
 
+    if (currentLine < document.getLineCount() - 1) {
+      final PsiComment nextLineComment = PsiTreeUtil.findElementOfClassAtRange(
+          file,
+          document.getLineStartOffset(currentLine + 1),
+          document.getLineEndOffset(currentLine + 1),
+          PsiComment.class
+      );
+      if (nextLineComment != null && !Comments.isCorrectSectionComment(nextLineComment)) {
+        placeHolderText.append(Comments.getStrippedText(nextLineComment));
+      } else {
+        placeHolderText.append("No description given");
+      }
+    }
+
     for (int i = currentLine + 1; i < document.getLineCount(); i++) {
       int start = document.getLineStartOffset(i);
       int end = document.getLineEndOffset(i);
@@ -203,19 +217,6 @@ private void collectCommentRegion(@NotNull ASTNode node,
         final CommentStyle commentStyle = Comments.getStyle(commentsInLine);
         if (commentStyle != null && commentStyle.compareTo(style) <= 0) {
           endOffset = start - 1;
-          if (i < document.getLineCount() - 1) {
-            final PsiComment nextLineComment = PsiTreeUtil.findElementOfClassAtRange(
-                file,
-                document.getLineStartOffset(i + 1),
-                document.getLineEndOffset(i + 1),
-                PsiComment.class
-            );
-            if (nextLineComment != null && !Comments.isCorrectSectionComment(nextLineComment)) {
-              placeHolderText.append(Comments.getStrippedText(nextLineComment));
-            } else {
-              placeHolderText.append("No description given");
-            }
-          }
           break;
         }
       }