Adding more code folding logic (reifications, switch block , array, map, and object literals)

Author: m0rkeulv

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+## 1.6.3
+* Added: Support for code folding for switch expressions, arrays, maps and object literals. 
+* Changed: formatter now removes spaces between expressions and semicolons
+* bugfix: Fixed incorrect priority in parser (ternaryExpressions must be parsed before coalescingExpressions)
+
 ## 1.6.2
 * Added: Null coalescing annotations (#1208) 
 * Fixed: Another constraint refers to owning typeParameter issue  

src/main/java/com/intellij/plugins/haxe/ide/folding/HaxeFoldingBuilder.java

@@ -153,6 +153,10 @@ private static void buildFolding(@NotNull ASTNode node, List<FoldingDescriptor>
       descriptor = buildImportsFolding(node);
     } else if (isCodeBlock(elementType)) {
       descriptor = buildCodeBlockFolding(node);
+    } else if (isReificationBlock(elementType)) {
+      descriptor = buildReificationFolding(node);
+    } else if (isCollectionLiteral(elementType)) {
+      descriptor = buildCollectionBlockFolding(node);
     } else if (isBodyBlock(elementType)) {
       descriptor = buildBodyBlockFolding(node);
     } else if (isComment(elementType, node)) {
@@ -270,12 +274,18 @@ private static void buildCCMarkerRegions(List<FoldingDescriptor> descriptors, Li
   }
 
   private static boolean isCodeBlock(IElementType elementType) {
-    return elementType == BLOCK_STATEMENT;
+    return BLOCK_TYPES.contains(elementType);
+  }
+  private static boolean isReificationBlock(IElementType elementType) {
+    return elementType == MACRO_EXPRESSION_REIFICATION;
   }
 
   private static boolean isBodyBlock(IElementType elementType) {
     return CLASS_BODY_TYPES.contains(elementType);
   }
+  private static boolean isCollectionLiteral(IElementType elementType) {
+    return COLLECTION_LITERAL.contains(elementType);
+  }
 
   private static boolean isComment(IElementType elementType, ASTNode node) {
     return ONLY_COMMENTS.contains(elementType);
@@ -361,19 +371,35 @@ private static FoldingDescriptor buildCodeBlockFolding(@NotNull ASTNode node) {
     final ASTNode openBrace = node.getFirstChildNode();
     final ASTNode closeBrace = node.getLastChildNode();
 
-    return buildBlockFolding(node, openBrace, closeBrace);
+    return buildBlockFolding(node, openBrace, closeBrace, PLCURLY, PRCURLY);
+  }
+  private static FoldingDescriptor buildReificationFolding(@NotNull ASTNode node) {
+    // MACRO_EXPRESSION_REIFICATION contains a set of different reification expressions so we need to go one level deeper.
+    ASTNode reification = node.getFirstChildNode();
+
+    final ASTNode openBrace = reification.getFirstChildNode().getTreeNext();
+    final ASTNode closeBrace = reification.getLastChildNode();
+
+    return buildBlockFolding(node, openBrace, closeBrace, PLCURLY, PRCURLY);
+  }
+
+  private static FoldingDescriptor buildCollectionBlockFolding(@NotNull ASTNode node) {
+    final ASTNode openBrace = node.getFirstChildNode();
+    final ASTNode closeBrace = node.getLastChildNode();
+
+    return buildBlockFolding(node, openBrace, closeBrace, PLBRACK, PRBRACK);
   }
 
   private static FoldingDescriptor buildBodyBlockFolding(@NotNull ASTNode node) {
-    final ASTNode openBrace = UsefulPsiTreeUtil.getPrevSiblingSkipWhiteSpacesAndComments(node);
-    final ASTNode closeBrace = UsefulPsiTreeUtil.getNextSiblingSkipWhiteSpacesAndComments(node);
+    final ASTNode openBrace = node.getFirstChildNode();
+    final ASTNode closeBrace = node.getLastChildNode();
 
-    return buildBlockFolding(node, openBrace, closeBrace);
+    return buildBlockFolding(node, openBrace, closeBrace, PLCURLY, PRCURLY );
   }
 
-  private static FoldingDescriptor buildBlockFolding(@NotNull ASTNode node, ASTNode openBrace, ASTNode closeBrace) {
+  private static FoldingDescriptor buildBlockFolding(@NotNull ASTNode node, ASTNode openBrace, ASTNode closeBrace, IElementType openElementType, IElementType closeElementType) {
     TextRange textRange;
-    if (openBrace != null && closeBrace != null && openBrace.getElementType() == PLCURLY && closeBrace.getElementType() == PRCURLY) {
+    if (openBrace != null && closeBrace != null && openBrace.getElementType() == openElementType && closeBrace.getElementType() == closeElementType) {
       textRange = new TextRange(openBrace.getTextRange().getEndOffset(), closeBrace.getStartOffset());
     } else {
       textRange = node.getTextRange();

src/main/java/com/intellij/plugins/haxe/lang/lexer/HaxeTokenTypeSets.java

@@ -290,6 +290,18 @@ public interface HaxeTokenTypeSets {
     INTERFACE_BODY
   );
 
+  TokenSet BLOCK_TYPES = TokenSet.create(
+    BLOCK_STATEMENT,
+    SWITCH_BLOCK,
+    SWITCH_CASE_BLOCK,
+    OBJECT_LITERAL
+  );
+
+  TokenSet COLLECTION_LITERAL = TokenSet.create(
+    ARRAY_LITERAL,
+    MAP_LITERAL
+  );
+
   TokenSet CLASS_TYPES = TokenSet.create(
     ABSTRACT_TYPE_DECLARATION,
     CLASS_DECLARATION,