From e9b66763b89c72ba527263e62e5ab8429dc59a65 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Tue, 31 Jan 2017 15:49:59 +0100
Subject: [PATCH] RegExp: adding RegExpUnion was a mistake

---
 .../lang/regexp/RegExpElementTypes.java       |   3 +-
 .../intellij/lang/regexp/RegExpParser.java    |   7 -
 .../lang/regexp/RegExpParserDefinition.java   |   2 -
 .../lang/regexp/psi/RegExpElementVisitor.java |   4 -
 .../intellij/lang/regexp/psi/RegExpUnion.java |  28 ----
 .../lang/regexp/psi/impl/RegExpUnionImpl.java |  43 ------
 .../regexp/validation/RegExpAnnotator.java    |   6 -
 RegExpSupport/testData/psi/Anchors10.txt      |   9 +-
 RegExpSupport/testData/psi/Backrefs1.txt      |   9 +-
 RegExpSupport/testData/psi/Backrefs3.txt      |   9 +-
 RegExpSupport/testData/psi/Backrefs4.txt      |   9 +-
 RegExpSupport/testData/psi/Backrefs7.txt      |   9 +-
 RegExpSupport/testData/psi/Backrefs8.txt      |   9 +-
 RegExpSupport/testData/psi/Backrefs9.txt      |   9 +-
 RegExpSupport/testData/psi/Bug1.txt           |   9 +-
 RegExpSupport/testData/psi/Bug2.txt           | 101 +++++++------
 RegExpSupport/testData/psi/Charclasses1.txt   |   9 +-
 RegExpSupport/testData/psi/Charclasses11.txt  |   9 +-
 RegExpSupport/testData/psi/Charclasses18.txt  |  25 ++--
 RegExpSupport/testData/psi/Charclasses21.txt  |  17 ++-
 RegExpSupport/testData/psi/Charclasses22.txt  |  32 ++---
 RegExpSupport/testData/psi/Charclasses25.txt  |  13 +-
 RegExpSupport/testData/psi/Charclasses31.txt  |   9 +-
 RegExpSupport/testData/psi/Charclasses32.txt  |   9 +-
 RegExpSupport/testData/psi/Charclasses33.txt  |   9 +-
 RegExpSupport/testData/psi/Charclasses35.txt  |  33 +++--
 RegExpSupport/testData/psi/Charclasses36.txt  |  50 ++++---
 RegExpSupport/testData/psi/Charclasses38.txt  |   9 +-
 RegExpSupport/testData/psi/Charclasses39.txt  |   9 +-
 RegExpSupport/testData/psi/Charclasses40.txt  |   9 +-
 RegExpSupport/testData/psi/Charclasses41.txt  |   9 +-
 RegExpSupport/testData/psi/Charclasses42.txt  |   9 +-
 RegExpSupport/testData/psi/Charclasses43.txt  |   9 +-
 RegExpSupport/testData/psi/Charclasses44.txt  |  13 +-
 RegExpSupport/testData/psi/Charclasses46.txt  |  13 +-
 RegExpSupport/testData/psi/Charclasses47.txt  |   9 +-
 RegExpSupport/testData/psi/Charclasses49.txt  |  13 +-
 RegExpSupport/testData/psi/Charclasses5.txt   |   9 +-
 RegExpSupport/testData/psi/Charclasses50.txt  |  21 ++-
 RegExpSupport/testData/psi/Charclasses61.txt  |  13 +-
 RegExpSupport/testData/psi/Charclasses64.txt  |  21 ++-
 RegExpSupport/testData/psi/Charclasses67.txt  |  25 ++--
 RegExpSupport/testData/psi/Charclasses8.txt   |   9 +-
 RegExpSupport/testData/psi/Charclasses9.txt   |   9 +-
 RegExpSupport/testData/psi/Complex2.txt       | 136 +++++++++---------
 RegExpSupport/testData/psi/Complex3.txt       | 136 +++++++++---------
 RegExpSupport/testData/psi/Complex4.txt       | 136 +++++++++---------
 RegExpSupport/testData/psi/Complex5.txt       | 136 +++++++++---------
 RegExpSupport/testData/psi/Complex6.txt       | 136 +++++++++---------
 RegExpSupport/testData/psi/Complex7.txt       | 136 +++++++++---------
 RegExpSupport/testData/psi/Escapes16.txt      |  21 ++-
 RegExpSupport/testData/psi/Escapes17.txt      |  21 ++-
 RegExpSupport/testData/psi/Escapes22.txt      |  53 ++++---
 RegExpSupport/testData/psi/Escapes28.txt      |   9 +-
 RegExpSupport/testData/psi/Escapes29.txt      |   9 +-
 RegExpSupport/testData/psi/Groups15.txt       |  13 +-
 RegExpSupport/testData/psi/Groups17.txt       |  13 +-
 RegExpSupport/testData/psi/Groups19.txt       |   9 +-
 RegExpSupport/testData/psi/Groups24.txt       |   9 +-
 RegExpSupport/testData/psi/Groups25.txt       |   9 +-
 RegExpSupport/testData/psi/Groups26.txt       |   9 +-
 RegExpSupport/testData/psi/Namedchars11.txt   |  37 +++--
 RegExpSupport/testData/psi/Namedchars9.txt    |  33 +++--
 RegExpSupport/testData/psi/Parse3.txt         | 136 +++++++++---------
 RegExpSupport/testData/psi/RealLife10.txt     | 125 ++++++++--------
 RegExpSupport/testData/psi/RealLife3.txt      |  61 ++++----
 RegExpSupport/testData/psi/RealLife4.txt      |  17 ++-
 RegExpSupport/testData/psi/RealLife6.txt      |   9 +-
 RegExpSupport/testData/psi/RealLife7.txt      |   9 +-
 69 files changed, 950 insertions(+), 1158 deletions(-)
 delete mode 100644 RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpUnion.java
 delete mode 100644 RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpUnionImpl.java

diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpElementTypes.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpElementTypes.java
index 4c70f4da48fa..c555dfcd95d5 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpElementTypes.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpElementTypes.java
@@ -29,7 +29,6 @@ public interface RegExpElementTypes {
     IElementType CLASS = new RegExpElementType("CLASS");
     IElementType CHAR_RANGE = new RegExpElementType("CHAR_RANGE");
     IElementType INTERSECTION = new RegExpElementType("INTERSECTION");
-    IElementType UNION = new RegExpElementType("UNION");
     IElementType CHAR = new RegExpElementType("CHAR");
     IElementType GROUP = new RegExpElementType("GROUP");
     IElementType PROPERTY = new RegExpElementType("PROPERTY");
@@ -46,5 +45,5 @@ public interface RegExpElementTypes {
     TokenSet ATOMS = TokenSet.create(CLOSURE, BOUNDARY, SIMPLE_CLASS, CLASS, CHAR, GROUP, PROPERTY, BACKREF, NAMED_GROUP_REF,
                                      PY_COND_REF, NAMED_CHARACTER);
 
-    TokenSet CLASS_ELEMENTS = TokenSet.create(CHAR, CHAR_RANGE, SIMPLE_CLASS, CLASS, INTERSECTION, UNION, PROPERTY);
+    TokenSet CLASS_ELEMENTS = TokenSet.create(CHAR, CHAR_RANGE, SIMPLE_CLASS, CLASS, INTERSECTION, PROPERTY);
 }
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java
index 9ab38d12cd43..60e897f7c96d 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java
@@ -242,7 +242,6 @@ public class RegExpParser implements PsiParser {
   }
 
   private boolean parseClassdef(PsiBuilder builder) {
-    final PsiBuilder.Marker marker = builder.mark();
     int count = 0;
     while (true) {
       final IElementType token = builder.getTokenType();
@@ -267,12 +266,6 @@ public class RegExpParser implements PsiParser {
         parseNamedCharacter(builder);
       }
       else {
-        if (count > 1) {
-          marker.done(RegExpElementTypes.UNION);
-        }
-        else {
-          marker.drop();
-        }
         return count > 0;
       }
       count++;
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParserDefinition.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParserDefinition.java
index a7f9a0f347a6..0db0c438097d 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParserDefinition.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParserDefinition.java
@@ -111,8 +111,6 @@ public class RegExpParserDefinition implements ParserDefinition {
             return new RegExpBoundaryImpl(node);
         } else if (type == RegExpElementTypes.INTERSECTION) {
             return new RegExpIntersectionImpl(node);
-        } else if (type == RegExpElementTypes.UNION) {
-            return new RegExpUnionImpl(node);
         } else if (type == RegExpElementTypes.NAMED_GROUP_REF) {
             return new RegExpNamedGroupRefImpl(node);
         } else if (type == RegExpElementTypes.PY_COND_REF) {
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpElementVisitor.java b/RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpElementVisitor.java
index ee76cbc9c1d3..0d795e417b98 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpElementVisitor.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpElementVisitor.java
@@ -86,10 +86,6 @@ public class RegExpElementVisitor extends PsiElementVisitor {
         visitRegExpElement(intersection);
     }
 
-    public void visitRegExpUnion(RegExpUnion union) {
-        visitRegExpElement(union);
-    }
-
     public void visitRegExpNamedGroupRef(RegExpNamedGroupRef groupRef) {
         visitRegExpElement(groupRef);
     }
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpUnion.java b/RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpUnion.java
deleted file mode 100644
index f9ab9488c3a0..000000000000
--- a/RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpUnion.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * 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 org.intellij.lang.regexp.psi;
-
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A union of two or more class elements: [abc]
- * @author Bas Leijdekkers
- */
-public interface RegExpUnion extends RegExpClassElement {
-
-  @NotNull
-  RegExpClassElement[] getElements();
-}
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpUnionImpl.java b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpUnionImpl.java
deleted file mode 100644
index bba27101c7d6..000000000000
--- a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpUnionImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * 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 org.intellij.lang.regexp.psi.impl;
-
-import com.intellij.lang.ASTNode;
-import org.intellij.lang.regexp.psi.RegExpClassElement;
-import org.intellij.lang.regexp.psi.RegExpElementVisitor;
-import org.intellij.lang.regexp.psi.RegExpUnion;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author Bas Leijdekkers
- */
-public class RegExpUnionImpl extends RegExpElementImpl implements RegExpUnion {
-
-  public RegExpUnionImpl(ASTNode astNode) {
-    super(astNode);
-  }
-
-  @Override
-  public void accept(RegExpElementVisitor visitor) {
-    visitor.visitRegExpUnion(this);
-  }
-
-  @NotNull
-  @Override
-  public RegExpClassElement[] getElements() {
-    return findChildrenByClass(RegExpClassElement.class);
-  }
-}
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java b/RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java
index 4f94c33b04d8..2d901806f688 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java
@@ -173,12 +173,6 @@ public final class RegExpAnnotator extends RegExpElementVisitor implements Annot
         checkForDuplicates(classElement, seen);
       }
     }
-    else if (element instanceof RegExpUnion) {
-      final RegExpUnion union = (RegExpUnion)element;
-      for (RegExpClassElement classElement : union.getElements()) {
-        checkForDuplicates(classElement, seen);
-      }
-    }
   }
 
   @Override
diff --git a/RegExpSupport/testData/psi/Anchors10.txt b/RegExpSupport/testData/psi/Anchors10.txt
index 0045d14a80c7..f56778d67785 100644
--- a/RegExpSupport/testData/psi/Anchors10.txt
+++ b/RegExpSupport/testData/psi/Anchors10.txt
@@ -22,11 +22,10 @@ REGEXP_FILE
               PsiElement(CHARACTER)('b')
             RegExpClassImpl: <[eh]>
               PsiElement(CLASS_BEGIN)('[')
-              RegExpUnionImpl: <eh>
-                RegExpCharImpl: <e>
-                  PsiElement(CHARACTER)('e')
-                RegExpCharImpl: <h>
-                  PsiElement(CHARACTER)('h')
+              RegExpCharImpl: <e>
+                PsiElement(CHARACTER)('e')
+              RegExpCharImpl: <h>
+                PsiElement(CHARACTER)('h')
               PsiElement(CLASS_END)(']')
         PsiElement(GROUP_END)(')')
       RegExpCharImpl: <g>
diff --git a/RegExpSupport/testData/psi/Backrefs1.txt b/RegExpSupport/testData/psi/Backrefs1.txt
index 2ef3ab0da07e..3d59774b7417 100644
--- a/RegExpSupport/testData/psi/Backrefs1.txt
+++ b/RegExpSupport/testData/psi/Backrefs1.txt
@@ -23,11 +23,10 @@ REGEXP_FILE
       RegExpClosureImpl: <[ac]*>
         RegExpClassImpl: <[ac]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <ac>
-            RegExpCharImpl: <a>
-              PsiElement(CHARACTER)('a')
-            RegExpCharImpl: <c>
-              PsiElement(CHARACTER)('c')
+          RegExpCharImpl: <a>
+            PsiElement(CHARACTER)('a')
+          RegExpCharImpl: <c>
+            PsiElement(CHARACTER)('c')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <*>
           PsiElement(STAR)('*')
diff --git a/RegExpSupport/testData/psi/Backrefs3.txt b/RegExpSupport/testData/psi/Backrefs3.txt
index 32dd48f0ead7..709a954a460d 100644
--- a/RegExpSupport/testData/psi/Backrefs3.txt
+++ b/RegExpSupport/testData/psi/Backrefs3.txt
@@ -7,11 +7,10 @@ REGEXP_FILE
           RegExpBranchImpl: <[ab]>
             RegExpClassImpl: <[ab]>
               PsiElement(CLASS_BEGIN)('[')
-              RegExpUnionImpl: <ab>
-                RegExpCharImpl: <a>
-                  PsiElement(CHARACTER)('a')
-                RegExpCharImpl: <b>
-                  PsiElement(CHARACTER)('b')
+              RegExpCharImpl: <a>
+                PsiElement(CHARACTER)('a')
+              RegExpCharImpl: <b>
+                PsiElement(CHARACTER)('b')
               PsiElement(CLASS_END)(']')
         PsiElement(GROUP_END)(')')
       RegExpCharImpl: <=>
diff --git a/RegExpSupport/testData/psi/Backrefs4.txt b/RegExpSupport/testData/psi/Backrefs4.txt
index 7d8232de4bd0..14b9682c7da0 100644
--- a/RegExpSupport/testData/psi/Backrefs4.txt
+++ b/RegExpSupport/testData/psi/Backrefs4.txt
@@ -8,11 +8,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[ab]+>
               RegExpClassImpl: <[ab]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <ab>
-                  RegExpCharImpl: <a>
-                    PsiElement(CHARACTER)('a')
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <a>
+                  PsiElement(CHARACTER)('a')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <+>
                 PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/Backrefs7.txt b/RegExpSupport/testData/psi/Backrefs7.txt
index 05e0ce5bbe06..a18619d912f7 100644
--- a/RegExpSupport/testData/psi/Backrefs7.txt
+++ b/RegExpSupport/testData/psi/Backrefs7.txt
@@ -8,11 +8,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[ab]+>
               RegExpClassImpl: <[ab]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <ab>
-                  RegExpCharImpl: <a>
-                    PsiElement(CHARACTER)('a')
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <a>
+                  PsiElement(CHARACTER)('a')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <+>
                 PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/Backrefs8.txt b/RegExpSupport/testData/psi/Backrefs8.txt
index 2fe01686083c..86b05e90f57f 100644
--- a/RegExpSupport/testData/psi/Backrefs8.txt
+++ b/RegExpSupport/testData/psi/Backrefs8.txt
@@ -8,11 +8,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[ab]+>
               RegExpClassImpl: <[ab]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <ab>
-                  RegExpCharImpl: <a>
-                    PsiElement(CHARACTER)('a')
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <a>
+                  PsiElement(CHARACTER)('a')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <+>
                 PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/Backrefs9.txt b/RegExpSupport/testData/psi/Backrefs9.txt
index 764ff94828b6..c8ce738030bc 100644
--- a/RegExpSupport/testData/psi/Backrefs9.txt
+++ b/RegExpSupport/testData/psi/Backrefs9.txt
@@ -8,11 +8,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[ab]+>
               RegExpClassImpl: <[ab]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <ab>
-                  RegExpCharImpl: <a>
-                    PsiElement(CHARACTER)('a')
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <a>
+                  PsiElement(CHARACTER)('a')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <+>
                 PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/Bug1.txt b/RegExpSupport/testData/psi/Bug1.txt
index 6dc7eb097956..3f45bb311676 100644
--- a/RegExpSupport/testData/psi/Bug1.txt
+++ b/RegExpSupport/testData/psi/Bug1.txt
@@ -9,11 +9,10 @@ REGEXP_FILE
       RegExpClosureImpl: <[\w\.]*>
         RegExpClassImpl: <[\w\.]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <\w\.>
-            RegExpSimpleClassImpl: <\w>
-              PsiElement(CHAR_CLASS)('\w')
-            RegExpCharImpl: <\.>
-              PsiElement(REDUNDANT_ESCAPE)('\.')
+          RegExpSimpleClassImpl: <\w>
+            PsiElement(CHAR_CLASS)('\w')
+          RegExpCharImpl: <\.>
+            PsiElement(REDUNDANT_ESCAPE)('\.')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <*>
           PsiElement(STAR)('*')
diff --git a/RegExpSupport/testData/psi/Bug2.txt b/RegExpSupport/testData/psi/Bug2.txt
index a79382a309d6..869eca84294c 100644
--- a/RegExpSupport/testData/psi/Bug2.txt
+++ b/RegExpSupport/testData/psi/Bug2.txt
@@ -4,57 +4,56 @@ REGEXP_FILE
       RegExpClosureImpl: <[a-z0-9!\#$%&'*+/=?^_`{|}~-]+>
         RegExpClassImpl: <[a-z0-9!\#$%&'*+/=?^_`{|}~-]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <a-z0-9!\#$%&'*+/=?^_`{|}~->
-            RegExpCharRangeImpl: <a-z>
-              RegExpCharImpl: <a>
-                PsiElement(CHARACTER)('a')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <z>
-                PsiElement(CHARACTER)('z')
-            RegExpCharRangeImpl: <0-9>
-              RegExpCharImpl: <0>
-                PsiElement(CHARACTER)('0')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <9>
-                PsiElement(CHARACTER)('9')
-            RegExpCharImpl: <!>
-              PsiElement(CHARACTER)('!')
-            RegExpCharImpl: <\#>
-              PsiElement(REDUNDANT_ESCAPE)('\#')
-            RegExpCharImpl: <$>
-              PsiElement(CHARACTER)('$')
-            RegExpCharImpl: <%>
-              PsiElement(CHARACTER)('%')
-            RegExpCharImpl: <&>
-              PsiElement(CHARACTER)('&')
-            RegExpCharImpl: <'>
-              PsiElement(CHARACTER)(''')
-            RegExpCharImpl: <*>
-              PsiElement(CHARACTER)('*')
-            RegExpCharImpl: <+>
-              PsiElement(CHARACTER)('+')
-            RegExpCharImpl: </>
-              PsiElement(CHARACTER)('/')
-            RegExpCharImpl: <=>
-              PsiElement(CHARACTER)('=')
-            RegExpCharImpl: <?>
-              PsiElement(CHARACTER)('?')
-            RegExpCharImpl: <^>
-              PsiElement(CHARACTER)('^')
-            RegExpCharImpl: <_>
-              PsiElement(CHARACTER)('_')
-            RegExpCharImpl: <`>
-              PsiElement(CHARACTER)('`')
-            RegExpCharImpl: <{>
-              PsiElement(CHARACTER)('{')
-            RegExpCharImpl: <|>
-              PsiElement(CHARACTER)('|')
-            RegExpCharImpl: <}>
-              PsiElement(CHARACTER)('}')
-            RegExpCharImpl: <~>
-              PsiElement(CHARACTER)('~')
-            RegExpCharImpl: <->
-              PsiElement(MINUS)('-')
+          RegExpCharRangeImpl: <a-z>
+            RegExpCharImpl: <a>
+              PsiElement(CHARACTER)('a')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <z>
+              PsiElement(CHARACTER)('z')
+          RegExpCharRangeImpl: <0-9>
+            RegExpCharImpl: <0>
+              PsiElement(CHARACTER)('0')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <9>
+              PsiElement(CHARACTER)('9')
+          RegExpCharImpl: <!>
+            PsiElement(CHARACTER)('!')
+          RegExpCharImpl: <\#>
+            PsiElement(REDUNDANT_ESCAPE)('\#')
+          RegExpCharImpl: <$>
+            PsiElement(CHARACTER)('$')
+          RegExpCharImpl: <%>
+            PsiElement(CHARACTER)('%')
+          RegExpCharImpl: <&>
+            PsiElement(CHARACTER)('&')
+          RegExpCharImpl: <'>
+            PsiElement(CHARACTER)(''')
+          RegExpCharImpl: <*>
+            PsiElement(CHARACTER)('*')
+          RegExpCharImpl: <+>
+            PsiElement(CHARACTER)('+')
+          RegExpCharImpl: </>
+            PsiElement(CHARACTER)('/')
+          RegExpCharImpl: <=>
+            PsiElement(CHARACTER)('=')
+          RegExpCharImpl: <?>
+            PsiElement(CHARACTER)('?')
+          RegExpCharImpl: <^>
+            PsiElement(CHARACTER)('^')
+          RegExpCharImpl: <_>
+            PsiElement(CHARACTER)('_')
+          RegExpCharImpl: <`>
+            PsiElement(CHARACTER)('`')
+          RegExpCharImpl: <{>
+            PsiElement(CHARACTER)('{')
+          RegExpCharImpl: <|>
+            PsiElement(CHARACTER)('|')
+          RegExpCharImpl: <}>
+            PsiElement(CHARACTER)('}')
+          RegExpCharImpl: <~>
+            PsiElement(CHARACTER)('~')
+          RegExpCharImpl: <->
+            PsiElement(MINUS)('-')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <+>
           PsiElement(PLUS)('+')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses1.txt b/RegExpSupport/testData/psi/Charclasses1.txt
index 82ab2547804c..82b7f4309b64 100644
--- a/RegExpSupport/testData/psi/Charclasses1.txt
+++ b/RegExpSupport/testData/psi/Charclasses1.txt
@@ -5,11 +5,10 @@ REGEXP_FILE
         PsiElement(CHARACTER)('a')
       RegExpClassImpl: <[bc]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <bc>
-          RegExpCharImpl: <b>
-            PsiElement(CHARACTER)('b')
-          RegExpCharImpl: <c>
-            PsiElement(CHARACTER)('c')
+        RegExpCharImpl: <b>
+          PsiElement(CHARACTER)('b')
+        RegExpCharImpl: <c>
+          PsiElement(CHARACTER)('c')
         PsiElement(CLASS_END)(']')
       RegExpCharImpl: <d>
         PsiElement(CHARACTER)('d')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses11.txt b/RegExpSupport/testData/psi/Charclasses11.txt
index 30e41b647caa..865ba444ac7a 100644
--- a/RegExpSupport/testData/psi/Charclasses11.txt
+++ b/RegExpSupport/testData/psi/Charclasses11.txt
@@ -9,9 +9,8 @@ REGEXP_FILE
           RegExpCharImpl: <b>
             PsiElement(CHARACTER)('b')
           PsiElement(ANDAND)('&&')
-          RegExpUnionImpl: <-b>
-            RegExpCharImpl: <->
-              PsiElement(CHARACTER)('-')
-            RegExpCharImpl: <b>
-              PsiElement(CHARACTER)('b')
+          RegExpCharImpl: <->
+            PsiElement(CHARACTER)('-')
+          RegExpCharImpl: <b>
+            PsiElement(CHARACTER)('b')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses18.txt b/RegExpSupport/testData/psi/Charclasses18.txt
index 7bbc99f361d7..fcdcff31e5e5 100644
--- a/RegExpSupport/testData/psi/Charclasses18.txt
+++ b/RegExpSupport/testData/psi/Charclasses18.txt
@@ -5,17 +5,16 @@ REGEXP_FILE
         PsiElement(CHARACTER)('a')
       RegExpClassImpl: <[a[b][c]]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <a[b][c]>
-          RegExpCharImpl: <a>
-            PsiElement(CHARACTER)('a')
-          RegExpClassImpl: <[b]>
-            PsiElement(CLASS_BEGIN)('[')
-            RegExpCharImpl: <b>
-              PsiElement(CHARACTER)('b')
-            PsiElement(CLASS_END)(']')
-          RegExpClassImpl: <[c]>
-            PsiElement(CLASS_BEGIN)('[')
-            RegExpCharImpl: <c>
-              PsiElement(CHARACTER)('c')
-            PsiElement(CLASS_END)(']')
+        RegExpCharImpl: <a>
+          PsiElement(CHARACTER)('a')
+        RegExpClassImpl: <[b]>
+          PsiElement(CLASS_BEGIN)('[')
+          RegExpCharImpl: <b>
+            PsiElement(CHARACTER)('b')
+          PsiElement(CLASS_END)(']')
+        RegExpClassImpl: <[c]>
+          PsiElement(CLASS_BEGIN)('[')
+          RegExpCharImpl: <c>
+            PsiElement(CHARACTER)('c')
+          PsiElement(CLASS_END)(']')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses21.txt b/RegExpSupport/testData/psi/Charclasses21.txt
index 03cdac1f63a8..fd7630e039e5 100644
--- a/RegExpSupport/testData/psi/Charclasses21.txt
+++ b/RegExpSupport/testData/psi/Charclasses21.txt
@@ -3,13 +3,12 @@ REGEXP_FILE
     RegExpBranchImpl: <[a[^b]]>
       RegExpClassImpl: <[a[^b]]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <a[^b]>
-          RegExpCharImpl: <a>
-            PsiElement(CHARACTER)('a')
-          RegExpClassImpl: <[^b]>
-            PsiElement(CLASS_BEGIN)('[')
-            PsiElement(CARET)('^')
-            RegExpCharImpl: <b>
-              PsiElement(CHARACTER)('b')
-            PsiElement(CLASS_END)(']')
+        RegExpCharImpl: <a>
+          PsiElement(CHARACTER)('a')
+        RegExpClassImpl: <[^b]>
+          PsiElement(CLASS_BEGIN)('[')
+          PsiElement(CARET)('^')
+          RegExpCharImpl: <b>
+            PsiElement(CHARACTER)('b')
+          PsiElement(CLASS_END)(']')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses22.txt b/RegExpSupport/testData/psi/Charclasses22.txt
index f26f00c6536c..3c4c0c790fbe 100644
--- a/RegExpSupport/testData/psi/Charclasses22.txt
+++ b/RegExpSupport/testData/psi/Charclasses22.txt
@@ -5,23 +5,21 @@ REGEXP_FILE
         PsiElement(CHARACTER)('a')
       RegExpClassImpl: <[a[b[c]][d]]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <a[b[c]][d]>
-          RegExpCharImpl: <a>
-            PsiElement(CHARACTER)('a')
-          RegExpClassImpl: <[b[c]]>
+        RegExpCharImpl: <a>
+          PsiElement(CHARACTER)('a')
+        RegExpClassImpl: <[b[c]]>
+          PsiElement(CLASS_BEGIN)('[')
+          RegExpCharImpl: <b>
+            PsiElement(CHARACTER)('b')
+          RegExpClassImpl: <[c]>
             PsiElement(CLASS_BEGIN)('[')
-            RegExpUnionImpl: <b[c]>
-              RegExpCharImpl: <b>
-                PsiElement(CHARACTER)('b')
-              RegExpClassImpl: <[c]>
-                PsiElement(CLASS_BEGIN)('[')
-                RegExpCharImpl: <c>
-                  PsiElement(CHARACTER)('c')
-                PsiElement(CLASS_END)(']')
-            PsiElement(CLASS_END)(']')
-          RegExpClassImpl: <[d]>
-            PsiElement(CLASS_BEGIN)('[')
-            RegExpCharImpl: <d>
-              PsiElement(CHARACTER)('d')
+            RegExpCharImpl: <c>
+              PsiElement(CHARACTER)('c')
             PsiElement(CLASS_END)(']')
+          PsiElement(CLASS_END)(']')
+        RegExpClassImpl: <[d]>
+          PsiElement(CLASS_BEGIN)('[')
+          RegExpCharImpl: <d>
+            PsiElement(CHARACTER)('d')
+          PsiElement(CLASS_END)(']')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses25.txt b/RegExpSupport/testData/psi/Charclasses25.txt
index 6045dd9a2e50..bd477372b21b 100644
--- a/RegExpSupport/testData/psi/Charclasses25.txt
+++ b/RegExpSupport/testData/psi/Charclasses25.txt
@@ -5,13 +5,12 @@ REGEXP_FILE
         PsiElement(CHARACTER)('a')
       RegExpClassImpl: <[\t---]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <\t--->
-          RegExpCharRangeImpl: <\t-->
-            RegExpCharImpl: <\t>
-              PsiElement(ESC_CTRL_CHARACTER)('\t')
-            PsiElement(MINUS)('-')
-            RegExpCharImpl: <->
-              PsiElement(MINUS)('-')
+        RegExpCharRangeImpl: <\t-->
+          RegExpCharImpl: <\t>
+            PsiElement(ESC_CTRL_CHARACTER)('\t')
+          PsiElement(MINUS)('-')
           RegExpCharImpl: <->
             PsiElement(MINUS)('-')
+        RegExpCharImpl: <->
+          PsiElement(MINUS)('-')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses31.txt b/RegExpSupport/testData/psi/Charclasses31.txt
index c0a7aae71b47..7898d5bdb02b 100644
--- a/RegExpSupport/testData/psi/Charclasses31.txt
+++ b/RegExpSupport/testData/psi/Charclasses31.txt
@@ -6,11 +6,10 @@ REGEXP_FILE
       RegExpClassImpl: <[^bc]>
         PsiElement(CLASS_BEGIN)('[')
         PsiElement(CARET)('^')
-        RegExpUnionImpl: <bc>
-          RegExpCharImpl: <b>
-            PsiElement(CHARACTER)('b')
-          RegExpCharImpl: <c>
-            PsiElement(CHARACTER)('c')
+        RegExpCharImpl: <b>
+          PsiElement(CHARACTER)('b')
+        RegExpCharImpl: <c>
+          PsiElement(CHARACTER)('c')
         PsiElement(CLASS_END)(']')
       RegExpCharImpl: <d>
         PsiElement(CHARACTER)('d')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses32.txt b/RegExpSupport/testData/psi/Charclasses32.txt
index 9c0ea2e1baa5..7121c5f67932 100644
--- a/RegExpSupport/testData/psi/Charclasses32.txt
+++ b/RegExpSupport/testData/psi/Charclasses32.txt
@@ -6,9 +6,8 @@ REGEXP_FILE
       RegExpClassImpl: <[^bc]>
         PsiElement(CLASS_BEGIN)('[')
         PsiElement(CARET)('^')
-        RegExpUnionImpl: <bc>
-          RegExpCharImpl: <b>
-            PsiElement(CHARACTER)('b')
-          RegExpCharImpl: <c>
-            PsiElement(CHARACTER)('c')
+        RegExpCharImpl: <b>
+          PsiElement(CHARACTER)('b')
+        RegExpCharImpl: <c>
+          PsiElement(CHARACTER)('c')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses33.txt b/RegExpSupport/testData/psi/Charclasses33.txt
index 1e151b4f55e6..8e2e2a671458 100644
--- a/RegExpSupport/testData/psi/Charclasses33.txt
+++ b/RegExpSupport/testData/psi/Charclasses33.txt
@@ -5,10 +5,9 @@ REGEXP_FILE
         PsiElement(CHARACTER)('a')
       RegExpClassImpl: <[]b>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <]b>
-          RegExpCharImpl: <]>
-            PsiElement(CHARACTER)(']')
-          RegExpCharImpl: <b>
-            PsiElement(CHARACTER)('b')
+        RegExpCharImpl: <]>
+          PsiElement(CHARACTER)(']')
+        RegExpCharImpl: <b>
+          PsiElement(CHARACTER)('b')
         PsiErrorElement:Unclosed character class
           <empty list>
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses35.txt b/RegExpSupport/testData/psi/Charclasses35.txt
index 3f1d69dd8335..4e7b9267d8a4 100644
--- a/RegExpSupport/testData/psi/Charclasses35.txt
+++ b/RegExpSupport/testData/psi/Charclasses35.txt
@@ -3,23 +3,22 @@ REGEXP_FILE
     RegExpBranchImpl: <[abhgefdc]ij>
       RegExpClassImpl: <[abhgefdc]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <abhgefdc>
-          RegExpCharImpl: <a>
-            PsiElement(CHARACTER)('a')
-          RegExpCharImpl: <b>
-            PsiElement(CHARACTER)('b')
-          RegExpCharImpl: <h>
-            PsiElement(CHARACTER)('h')
-          RegExpCharImpl: <g>
-            PsiElement(CHARACTER)('g')
-          RegExpCharImpl: <e>
-            PsiElement(CHARACTER)('e')
-          RegExpCharImpl: <f>
-            PsiElement(CHARACTER)('f')
-          RegExpCharImpl: <d>
-            PsiElement(CHARACTER)('d')
-          RegExpCharImpl: <c>
-            PsiElement(CHARACTER)('c')
+        RegExpCharImpl: <a>
+          PsiElement(CHARACTER)('a')
+        RegExpCharImpl: <b>
+          PsiElement(CHARACTER)('b')
+        RegExpCharImpl: <h>
+          PsiElement(CHARACTER)('h')
+        RegExpCharImpl: <g>
+          PsiElement(CHARACTER)('g')
+        RegExpCharImpl: <e>
+          PsiElement(CHARACTER)('e')
+        RegExpCharImpl: <f>
+          PsiElement(CHARACTER)('f')
+        RegExpCharImpl: <d>
+          PsiElement(CHARACTER)('d')
+        RegExpCharImpl: <c>
+          PsiElement(CHARACTER)('c')
         PsiElement(CLASS_END)(']')
       RegExpCharImpl: <i>
         PsiElement(CHARACTER)('i')
diff --git a/RegExpSupport/testData/psi/Charclasses36.txt b/RegExpSupport/testData/psi/Charclasses36.txt
index b5eead6419dd..4a99380a9368 100644
--- a/RegExpSupport/testData/psi/Charclasses36.txt
+++ b/RegExpSupport/testData/psi/Charclasses36.txt
@@ -3,7 +3,24 @@ REGEXP_FILE
     RegExpBranchImpl: <[a-zA-Z_][a-zA-Z0-9_]*>
       RegExpClassImpl: <[a-zA-Z_]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <a-zA-Z_>
+        RegExpCharRangeImpl: <a-z>
+          RegExpCharImpl: <a>
+            PsiElement(CHARACTER)('a')
+          PsiElement(MINUS)('-')
+          RegExpCharImpl: <z>
+            PsiElement(CHARACTER)('z')
+        RegExpCharRangeImpl: <A-Z>
+          RegExpCharImpl: <A>
+            PsiElement(CHARACTER)('A')
+          PsiElement(MINUS)('-')
+          RegExpCharImpl: <Z>
+            PsiElement(CHARACTER)('Z')
+        RegExpCharImpl: <_>
+          PsiElement(CHARACTER)('_')
+        PsiElement(CLASS_END)(']')
+      RegExpClosureImpl: <[a-zA-Z0-9_]*>
+        RegExpClassImpl: <[a-zA-Z0-9_]>
+          PsiElement(CLASS_BEGIN)('[')
           RegExpCharRangeImpl: <a-z>
             RegExpCharImpl: <a>
               PsiElement(CHARACTER)('a')
@@ -16,33 +33,14 @@ REGEXP_FILE
             PsiElement(MINUS)('-')
             RegExpCharImpl: <Z>
               PsiElement(CHARACTER)('Z')
+          RegExpCharRangeImpl: <0-9>
+            RegExpCharImpl: <0>
+              PsiElement(CHARACTER)('0')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <9>
+              PsiElement(CHARACTER)('9')
           RegExpCharImpl: <_>
             PsiElement(CHARACTER)('_')
-        PsiElement(CLASS_END)(']')
-      RegExpClosureImpl: <[a-zA-Z0-9_]*>
-        RegExpClassImpl: <[a-zA-Z0-9_]>
-          PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <a-zA-Z0-9_>
-            RegExpCharRangeImpl: <a-z>
-              RegExpCharImpl: <a>
-                PsiElement(CHARACTER)('a')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <z>
-                PsiElement(CHARACTER)('z')
-            RegExpCharRangeImpl: <A-Z>
-              RegExpCharImpl: <A>
-                PsiElement(CHARACTER)('A')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <Z>
-                PsiElement(CHARACTER)('Z')
-            RegExpCharRangeImpl: <0-9>
-              RegExpCharImpl: <0>
-                PsiElement(CHARACTER)('0')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <9>
-                PsiElement(CHARACTER)('9')
-            RegExpCharImpl: <_>
-              PsiElement(CHARACTER)('_')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <*>
           PsiElement(STAR)('*')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses38.txt b/RegExpSupport/testData/psi/Charclasses38.txt
index af9470ea37b3..1562bedfb3eb 100644
--- a/RegExpSupport/testData/psi/Charclasses38.txt
+++ b/RegExpSupport/testData/psi/Charclasses38.txt
@@ -8,11 +8,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[ab]*?>
               RegExpClassImpl: <[ab]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <ab>
-                  RegExpCharImpl: <a>
-                    PsiElement(CHARACTER)('a')
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <a>
+                  PsiElement(CHARACTER)('a')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <*?>
                 PsiElement(STAR)('*')
diff --git a/RegExpSupport/testData/psi/Charclasses39.txt b/RegExpSupport/testData/psi/Charclasses39.txt
index 9556e8c4a060..c6048ba8f9ba 100644
--- a/RegExpSupport/testData/psi/Charclasses39.txt
+++ b/RegExpSupport/testData/psi/Charclasses39.txt
@@ -8,11 +8,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[ab]*>
               RegExpClassImpl: <[ab]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <ab>
-                  RegExpCharImpl: <a>
-                    PsiElement(CHARACTER)('a')
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <a>
+                  PsiElement(CHARACTER)('a')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <*>
                 PsiElement(STAR)('*')
diff --git a/RegExpSupport/testData/psi/Charclasses40.txt b/RegExpSupport/testData/psi/Charclasses40.txt
index 9dca6a99b7d0..9b3caa1ddf7d 100644
--- a/RegExpSupport/testData/psi/Charclasses40.txt
+++ b/RegExpSupport/testData/psi/Charclasses40.txt
@@ -8,11 +8,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[ab]??>
               RegExpClassImpl: <[ab]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <ab>
-                  RegExpCharImpl: <a>
-                    PsiElement(CHARACTER)('a')
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <a>
+                  PsiElement(CHARACTER)('a')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <??>
                 PsiElement(QUEST)('?')
diff --git a/RegExpSupport/testData/psi/Charclasses41.txt b/RegExpSupport/testData/psi/Charclasses41.txt
index a632d5341b75..42d9514856d0 100644
--- a/RegExpSupport/testData/psi/Charclasses41.txt
+++ b/RegExpSupport/testData/psi/Charclasses41.txt
@@ -10,11 +10,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[ab]?>
               RegExpClassImpl: <[ab]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <ab>
-                  RegExpCharImpl: <a>
-                    PsiElement(CHARACTER)('a')
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <a>
+                  PsiElement(CHARACTER)('a')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <?>
                 PsiElement(QUEST)('?')
diff --git a/RegExpSupport/testData/psi/Charclasses42.txt b/RegExpSupport/testData/psi/Charclasses42.txt
index 006ffb81f211..39fcf47ceadf 100644
--- a/RegExpSupport/testData/psi/Charclasses42.txt
+++ b/RegExpSupport/testData/psi/Charclasses42.txt
@@ -10,11 +10,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[ab]??>
               RegExpClassImpl: <[ab]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <ab>
-                  RegExpCharImpl: <a>
-                    PsiElement(CHARACTER)('a')
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <a>
+                  PsiElement(CHARACTER)('a')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <??>
                 PsiElement(QUEST)('?')
diff --git a/RegExpSupport/testData/psi/Charclasses43.txt b/RegExpSupport/testData/psi/Charclasses43.txt
index 2170f3be9e3f..cd62419feba8 100644
--- a/RegExpSupport/testData/psi/Charclasses43.txt
+++ b/RegExpSupport/testData/psi/Charclasses43.txt
@@ -10,11 +10,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[ab]*?>
               RegExpClassImpl: <[ab]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <ab>
-                  RegExpCharImpl: <a>
-                    PsiElement(CHARACTER)('a')
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <a>
+                  PsiElement(CHARACTER)('a')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <*?>
                 PsiElement(STAR)('*')
diff --git a/RegExpSupport/testData/psi/Charclasses44.txt b/RegExpSupport/testData/psi/Charclasses44.txt
index 38a9020359d3..1173ba9457f2 100644
--- a/RegExpSupport/testData/psi/Charclasses44.txt
+++ b/RegExpSupport/testData/psi/Charclasses44.txt
@@ -6,13 +6,12 @@ REGEXP_FILE
       RegExpClosureImpl: <[bcd]+>
         RegExpClassImpl: <[bcd]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <bcd>
-            RegExpCharImpl: <b>
-              PsiElement(CHARACTER)('b')
-            RegExpCharImpl: <c>
-              PsiElement(CHARACTER)('c')
-            RegExpCharImpl: <d>
-              PsiElement(CHARACTER)('d')
+          RegExpCharImpl: <b>
+            PsiElement(CHARACTER)('b')
+          RegExpCharImpl: <c>
+            PsiElement(CHARACTER)('c')
+          RegExpCharImpl: <d>
+            PsiElement(CHARACTER)('d')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <+>
           PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/Charclasses46.txt b/RegExpSupport/testData/psi/Charclasses46.txt
index 0fa5dd1db098..9135d315557c 100644
--- a/RegExpSupport/testData/psi/Charclasses46.txt
+++ b/RegExpSupport/testData/psi/Charclasses46.txt
@@ -6,13 +6,12 @@ REGEXP_FILE
       RegExpClosureImpl: <[bcd]*>
         RegExpClassImpl: <[bcd]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <bcd>
-            RegExpCharImpl: <b>
-              PsiElement(CHARACTER)('b')
-            RegExpCharImpl: <c>
-              PsiElement(CHARACTER)('c')
-            RegExpCharImpl: <d>
-              PsiElement(CHARACTER)('d')
+          RegExpCharImpl: <b>
+            PsiElement(CHARACTER)('b')
+          RegExpCharImpl: <c>
+            PsiElement(CHARACTER)('c')
+          RegExpCharImpl: <d>
+            PsiElement(CHARACTER)('d')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <*>
           PsiElement(STAR)('*')
diff --git a/RegExpSupport/testData/psi/Charclasses47.txt b/RegExpSupport/testData/psi/Charclasses47.txt
index 10f53558b3ab..d686abb3abc9 100644
--- a/RegExpSupport/testData/psi/Charclasses47.txt
+++ b/RegExpSupport/testData/psi/Charclasses47.txt
@@ -5,11 +5,10 @@ REGEXP_FILE
         RegExpClassImpl: <[^ab]>
           PsiElement(CLASS_BEGIN)('[')
           PsiElement(CARET)('^')
-          RegExpUnionImpl: <ab>
-            RegExpCharImpl: <a>
-              PsiElement(CHARACTER)('a')
-            RegExpCharImpl: <b>
-              PsiElement(CHARACTER)('b')
+          RegExpCharImpl: <a>
+            PsiElement(CHARACTER)('a')
+          RegExpCharImpl: <b>
+            PsiElement(CHARACTER)('b')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <*>
           PsiElement(STAR)('*')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses49.txt b/RegExpSupport/testData/psi/Charclasses49.txt
index e5ee5646ede9..c41b38df8c20 100644
--- a/RegExpSupport/testData/psi/Charclasses49.txt
+++ b/RegExpSupport/testData/psi/Charclasses49.txt
@@ -5,13 +5,12 @@ REGEXP_FILE
         PsiElement(CHARACTER)('a')
       RegExpClassImpl: <[+*?]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <+*?>
-          RegExpCharImpl: <+>
-            PsiElement(CHARACTER)('+')
-          RegExpCharImpl: <*>
-            PsiElement(CHARACTER)('*')
-          RegExpCharImpl: <?>
-            PsiElement(CHARACTER)('?')
+        RegExpCharImpl: <+>
+          PsiElement(CHARACTER)('+')
+        RegExpCharImpl: <*>
+          PsiElement(CHARACTER)('*')
+        RegExpCharImpl: <?>
+          PsiElement(CHARACTER)('?')
         PsiElement(CLASS_END)(']')
       RegExpCharImpl: <b>
         PsiElement(CHARACTER)('b')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses5.txt b/RegExpSupport/testData/psi/Charclasses5.txt
index ae3d97425adf..5bff2e1c29fe 100644
--- a/RegExpSupport/testData/psi/Charclasses5.txt
+++ b/RegExpSupport/testData/psi/Charclasses5.txt
@@ -5,9 +5,8 @@ REGEXP_FILE
         PsiElement(CHARACTER)('a')
       RegExpClassImpl: <[-b]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <-b>
-          RegExpCharImpl: <->
-            PsiElement(CHARACTER)('-')
-          RegExpCharImpl: <b>
-            PsiElement(CHARACTER)('b')
+        RegExpCharImpl: <->
+          PsiElement(CHARACTER)('-')
+        RegExpCharImpl: <b>
+          PsiElement(CHARACTER)('b')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses50.txt b/RegExpSupport/testData/psi/Charclasses50.txt
index a3f927a7e566..16bf84b7edc8 100644
--- a/RegExpSupport/testData/psi/Charclasses50.txt
+++ b/RegExpSupport/testData/psi/Charclasses50.txt
@@ -5,17 +5,16 @@ REGEXP_FILE
         PsiElement(CHARACTER)('a')
       RegExpClassImpl: <[\p{IsDigit}\p{IsAlpha}]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <\p{IsDigit}\p{IsAlpha}>
-          RegExpPropertyImpl: <\p{IsDigit}>
-            PsiElement(PROPERTY)('\p')
-            PsiElement(LBRACE)('{')
-            PsiElement(NAME)('IsDigit')
-            PsiElement(RBRACE)('}')
-          RegExpPropertyImpl: <\p{IsAlpha}>
-            PsiElement(PROPERTY)('\p')
-            PsiElement(LBRACE)('{')
-            PsiElement(NAME)('IsAlpha')
-            PsiElement(RBRACE)('}')
+        RegExpPropertyImpl: <\p{IsDigit}>
+          PsiElement(PROPERTY)('\p')
+          PsiElement(LBRACE)('{')
+          PsiElement(NAME)('IsDigit')
+          PsiElement(RBRACE)('}')
+        RegExpPropertyImpl: <\p{IsAlpha}>
+          PsiElement(PROPERTY)('\p')
+          PsiElement(LBRACE)('{')
+          PsiElement(NAME)('IsAlpha')
+          PsiElement(RBRACE)('}')
         PsiElement(CLASS_END)(']')
       RegExpCharImpl: <b>
         PsiElement(CHARACTER)('b')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses61.txt b/RegExpSupport/testData/psi/Charclasses61.txt
index b87ee083e033..aa8a3a2c22ce 100644
--- a/RegExpSupport/testData/psi/Charclasses61.txt
+++ b/RegExpSupport/testData/psi/Charclasses61.txt
@@ -3,11 +3,10 @@ REGEXP_FILE
     RegExpBranchImpl: <[\w-\w]>
       RegExpClassImpl: <[\w-\w]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <\w-\w>
-          RegExpSimpleClassImpl: <\w>
-            PsiElement(CHAR_CLASS)('\w')
-          RegExpCharImpl: <->
-            PsiElement(CHARACTER)('-')
-          RegExpSimpleClassImpl: <\w>
-            PsiElement(CHAR_CLASS)('\w')
+        RegExpSimpleClassImpl: <\w>
+          PsiElement(CHAR_CLASS)('\w')
+        RegExpCharImpl: <->
+          PsiElement(CHARACTER)('-')
+        RegExpSimpleClassImpl: <\w>
+          PsiElement(CHAR_CLASS)('\w')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses64.txt b/RegExpSupport/testData/psi/Charclasses64.txt
index 919152847aea..b3a14f509b7d 100644
--- a/RegExpSupport/testData/psi/Charclasses64.txt
+++ b/RegExpSupport/testData/psi/Charclasses64.txt
@@ -3,15 +3,14 @@ REGEXP_FILE
     RegExpBranchImpl: <[\ud800\udc00-\udbff\udfff]>
       RegExpClassImpl: <[\ud800\udc00-\udbff\udfff]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <\ud800\udc00-\udbff\udfff>
-          RegExpCharImpl: <\ud800>
-            PsiElement(UNICODE_CHAR)('\ud800')
-          RegExpCharRangeImpl: <\udc00-\udbff>
-            RegExpCharImpl: <\udc00>
-              PsiElement(UNICODE_CHAR)('\udc00')
-            PsiElement(MINUS)('-')
-            RegExpCharImpl: <\udbff>
-              PsiElement(UNICODE_CHAR)('\udbff')
-          RegExpCharImpl: <\udfff>
-            PsiElement(UNICODE_CHAR)('\udfff')
+        RegExpCharImpl: <\ud800>
+          PsiElement(UNICODE_CHAR)('\ud800')
+        RegExpCharRangeImpl: <\udc00-\udbff>
+          RegExpCharImpl: <\udc00>
+            PsiElement(UNICODE_CHAR)('\udc00')
+          PsiElement(MINUS)('-')
+          RegExpCharImpl: <\udbff>
+            PsiElement(UNICODE_CHAR)('\udbff')
+        RegExpCharImpl: <\udfff>
+          PsiElement(UNICODE_CHAR)('\udfff')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses67.txt b/RegExpSupport/testData/psi/Charclasses67.txt
index 2d58df0633c5..139ff6c34835 100644
--- a/RegExpSupport/testData/psi/Charclasses67.txt
+++ b/RegExpSupport/testData/psi/Charclasses67.txt
@@ -5,17 +5,16 @@ REGEXP_FILE
         PsiElement(REDUNDANT_ESCAPE)('\-')
       RegExpClassImpl: <[\*\-\[\]\\\+]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <\*\-\[\]\\\+>
-          RegExpCharImpl: <\*>
-            PsiElement(REDUNDANT_ESCAPE)('\*')
-          RegExpCharImpl: <\->
-            PsiElement(ESC_CHARACTER)('\-')
-          RegExpCharImpl: <\[>
-            PsiElement(ESC_CHARACTER)('\[')
-          RegExpCharImpl: <\]>
-            PsiElement(ESC_CHARACTER)('\]')
-          RegExpCharImpl: <\\>
-            PsiElement(ESC_CHARACTER)('\\')
-          RegExpCharImpl: <\+>
-            PsiElement(REDUNDANT_ESCAPE)('\+')
+        RegExpCharImpl: <\*>
+          PsiElement(REDUNDANT_ESCAPE)('\*')
+        RegExpCharImpl: <\->
+          PsiElement(ESC_CHARACTER)('\-')
+        RegExpCharImpl: <\[>
+          PsiElement(ESC_CHARACTER)('\[')
+        RegExpCharImpl: <\]>
+          PsiElement(ESC_CHARACTER)('\]')
+        RegExpCharImpl: <\\>
+          PsiElement(ESC_CHARACTER)('\\')
+        RegExpCharImpl: <\+>
+          PsiElement(REDUNDANT_ESCAPE)('\+')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses8.txt b/RegExpSupport/testData/psi/Charclasses8.txt
index f629c0f3cd0f..605b26a80244 100644
--- a/RegExpSupport/testData/psi/Charclasses8.txt
+++ b/RegExpSupport/testData/psi/Charclasses8.txt
@@ -11,10 +11,9 @@ REGEXP_FILE
           PsiElement(ANDAND)('&&')
           RegExpClassImpl: <[cd]>
             PsiElement(CLASS_BEGIN)('[')
-            RegExpUnionImpl: <cd>
-              RegExpCharImpl: <c>
-                PsiElement(CHARACTER)('c')
-              RegExpCharImpl: <d>
-                PsiElement(CHARACTER)('d')
+            RegExpCharImpl: <c>
+              PsiElement(CHARACTER)('c')
+            RegExpCharImpl: <d>
+              PsiElement(CHARACTER)('d')
             PsiElement(CLASS_END)(']')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Charclasses9.txt b/RegExpSupport/testData/psi/Charclasses9.txt
index 6eea58ee4be4..979286ca22b7 100644
--- a/RegExpSupport/testData/psi/Charclasses9.txt
+++ b/RegExpSupport/testData/psi/Charclasses9.txt
@@ -15,10 +15,9 @@ REGEXP_FILE
           PsiElement(ANDAND)('&&')
           RegExpClassImpl: <[cd]>
             PsiElement(CLASS_BEGIN)('[')
-            RegExpUnionImpl: <cd>
-              RegExpCharImpl: <c>
-                PsiElement(CHARACTER)('c')
-              RegExpCharImpl: <d>
-                PsiElement(CHARACTER)('d')
+            RegExpCharImpl: <c>
+              PsiElement(CHARACTER)('c')
+            RegExpCharImpl: <d>
+              PsiElement(CHARACTER)('d')
             PsiElement(CLASS_END)(']')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Complex2.txt b/RegExpSupport/testData/psi/Complex2.txt
index 1767a4d63fae..f5ecf0e040fd 100644
--- a/RegExpSupport/testData/psi/Complex2.txt
+++ b/RegExpSupport/testData/psi/Complex2.txt
@@ -12,20 +12,18 @@ REGEXP_FILE
                   RegExpBranchImpl: <[hH][tT]{2}[pP]>
                     RegExpClassImpl: <[hH]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <hH>
-                        RegExpCharImpl: <h>
-                          PsiElement(CHARACTER)('h')
-                        RegExpCharImpl: <H>
-                          PsiElement(CHARACTER)('H')
+                      RegExpCharImpl: <h>
+                        PsiElement(CHARACTER)('h')
+                      RegExpCharImpl: <H>
+                        PsiElement(CHARACTER)('H')
                       PsiElement(CLASS_END)(']')
                     RegExpClosureImpl: <[tT]{2}>
                       RegExpClassImpl: <[tT]>
                         PsiElement(CLASS_BEGIN)('[')
-                        RegExpUnionImpl: <tT>
-                          RegExpCharImpl: <t>
-                            PsiElement(CHARACTER)('t')
-                          RegExpCharImpl: <T>
-                            PsiElement(CHARACTER)('T')
+                        RegExpCharImpl: <t>
+                          PsiElement(CHARACTER)('t')
+                        RegExpCharImpl: <T>
+                          PsiElement(CHARACTER)('T')
                         PsiElement(CLASS_END)(']')
                       RegExpQuantifierImpl: <{2}>
                         PsiElement(LBRACE)('{')
@@ -34,37 +32,33 @@ REGEXP_FILE
                         PsiElement(RBRACE)('}')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                   PsiElement(UNION)('|')
                   RegExpBranchImpl: <[fF][tT][pP]>
                     RegExpClassImpl: <[fF]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <fF>
-                        RegExpCharImpl: <f>
-                          PsiElement(CHARACTER)('f')
-                        RegExpCharImpl: <F>
-                          PsiElement(CHARACTER)('F')
+                      RegExpCharImpl: <f>
+                        PsiElement(CHARACTER)('f')
+                      RegExpCharImpl: <F>
+                        PsiElement(CHARACTER)('F')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[tT]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <tT>
-                        RegExpCharImpl: <t>
-                          PsiElement(CHARACTER)('t')
-                        RegExpCharImpl: <T>
-                          PsiElement(CHARACTER)('T')
+                      RegExpCharImpl: <t>
+                        PsiElement(CHARACTER)('t')
+                      RegExpCharImpl: <T>
+                        PsiElement(CHARACTER)('T')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                 PsiElement(GROUP_END)(')')
               RegExpCharImpl: <:>
@@ -79,27 +73,26 @@ REGEXP_FILE
       RegExpClosureImpl: <[a-zA-Z0-9\-]+>
         RegExpClassImpl: <[a-zA-Z0-9\-]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <a-zA-Z0-9\->
-            RegExpCharRangeImpl: <a-z>
-              RegExpCharImpl: <a>
-                PsiElement(CHARACTER)('a')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <z>
-                PsiElement(CHARACTER)('z')
-            RegExpCharRangeImpl: <A-Z>
-              RegExpCharImpl: <A>
-                PsiElement(CHARACTER)('A')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <Z>
-                PsiElement(CHARACTER)('Z')
-            RegExpCharRangeImpl: <0-9>
-              RegExpCharImpl: <0>
-                PsiElement(CHARACTER)('0')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <9>
-                PsiElement(CHARACTER)('9')
-            RegExpCharImpl: <\->
-              PsiElement(ESC_CHARACTER)('\-')
+          RegExpCharRangeImpl: <a-z>
+            RegExpCharImpl: <a>
+              PsiElement(CHARACTER)('a')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <z>
+              PsiElement(CHARACTER)('z')
+          RegExpCharRangeImpl: <A-Z>
+            RegExpCharImpl: <A>
+              PsiElement(CHARACTER)('A')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <Z>
+              PsiElement(CHARACTER)('Z')
+          RegExpCharRangeImpl: <0-9>
+            RegExpCharImpl: <0>
+              PsiElement(CHARACTER)('0')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <9>
+              PsiElement(CHARACTER)('9')
+          RegExpCharImpl: <\->
+            PsiElement(ESC_CHARACTER)('\-')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <+>
           PsiElement(PLUS)('+')
@@ -113,27 +106,26 @@ REGEXP_FILE
               RegExpClosureImpl: <[a-zA-Z0-9\-]+>
                 RegExpClassImpl: <[a-zA-Z0-9\-]>
                   PsiElement(CLASS_BEGIN)('[')
-                  RegExpUnionImpl: <a-zA-Z0-9\->
-                    RegExpCharRangeImpl: <a-z>
-                      RegExpCharImpl: <a>
-                        PsiElement(CHARACTER)('a')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <z>
-                        PsiElement(CHARACTER)('z')
-                    RegExpCharRangeImpl: <A-Z>
-                      RegExpCharImpl: <A>
-                        PsiElement(CHARACTER)('A')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <Z>
-                        PsiElement(CHARACTER)('Z')
-                    RegExpCharRangeImpl: <0-9>
-                      RegExpCharImpl: <0>
-                        PsiElement(CHARACTER)('0')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <9>
-                        PsiElement(CHARACTER)('9')
-                    RegExpCharImpl: <\->
-                      PsiElement(ESC_CHARACTER)('\-')
+                  RegExpCharRangeImpl: <a-z>
+                    RegExpCharImpl: <a>
+                      PsiElement(CHARACTER)('a')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <z>
+                      PsiElement(CHARACTER)('z')
+                  RegExpCharRangeImpl: <A-Z>
+                    RegExpCharImpl: <A>
+                      PsiElement(CHARACTER)('A')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <Z>
+                      PsiElement(CHARACTER)('Z')
+                  RegExpCharRangeImpl: <0-9>
+                    RegExpCharImpl: <0>
+                      PsiElement(CHARACTER)('0')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <9>
+                      PsiElement(CHARACTER)('9')
+                  RegExpCharImpl: <\->
+                    PsiElement(ESC_CHARACTER)('\-')
                   PsiElement(CLASS_END)(']')
                 RegExpQuantifierImpl: <+>
                   PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/Complex3.txt b/RegExpSupport/testData/psi/Complex3.txt
index 0c18aa246c69..6d8ddcd8bb1f 100644
--- a/RegExpSupport/testData/psi/Complex3.txt
+++ b/RegExpSupport/testData/psi/Complex3.txt
@@ -12,20 +12,18 @@ REGEXP_FILE
                   RegExpBranchImpl: <[hH][tT]{2}[pP]>
                     RegExpClassImpl: <[hH]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <hH>
-                        RegExpCharImpl: <h>
-                          PsiElement(CHARACTER)('h')
-                        RegExpCharImpl: <H>
-                          PsiElement(CHARACTER)('H')
+                      RegExpCharImpl: <h>
+                        PsiElement(CHARACTER)('h')
+                      RegExpCharImpl: <H>
+                        PsiElement(CHARACTER)('H')
                       PsiElement(CLASS_END)(']')
                     RegExpClosureImpl: <[tT]{2}>
                       RegExpClassImpl: <[tT]>
                         PsiElement(CLASS_BEGIN)('[')
-                        RegExpUnionImpl: <tT>
-                          RegExpCharImpl: <t>
-                            PsiElement(CHARACTER)('t')
-                          RegExpCharImpl: <T>
-                            PsiElement(CHARACTER)('T')
+                        RegExpCharImpl: <t>
+                          PsiElement(CHARACTER)('t')
+                        RegExpCharImpl: <T>
+                          PsiElement(CHARACTER)('T')
                         PsiElement(CLASS_END)(']')
                       RegExpQuantifierImpl: <{2}>
                         PsiElement(LBRACE)('{')
@@ -34,37 +32,33 @@ REGEXP_FILE
                         PsiElement(RBRACE)('}')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                   PsiElement(UNION)('|')
                   RegExpBranchImpl: <[fF][tT][pP]>
                     RegExpClassImpl: <[fF]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <fF>
-                        RegExpCharImpl: <f>
-                          PsiElement(CHARACTER)('f')
-                        RegExpCharImpl: <F>
-                          PsiElement(CHARACTER)('F')
+                      RegExpCharImpl: <f>
+                        PsiElement(CHARACTER)('f')
+                      RegExpCharImpl: <F>
+                        PsiElement(CHARACTER)('F')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[tT]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <tT>
-                        RegExpCharImpl: <t>
-                          PsiElement(CHARACTER)('t')
-                        RegExpCharImpl: <T>
-                          PsiElement(CHARACTER)('T')
+                      RegExpCharImpl: <t>
+                        PsiElement(CHARACTER)('t')
+                      RegExpCharImpl: <T>
+                        PsiElement(CHARACTER)('T')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                 PsiElement(GROUP_END)(')')
               RegExpCharImpl: <:>
@@ -79,27 +73,26 @@ REGEXP_FILE
       RegExpClosureImpl: <[a-zA-Z0-9\-]+>
         RegExpClassImpl: <[a-zA-Z0-9\-]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <a-zA-Z0-9\->
-            RegExpCharRangeImpl: <a-z>
-              RegExpCharImpl: <a>
-                PsiElement(CHARACTER)('a')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <z>
-                PsiElement(CHARACTER)('z')
-            RegExpCharRangeImpl: <A-Z>
-              RegExpCharImpl: <A>
-                PsiElement(CHARACTER)('A')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <Z>
-                PsiElement(CHARACTER)('Z')
-            RegExpCharRangeImpl: <0-9>
-              RegExpCharImpl: <0>
-                PsiElement(CHARACTER)('0')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <9>
-                PsiElement(CHARACTER)('9')
-            RegExpCharImpl: <\->
-              PsiElement(ESC_CHARACTER)('\-')
+          RegExpCharRangeImpl: <a-z>
+            RegExpCharImpl: <a>
+              PsiElement(CHARACTER)('a')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <z>
+              PsiElement(CHARACTER)('z')
+          RegExpCharRangeImpl: <A-Z>
+            RegExpCharImpl: <A>
+              PsiElement(CHARACTER)('A')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <Z>
+              PsiElement(CHARACTER)('Z')
+          RegExpCharRangeImpl: <0-9>
+            RegExpCharImpl: <0>
+              PsiElement(CHARACTER)('0')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <9>
+              PsiElement(CHARACTER)('9')
+          RegExpCharImpl: <\->
+            PsiElement(ESC_CHARACTER)('\-')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <+>
           PsiElement(PLUS)('+')
@@ -113,27 +106,26 @@ REGEXP_FILE
               RegExpClosureImpl: <[a-zA-Z0-9\-]+>
                 RegExpClassImpl: <[a-zA-Z0-9\-]>
                   PsiElement(CLASS_BEGIN)('[')
-                  RegExpUnionImpl: <a-zA-Z0-9\->
-                    RegExpCharRangeImpl: <a-z>
-                      RegExpCharImpl: <a>
-                        PsiElement(CHARACTER)('a')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <z>
-                        PsiElement(CHARACTER)('z')
-                    RegExpCharRangeImpl: <A-Z>
-                      RegExpCharImpl: <A>
-                        PsiElement(CHARACTER)('A')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <Z>
-                        PsiElement(CHARACTER)('Z')
-                    RegExpCharRangeImpl: <0-9>
-                      RegExpCharImpl: <0>
-                        PsiElement(CHARACTER)('0')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <9>
-                        PsiElement(CHARACTER)('9')
-                    RegExpCharImpl: <\->
-                      PsiElement(ESC_CHARACTER)('\-')
+                  RegExpCharRangeImpl: <a-z>
+                    RegExpCharImpl: <a>
+                      PsiElement(CHARACTER)('a')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <z>
+                      PsiElement(CHARACTER)('z')
+                  RegExpCharRangeImpl: <A-Z>
+                    RegExpCharImpl: <A>
+                      PsiElement(CHARACTER)('A')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <Z>
+                      PsiElement(CHARACTER)('Z')
+                  RegExpCharRangeImpl: <0-9>
+                    RegExpCharImpl: <0>
+                      PsiElement(CHARACTER)('0')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <9>
+                      PsiElement(CHARACTER)('9')
+                  RegExpCharImpl: <\->
+                    PsiElement(ESC_CHARACTER)('\-')
                   PsiElement(CLASS_END)(']')
                 RegExpQuantifierImpl: <+>
                   PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/Complex4.txt b/RegExpSupport/testData/psi/Complex4.txt
index ec8f2d390f3b..0bbb3204d323 100644
--- a/RegExpSupport/testData/psi/Complex4.txt
+++ b/RegExpSupport/testData/psi/Complex4.txt
@@ -12,20 +12,18 @@ REGEXP_FILE
                   RegExpBranchImpl: <[hH][tT]{2}[pP]>
                     RegExpClassImpl: <[hH]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <hH>
-                        RegExpCharImpl: <h>
-                          PsiElement(CHARACTER)('h')
-                        RegExpCharImpl: <H>
-                          PsiElement(CHARACTER)('H')
+                      RegExpCharImpl: <h>
+                        PsiElement(CHARACTER)('h')
+                      RegExpCharImpl: <H>
+                        PsiElement(CHARACTER)('H')
                       PsiElement(CLASS_END)(']')
                     RegExpClosureImpl: <[tT]{2}>
                       RegExpClassImpl: <[tT]>
                         PsiElement(CLASS_BEGIN)('[')
-                        RegExpUnionImpl: <tT>
-                          RegExpCharImpl: <t>
-                            PsiElement(CHARACTER)('t')
-                          RegExpCharImpl: <T>
-                            PsiElement(CHARACTER)('T')
+                        RegExpCharImpl: <t>
+                          PsiElement(CHARACTER)('t')
+                        RegExpCharImpl: <T>
+                          PsiElement(CHARACTER)('T')
                         PsiElement(CLASS_END)(']')
                       RegExpQuantifierImpl: <{2}>
                         PsiElement(LBRACE)('{')
@@ -34,37 +32,33 @@ REGEXP_FILE
                         PsiElement(RBRACE)('}')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                   PsiElement(UNION)('|')
                   RegExpBranchImpl: <[fF][tT][pP]>
                     RegExpClassImpl: <[fF]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <fF>
-                        RegExpCharImpl: <f>
-                          PsiElement(CHARACTER)('f')
-                        RegExpCharImpl: <F>
-                          PsiElement(CHARACTER)('F')
+                      RegExpCharImpl: <f>
+                        PsiElement(CHARACTER)('f')
+                      RegExpCharImpl: <F>
+                        PsiElement(CHARACTER)('F')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[tT]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <tT>
-                        RegExpCharImpl: <t>
-                          PsiElement(CHARACTER)('t')
-                        RegExpCharImpl: <T>
-                          PsiElement(CHARACTER)('T')
+                      RegExpCharImpl: <t>
+                        PsiElement(CHARACTER)('t')
+                      RegExpCharImpl: <T>
+                        PsiElement(CHARACTER)('T')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                 PsiElement(GROUP_END)(')')
               RegExpCharImpl: <:>
@@ -79,27 +73,26 @@ REGEXP_FILE
       RegExpClosureImpl: <[a-zA-Z0-9\-]+>
         RegExpClassImpl: <[a-zA-Z0-9\-]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <a-zA-Z0-9\->
-            RegExpCharRangeImpl: <a-z>
-              RegExpCharImpl: <a>
-                PsiElement(CHARACTER)('a')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <z>
-                PsiElement(CHARACTER)('z')
-            RegExpCharRangeImpl: <A-Z>
-              RegExpCharImpl: <A>
-                PsiElement(CHARACTER)('A')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <Z>
-                PsiElement(CHARACTER)('Z')
-            RegExpCharRangeImpl: <0-9>
-              RegExpCharImpl: <0>
-                PsiElement(CHARACTER)('0')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <9>
-                PsiElement(CHARACTER)('9')
-            RegExpCharImpl: <\->
-              PsiElement(ESC_CHARACTER)('\-')
+          RegExpCharRangeImpl: <a-z>
+            RegExpCharImpl: <a>
+              PsiElement(CHARACTER)('a')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <z>
+              PsiElement(CHARACTER)('z')
+          RegExpCharRangeImpl: <A-Z>
+            RegExpCharImpl: <A>
+              PsiElement(CHARACTER)('A')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <Z>
+              PsiElement(CHARACTER)('Z')
+          RegExpCharRangeImpl: <0-9>
+            RegExpCharImpl: <0>
+              PsiElement(CHARACTER)('0')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <9>
+              PsiElement(CHARACTER)('9')
+          RegExpCharImpl: <\->
+            PsiElement(ESC_CHARACTER)('\-')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <+>
           PsiElement(PLUS)('+')
@@ -113,27 +106,26 @@ REGEXP_FILE
               RegExpClosureImpl: <[a-zA-Z0-9\-]+>
                 RegExpClassImpl: <[a-zA-Z0-9\-]>
                   PsiElement(CLASS_BEGIN)('[')
-                  RegExpUnionImpl: <a-zA-Z0-9\->
-                    RegExpCharRangeImpl: <a-z>
-                      RegExpCharImpl: <a>
-                        PsiElement(CHARACTER)('a')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <z>
-                        PsiElement(CHARACTER)('z')
-                    RegExpCharRangeImpl: <A-Z>
-                      RegExpCharImpl: <A>
-                        PsiElement(CHARACTER)('A')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <Z>
-                        PsiElement(CHARACTER)('Z')
-                    RegExpCharRangeImpl: <0-9>
-                      RegExpCharImpl: <0>
-                        PsiElement(CHARACTER)('0')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <9>
-                        PsiElement(CHARACTER)('9')
-                    RegExpCharImpl: <\->
-                      PsiElement(ESC_CHARACTER)('\-')
+                  RegExpCharRangeImpl: <a-z>
+                    RegExpCharImpl: <a>
+                      PsiElement(CHARACTER)('a')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <z>
+                      PsiElement(CHARACTER)('z')
+                  RegExpCharRangeImpl: <A-Z>
+                    RegExpCharImpl: <A>
+                      PsiElement(CHARACTER)('A')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <Z>
+                      PsiElement(CHARACTER)('Z')
+                  RegExpCharRangeImpl: <0-9>
+                    RegExpCharImpl: <0>
+                      PsiElement(CHARACTER)('0')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <9>
+                      PsiElement(CHARACTER)('9')
+                  RegExpCharImpl: <\->
+                    PsiElement(ESC_CHARACTER)('\-')
                   PsiElement(CLASS_END)(']')
                 RegExpQuantifierImpl: <+>
                   PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/Complex5.txt b/RegExpSupport/testData/psi/Complex5.txt
index 9ce8d3bd3977..58755267f543 100644
--- a/RegExpSupport/testData/psi/Complex5.txt
+++ b/RegExpSupport/testData/psi/Complex5.txt
@@ -12,20 +12,18 @@ REGEXP_FILE
                   RegExpBranchImpl: <[hH][tT]{2}[pP]>
                     RegExpClassImpl: <[hH]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <hH>
-                        RegExpCharImpl: <h>
-                          PsiElement(CHARACTER)('h')
-                        RegExpCharImpl: <H>
-                          PsiElement(CHARACTER)('H')
+                      RegExpCharImpl: <h>
+                        PsiElement(CHARACTER)('h')
+                      RegExpCharImpl: <H>
+                        PsiElement(CHARACTER)('H')
                       PsiElement(CLASS_END)(']')
                     RegExpClosureImpl: <[tT]{2}>
                       RegExpClassImpl: <[tT]>
                         PsiElement(CLASS_BEGIN)('[')
-                        RegExpUnionImpl: <tT>
-                          RegExpCharImpl: <t>
-                            PsiElement(CHARACTER)('t')
-                          RegExpCharImpl: <T>
-                            PsiElement(CHARACTER)('T')
+                        RegExpCharImpl: <t>
+                          PsiElement(CHARACTER)('t')
+                        RegExpCharImpl: <T>
+                          PsiElement(CHARACTER)('T')
                         PsiElement(CLASS_END)(']')
                       RegExpQuantifierImpl: <{2}>
                         PsiElement(LBRACE)('{')
@@ -34,37 +32,33 @@ REGEXP_FILE
                         PsiElement(RBRACE)('}')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                   PsiElement(UNION)('|')
                   RegExpBranchImpl: <[fF][tT][pP]>
                     RegExpClassImpl: <[fF]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <fF>
-                        RegExpCharImpl: <f>
-                          PsiElement(CHARACTER)('f')
-                        RegExpCharImpl: <F>
-                          PsiElement(CHARACTER)('F')
+                      RegExpCharImpl: <f>
+                        PsiElement(CHARACTER)('f')
+                      RegExpCharImpl: <F>
+                        PsiElement(CHARACTER)('F')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[tT]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <tT>
-                        RegExpCharImpl: <t>
-                          PsiElement(CHARACTER)('t')
-                        RegExpCharImpl: <T>
-                          PsiElement(CHARACTER)('T')
+                      RegExpCharImpl: <t>
+                        PsiElement(CHARACTER)('t')
+                      RegExpCharImpl: <T>
+                        PsiElement(CHARACTER)('T')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                 PsiElement(GROUP_END)(')')
               RegExpCharImpl: <:>
@@ -79,27 +73,26 @@ REGEXP_FILE
       RegExpClosureImpl: <[a-zA-Z0-9\-]+>
         RegExpClassImpl: <[a-zA-Z0-9\-]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <a-zA-Z0-9\->
-            RegExpCharRangeImpl: <a-z>
-              RegExpCharImpl: <a>
-                PsiElement(CHARACTER)('a')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <z>
-                PsiElement(CHARACTER)('z')
-            RegExpCharRangeImpl: <A-Z>
-              RegExpCharImpl: <A>
-                PsiElement(CHARACTER)('A')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <Z>
-                PsiElement(CHARACTER)('Z')
-            RegExpCharRangeImpl: <0-9>
-              RegExpCharImpl: <0>
-                PsiElement(CHARACTER)('0')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <9>
-                PsiElement(CHARACTER)('9')
-            RegExpCharImpl: <\->
-              PsiElement(ESC_CHARACTER)('\-')
+          RegExpCharRangeImpl: <a-z>
+            RegExpCharImpl: <a>
+              PsiElement(CHARACTER)('a')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <z>
+              PsiElement(CHARACTER)('z')
+          RegExpCharRangeImpl: <A-Z>
+            RegExpCharImpl: <A>
+              PsiElement(CHARACTER)('A')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <Z>
+              PsiElement(CHARACTER)('Z')
+          RegExpCharRangeImpl: <0-9>
+            RegExpCharImpl: <0>
+              PsiElement(CHARACTER)('0')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <9>
+              PsiElement(CHARACTER)('9')
+          RegExpCharImpl: <\->
+            PsiElement(ESC_CHARACTER)('\-')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <+>
           PsiElement(PLUS)('+')
@@ -113,27 +106,26 @@ REGEXP_FILE
               RegExpClosureImpl: <[a-zA-Z0-9\-]+>
                 RegExpClassImpl: <[a-zA-Z0-9\-]>
                   PsiElement(CLASS_BEGIN)('[')
-                  RegExpUnionImpl: <a-zA-Z0-9\->
-                    RegExpCharRangeImpl: <a-z>
-                      RegExpCharImpl: <a>
-                        PsiElement(CHARACTER)('a')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <z>
-                        PsiElement(CHARACTER)('z')
-                    RegExpCharRangeImpl: <A-Z>
-                      RegExpCharImpl: <A>
-                        PsiElement(CHARACTER)('A')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <Z>
-                        PsiElement(CHARACTER)('Z')
-                    RegExpCharRangeImpl: <0-9>
-                      RegExpCharImpl: <0>
-                        PsiElement(CHARACTER)('0')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <9>
-                        PsiElement(CHARACTER)('9')
-                    RegExpCharImpl: <\->
-                      PsiElement(ESC_CHARACTER)('\-')
+                  RegExpCharRangeImpl: <a-z>
+                    RegExpCharImpl: <a>
+                      PsiElement(CHARACTER)('a')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <z>
+                      PsiElement(CHARACTER)('z')
+                  RegExpCharRangeImpl: <A-Z>
+                    RegExpCharImpl: <A>
+                      PsiElement(CHARACTER)('A')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <Z>
+                      PsiElement(CHARACTER)('Z')
+                  RegExpCharRangeImpl: <0-9>
+                    RegExpCharImpl: <0>
+                      PsiElement(CHARACTER)('0')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <9>
+                      PsiElement(CHARACTER)('9')
+                  RegExpCharImpl: <\->
+                    PsiElement(ESC_CHARACTER)('\-')
                   PsiElement(CLASS_END)(']')
                 RegExpQuantifierImpl: <+>
                   PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/Complex6.txt b/RegExpSupport/testData/psi/Complex6.txt
index 1fdbfa9b3329..f39534faf7be 100644
--- a/RegExpSupport/testData/psi/Complex6.txt
+++ b/RegExpSupport/testData/psi/Complex6.txt
@@ -14,20 +14,18 @@ REGEXP_FILE
                   RegExpBranchImpl: <[hH][tT]{2}[pP]>
                     RegExpClassImpl: <[hH]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <hH>
-                        RegExpCharImpl: <h>
-                          PsiElement(CHARACTER)('h')
-                        RegExpCharImpl: <H>
-                          PsiElement(CHARACTER)('H')
+                      RegExpCharImpl: <h>
+                        PsiElement(CHARACTER)('h')
+                      RegExpCharImpl: <H>
+                        PsiElement(CHARACTER)('H')
                       PsiElement(CLASS_END)(']')
                     RegExpClosureImpl: <[tT]{2}>
                       RegExpClassImpl: <[tT]>
                         PsiElement(CLASS_BEGIN)('[')
-                        RegExpUnionImpl: <tT>
-                          RegExpCharImpl: <t>
-                            PsiElement(CHARACTER)('t')
-                          RegExpCharImpl: <T>
-                            PsiElement(CHARACTER)('T')
+                        RegExpCharImpl: <t>
+                          PsiElement(CHARACTER)('t')
+                        RegExpCharImpl: <T>
+                          PsiElement(CHARACTER)('T')
                         PsiElement(CLASS_END)(']')
                       RegExpQuantifierImpl: <{2}>
                         PsiElement(LBRACE)('{')
@@ -36,37 +34,33 @@ REGEXP_FILE
                         PsiElement(RBRACE)('}')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                   PsiElement(UNION)('|')
                   RegExpBranchImpl: <[fF][tT][pP]>
                     RegExpClassImpl: <[fF]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <fF>
-                        RegExpCharImpl: <f>
-                          PsiElement(CHARACTER)('f')
-                        RegExpCharImpl: <F>
-                          PsiElement(CHARACTER)('F')
+                      RegExpCharImpl: <f>
+                        PsiElement(CHARACTER)('f')
+                      RegExpCharImpl: <F>
+                        PsiElement(CHARACTER)('F')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[tT]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <tT>
-                        RegExpCharImpl: <t>
-                          PsiElement(CHARACTER)('t')
-                        RegExpCharImpl: <T>
-                          PsiElement(CHARACTER)('T')
+                      RegExpCharImpl: <t>
+                        PsiElement(CHARACTER)('t')
+                      RegExpCharImpl: <T>
+                        PsiElement(CHARACTER)('T')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                 PsiElement(GROUP_END)(')')
               RegExpCharImpl: <:>
@@ -81,27 +75,26 @@ REGEXP_FILE
       RegExpClosureImpl: <[a-zA-Z0-9\-]+>
         RegExpClassImpl: <[a-zA-Z0-9\-]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <a-zA-Z0-9\->
-            RegExpCharRangeImpl: <a-z>
-              RegExpCharImpl: <a>
-                PsiElement(CHARACTER)('a')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <z>
-                PsiElement(CHARACTER)('z')
-            RegExpCharRangeImpl: <A-Z>
-              RegExpCharImpl: <A>
-                PsiElement(CHARACTER)('A')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <Z>
-                PsiElement(CHARACTER)('Z')
-            RegExpCharRangeImpl: <0-9>
-              RegExpCharImpl: <0>
-                PsiElement(CHARACTER)('0')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <9>
-                PsiElement(CHARACTER)('9')
-            RegExpCharImpl: <\->
-              PsiElement(ESC_CHARACTER)('\-')
+          RegExpCharRangeImpl: <a-z>
+            RegExpCharImpl: <a>
+              PsiElement(CHARACTER)('a')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <z>
+              PsiElement(CHARACTER)('z')
+          RegExpCharRangeImpl: <A-Z>
+            RegExpCharImpl: <A>
+              PsiElement(CHARACTER)('A')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <Z>
+              PsiElement(CHARACTER)('Z')
+          RegExpCharRangeImpl: <0-9>
+            RegExpCharImpl: <0>
+              PsiElement(CHARACTER)('0')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <9>
+              PsiElement(CHARACTER)('9')
+          RegExpCharImpl: <\->
+            PsiElement(ESC_CHARACTER)('\-')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <+>
           PsiElement(PLUS)('+')
@@ -115,27 +108,26 @@ REGEXP_FILE
               RegExpClosureImpl: <[a-zA-Z0-9\-]+>
                 RegExpClassImpl: <[a-zA-Z0-9\-]>
                   PsiElement(CLASS_BEGIN)('[')
-                  RegExpUnionImpl: <a-zA-Z0-9\->
-                    RegExpCharRangeImpl: <a-z>
-                      RegExpCharImpl: <a>
-                        PsiElement(CHARACTER)('a')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <z>
-                        PsiElement(CHARACTER)('z')
-                    RegExpCharRangeImpl: <A-Z>
-                      RegExpCharImpl: <A>
-                        PsiElement(CHARACTER)('A')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <Z>
-                        PsiElement(CHARACTER)('Z')
-                    RegExpCharRangeImpl: <0-9>
-                      RegExpCharImpl: <0>
-                        PsiElement(CHARACTER)('0')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <9>
-                        PsiElement(CHARACTER)('9')
-                    RegExpCharImpl: <\->
-                      PsiElement(ESC_CHARACTER)('\-')
+                  RegExpCharRangeImpl: <a-z>
+                    RegExpCharImpl: <a>
+                      PsiElement(CHARACTER)('a')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <z>
+                      PsiElement(CHARACTER)('z')
+                  RegExpCharRangeImpl: <A-Z>
+                    RegExpCharImpl: <A>
+                      PsiElement(CHARACTER)('A')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <Z>
+                      PsiElement(CHARACTER)('Z')
+                  RegExpCharRangeImpl: <0-9>
+                    RegExpCharImpl: <0>
+                      PsiElement(CHARACTER)('0')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <9>
+                      PsiElement(CHARACTER)('9')
+                  RegExpCharImpl: <\->
+                    PsiElement(ESC_CHARACTER)('\-')
                   PsiElement(CLASS_END)(']')
                 RegExpQuantifierImpl: <+>
                   PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/Complex7.txt b/RegExpSupport/testData/psi/Complex7.txt
index cdc88c62b651..dbd932c0d3e2 100644
--- a/RegExpSupport/testData/psi/Complex7.txt
+++ b/RegExpSupport/testData/psi/Complex7.txt
@@ -14,20 +14,18 @@ REGEXP_FILE
                   RegExpBranchImpl: <[hH][tT]{2}[pP]>
                     RegExpClassImpl: <[hH]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <hH>
-                        RegExpCharImpl: <h>
-                          PsiElement(CHARACTER)('h')
-                        RegExpCharImpl: <H>
-                          PsiElement(CHARACTER)('H')
+                      RegExpCharImpl: <h>
+                        PsiElement(CHARACTER)('h')
+                      RegExpCharImpl: <H>
+                        PsiElement(CHARACTER)('H')
                       PsiElement(CLASS_END)(']')
                     RegExpClosureImpl: <[tT]{2}>
                       RegExpClassImpl: <[tT]>
                         PsiElement(CLASS_BEGIN)('[')
-                        RegExpUnionImpl: <tT>
-                          RegExpCharImpl: <t>
-                            PsiElement(CHARACTER)('t')
-                          RegExpCharImpl: <T>
-                            PsiElement(CHARACTER)('T')
+                        RegExpCharImpl: <t>
+                          PsiElement(CHARACTER)('t')
+                        RegExpCharImpl: <T>
+                          PsiElement(CHARACTER)('T')
                         PsiElement(CLASS_END)(']')
                       RegExpQuantifierImpl: <{2}>
                         PsiElement(LBRACE)('{')
@@ -36,37 +34,33 @@ REGEXP_FILE
                         PsiElement(RBRACE)('}')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                   PsiElement(UNION)('|')
                   RegExpBranchImpl: <[fF][tT][pP]>
                     RegExpClassImpl: <[fF]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <fF>
-                        RegExpCharImpl: <f>
-                          PsiElement(CHARACTER)('f')
-                        RegExpCharImpl: <F>
-                          PsiElement(CHARACTER)('F')
+                      RegExpCharImpl: <f>
+                        PsiElement(CHARACTER)('f')
+                      RegExpCharImpl: <F>
+                        PsiElement(CHARACTER)('F')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[tT]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <tT>
-                        RegExpCharImpl: <t>
-                          PsiElement(CHARACTER)('t')
-                        RegExpCharImpl: <T>
-                          PsiElement(CHARACTER)('T')
+                      RegExpCharImpl: <t>
+                        PsiElement(CHARACTER)('t')
+                      RegExpCharImpl: <T>
+                        PsiElement(CHARACTER)('T')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                 PsiElement(GROUP_END)(')')
               RegExpCharImpl: <:>
@@ -81,27 +75,26 @@ REGEXP_FILE
       RegExpClosureImpl: <[a-zA-Z0-9\-]+>
         RegExpClassImpl: <[a-zA-Z0-9\-]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <a-zA-Z0-9\->
-            RegExpCharRangeImpl: <a-z>
-              RegExpCharImpl: <a>
-                PsiElement(CHARACTER)('a')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <z>
-                PsiElement(CHARACTER)('z')
-            RegExpCharRangeImpl: <A-Z>
-              RegExpCharImpl: <A>
-                PsiElement(CHARACTER)('A')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <Z>
-                PsiElement(CHARACTER)('Z')
-            RegExpCharRangeImpl: <0-9>
-              RegExpCharImpl: <0>
-                PsiElement(CHARACTER)('0')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <9>
-                PsiElement(CHARACTER)('9')
-            RegExpCharImpl: <\->
-              PsiElement(ESC_CHARACTER)('\-')
+          RegExpCharRangeImpl: <a-z>
+            RegExpCharImpl: <a>
+              PsiElement(CHARACTER)('a')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <z>
+              PsiElement(CHARACTER)('z')
+          RegExpCharRangeImpl: <A-Z>
+            RegExpCharImpl: <A>
+              PsiElement(CHARACTER)('A')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <Z>
+              PsiElement(CHARACTER)('Z')
+          RegExpCharRangeImpl: <0-9>
+            RegExpCharImpl: <0>
+              PsiElement(CHARACTER)('0')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <9>
+              PsiElement(CHARACTER)('9')
+          RegExpCharImpl: <\->
+            PsiElement(ESC_CHARACTER)('\-')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <+>
           PsiElement(PLUS)('+')
@@ -115,27 +108,26 @@ REGEXP_FILE
               RegExpClosureImpl: <[a-zA-Z0-9\-]+>
                 RegExpClassImpl: <[a-zA-Z0-9\-]>
                   PsiElement(CLASS_BEGIN)('[')
-                  RegExpUnionImpl: <a-zA-Z0-9\->
-                    RegExpCharRangeImpl: <a-z>
-                      RegExpCharImpl: <a>
-                        PsiElement(CHARACTER)('a')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <z>
-                        PsiElement(CHARACTER)('z')
-                    RegExpCharRangeImpl: <A-Z>
-                      RegExpCharImpl: <A>
-                        PsiElement(CHARACTER)('A')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <Z>
-                        PsiElement(CHARACTER)('Z')
-                    RegExpCharRangeImpl: <0-9>
-                      RegExpCharImpl: <0>
-                        PsiElement(CHARACTER)('0')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <9>
-                        PsiElement(CHARACTER)('9')
-                    RegExpCharImpl: <\->
-                      PsiElement(ESC_CHARACTER)('\-')
+                  RegExpCharRangeImpl: <a-z>
+                    RegExpCharImpl: <a>
+                      PsiElement(CHARACTER)('a')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <z>
+                      PsiElement(CHARACTER)('z')
+                  RegExpCharRangeImpl: <A-Z>
+                    RegExpCharImpl: <A>
+                      PsiElement(CHARACTER)('A')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <Z>
+                      PsiElement(CHARACTER)('Z')
+                  RegExpCharRangeImpl: <0-9>
+                    RegExpCharImpl: <0>
+                      PsiElement(CHARACTER)('0')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <9>
+                      PsiElement(CHARACTER)('9')
+                  RegExpCharImpl: <\->
+                    PsiElement(ESC_CHARACTER)('\-')
                   PsiElement(CLASS_END)(']')
                 RegExpQuantifierImpl: <+>
                   PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/Escapes16.txt b/RegExpSupport/testData/psi/Escapes16.txt
index 439525f4563a..a9b7d00fb6b6 100644
--- a/RegExpSupport/testData/psi/Escapes16.txt
+++ b/RegExpSupport/testData/psi/Escapes16.txt
@@ -3,15 +3,14 @@ REGEXP_FILE
     RegExpBranchImpl: <[\udbff\udfff-\ud800\udc00]>
       RegExpClassImpl: <[\udbff\udfff-\ud800\udc00]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <\udbff\udfff-\ud800\udc00>
-          RegExpCharImpl: <\udbff>
-            PsiElement(UNICODE_CHAR)('\udbff')
-          RegExpCharRangeImpl: <\udfff-\ud800>
-            RegExpCharImpl: <\udfff>
-              PsiElement(UNICODE_CHAR)('\udfff')
-            PsiElement(MINUS)('-')
-            RegExpCharImpl: <\ud800>
-              PsiElement(UNICODE_CHAR)('\ud800')
-          RegExpCharImpl: <\udc00>
-            PsiElement(UNICODE_CHAR)('\udc00')
+        RegExpCharImpl: <\udbff>
+          PsiElement(UNICODE_CHAR)('\udbff')
+        RegExpCharRangeImpl: <\udfff-\ud800>
+          RegExpCharImpl: <\udfff>
+            PsiElement(UNICODE_CHAR)('\udfff')
+          PsiElement(MINUS)('-')
+          RegExpCharImpl: <\ud800>
+            PsiElement(UNICODE_CHAR)('\ud800')
+        RegExpCharImpl: <\udc00>
+          PsiElement(UNICODE_CHAR)('\udc00')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Escapes17.txt b/RegExpSupport/testData/psi/Escapes17.txt
index 919152847aea..b3a14f509b7d 100644
--- a/RegExpSupport/testData/psi/Escapes17.txt
+++ b/RegExpSupport/testData/psi/Escapes17.txt
@@ -3,15 +3,14 @@ REGEXP_FILE
     RegExpBranchImpl: <[\ud800\udc00-\udbff\udfff]>
       RegExpClassImpl: <[\ud800\udc00-\udbff\udfff]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <\ud800\udc00-\udbff\udfff>
-          RegExpCharImpl: <\ud800>
-            PsiElement(UNICODE_CHAR)('\ud800')
-          RegExpCharRangeImpl: <\udc00-\udbff>
-            RegExpCharImpl: <\udc00>
-              PsiElement(UNICODE_CHAR)('\udc00')
-            PsiElement(MINUS)('-')
-            RegExpCharImpl: <\udbff>
-              PsiElement(UNICODE_CHAR)('\udbff')
-          RegExpCharImpl: <\udfff>
-            PsiElement(UNICODE_CHAR)('\udfff')
+        RegExpCharImpl: <\ud800>
+          PsiElement(UNICODE_CHAR)('\ud800')
+        RegExpCharRangeImpl: <\udc00-\udbff>
+          RegExpCharImpl: <\udc00>
+            PsiElement(UNICODE_CHAR)('\udc00')
+          PsiElement(MINUS)('-')
+          RegExpCharImpl: <\udbff>
+            PsiElement(UNICODE_CHAR)('\udbff')
+        RegExpCharImpl: <\udfff>
+          PsiElement(UNICODE_CHAR)('\udfff')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Escapes22.txt b/RegExpSupport/testData/psi/Escapes22.txt
index 8509647de42c..1bc7bb527c16 100644
--- a/RegExpSupport/testData/psi/Escapes22.txt
+++ b/RegExpSupport/testData/psi/Escapes22.txt
@@ -4,32 +4,31 @@ REGEXP_FILE
       RegExpClassImpl: <[\Qabc?*+.))]][]\E]>
         PsiElement(CLASS_BEGIN)('[')
         PsiWhiteSpace('\Q')
-        RegExpUnionImpl: <abc?*+.))]][]>
-          RegExpCharImpl: <a>
-            PsiElement(CHARACTER)('a')
-          RegExpCharImpl: <b>
-            PsiElement(CHARACTER)('b')
-          RegExpCharImpl: <c>
-            PsiElement(CHARACTER)('c')
-          RegExpCharImpl: <?>
-            PsiElement(CHARACTER)('?')
-          RegExpCharImpl: <*>
-            PsiElement(CHARACTER)('*')
-          RegExpCharImpl: <+>
-            PsiElement(CHARACTER)('+')
-          RegExpCharImpl: <.>
-            PsiElement(CHARACTER)('.')
-          RegExpCharImpl: <)>
-            PsiElement(CHARACTER)(')')
-          RegExpCharImpl: <)>
-            PsiElement(CHARACTER)(')')
-          RegExpCharImpl: <]>
-            PsiElement(CHARACTER)(']')
-          RegExpCharImpl: <]>
-            PsiElement(CHARACTER)(']')
-          RegExpCharImpl: <[>
-            PsiElement(CHARACTER)('[')
-          RegExpCharImpl: <]>
-            PsiElement(CHARACTER)(']')
+        RegExpCharImpl: <a>
+          PsiElement(CHARACTER)('a')
+        RegExpCharImpl: <b>
+          PsiElement(CHARACTER)('b')
+        RegExpCharImpl: <c>
+          PsiElement(CHARACTER)('c')
+        RegExpCharImpl: <?>
+          PsiElement(CHARACTER)('?')
+        RegExpCharImpl: <*>
+          PsiElement(CHARACTER)('*')
+        RegExpCharImpl: <+>
+          PsiElement(CHARACTER)('+')
+        RegExpCharImpl: <.>
+          PsiElement(CHARACTER)('.')
+        RegExpCharImpl: <)>
+          PsiElement(CHARACTER)(')')
+        RegExpCharImpl: <)>
+          PsiElement(CHARACTER)(')')
+        RegExpCharImpl: <]>
+          PsiElement(CHARACTER)(']')
+        RegExpCharImpl: <]>
+          PsiElement(CHARACTER)(']')
+        RegExpCharImpl: <[>
+          PsiElement(CHARACTER)('[')
+        RegExpCharImpl: <]>
+          PsiElement(CHARACTER)(']')
         PsiWhiteSpace('\E')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Escapes28.txt b/RegExpSupport/testData/psi/Escapes28.txt
index 07e27e856812..b0ccbede5798 100644
--- a/RegExpSupport/testData/psi/Escapes28.txt
+++ b/RegExpSupport/testData/psi/Escapes28.txt
@@ -3,9 +3,8 @@ REGEXP_FILE
     RegExpBranchImpl: <[a\]]>
       RegExpClassImpl: <[a\]]>
         PsiElement(CLASS_BEGIN)('[')
-        RegExpUnionImpl: <a\]>
-          RegExpCharImpl: <a>
-            PsiElement(CHARACTER)('a')
-          RegExpCharImpl: <\]>
-            PsiElement(ESC_CHARACTER)('\]')
+        RegExpCharImpl: <a>
+          PsiElement(CHARACTER)('a')
+        RegExpCharImpl: <\]>
+          PsiElement(ESC_CHARACTER)('\]')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Escapes29.txt b/RegExpSupport/testData/psi/Escapes29.txt
index c0f0c53fa75a..e1a624027976 100644
--- a/RegExpSupport/testData/psi/Escapes29.txt
+++ b/RegExpSupport/testData/psi/Escapes29.txt
@@ -4,9 +4,8 @@ REGEXP_FILE
       RegExpClassImpl: <[^a\]]>
         PsiElement(CLASS_BEGIN)('[')
         PsiElement(CARET)('^')
-        RegExpUnionImpl: <a\]>
-          RegExpCharImpl: <a>
-            PsiElement(CHARACTER)('a')
-          RegExpCharImpl: <\]>
-            PsiElement(ESC_CHARACTER)('\]')
+        RegExpCharImpl: <a>
+          PsiElement(CHARACTER)('a')
+        RegExpCharImpl: <\]>
+          PsiElement(ESC_CHARACTER)('\]')
         PsiElement(CLASS_END)(']')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Groups15.txt b/RegExpSupport/testData/psi/Groups15.txt
index 6ed5bb32c226..72826c4e5ea5 100644
--- a/RegExpSupport/testData/psi/Groups15.txt
+++ b/RegExpSupport/testData/psi/Groups15.txt
@@ -8,13 +8,12 @@ REGEXP_FILE
             RegExpBranchImpl: <[abc]>
               RegExpClassImpl: <[abc]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <abc>
-                  RegExpCharImpl: <a>
-                    PsiElement(CHARACTER)('a')
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
-                  RegExpCharImpl: <c>
-                    PsiElement(CHARACTER)('c')
+                RegExpCharImpl: <a>
+                  PsiElement(CHARACTER)('a')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <c>
+                  PsiElement(CHARACTER)('c')
                 PsiElement(CLASS_END)(']')
           PsiElement(GROUP_END)(')')
         RegExpQuantifierImpl: <*>
diff --git a/RegExpSupport/testData/psi/Groups17.txt b/RegExpSupport/testData/psi/Groups17.txt
index 3f4bcc9d3a2f..43aafbb57c6c 100644
--- a/RegExpSupport/testData/psi/Groups17.txt
+++ b/RegExpSupport/testData/psi/Groups17.txt
@@ -8,13 +8,12 @@ REGEXP_FILE
             RegExpBranchImpl: <[abc]>
               RegExpClassImpl: <[abc]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <abc>
-                  RegExpCharImpl: <a>
-                    PsiElement(CHARACTER)('a')
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
-                  RegExpCharImpl: <c>
-                    PsiElement(CHARACTER)('c')
+                RegExpCharImpl: <a>
+                  PsiElement(CHARACTER)('a')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <c>
+                  PsiElement(CHARACTER)('c')
                 PsiElement(CLASS_END)(']')
           PsiElement(GROUP_END)(')')
         RegExpQuantifierImpl: <*>
diff --git a/RegExpSupport/testData/psi/Groups19.txt b/RegExpSupport/testData/psi/Groups19.txt
index 3b2571eaf6a9..3816a209fc2e 100644
--- a/RegExpSupport/testData/psi/Groups19.txt
+++ b/RegExpSupport/testData/psi/Groups19.txt
@@ -10,11 +10,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[bc]*>
               RegExpClassImpl: <[bc]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <bc>
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
-                  RegExpCharImpl: <c>
-                    PsiElement(CHARACTER)('c')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <c>
+                  PsiElement(CHARACTER)('c')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <*>
                 PsiElement(STAR)('*')
diff --git a/RegExpSupport/testData/psi/Groups24.txt b/RegExpSupport/testData/psi/Groups24.txt
index 1083314fb3c5..2a1eff84ae6a 100644
--- a/RegExpSupport/testData/psi/Groups24.txt
+++ b/RegExpSupport/testData/psi/Groups24.txt
@@ -10,11 +10,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[bc]*>
               RegExpClassImpl: <[bc]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <bc>
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
-                  RegExpCharImpl: <c>
-                    PsiElement(CHARACTER)('c')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <c>
+                  PsiElement(CHARACTER)('c')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <*>
                 PsiElement(STAR)('*')
diff --git a/RegExpSupport/testData/psi/Groups25.txt b/RegExpSupport/testData/psi/Groups25.txt
index c64e78017ea0..d022b263b432 100644
--- a/RegExpSupport/testData/psi/Groups25.txt
+++ b/RegExpSupport/testData/psi/Groups25.txt
@@ -10,11 +10,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[bc]+>
               RegExpClassImpl: <[bc]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <bc>
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
-                  RegExpCharImpl: <c>
-                    PsiElement(CHARACTER)('c')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <c>
+                  PsiElement(CHARACTER)('c')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <+>
                 PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/Groups26.txt b/RegExpSupport/testData/psi/Groups26.txt
index edaece4d0fde..9e721031e11e 100644
--- a/RegExpSupport/testData/psi/Groups26.txt
+++ b/RegExpSupport/testData/psi/Groups26.txt
@@ -10,11 +10,10 @@ REGEXP_FILE
             RegExpClosureImpl: <[bc]*>
               RegExpClassImpl: <[bc]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <bc>
-                  RegExpCharImpl: <b>
-                    PsiElement(CHARACTER)('b')
-                  RegExpCharImpl: <c>
-                    PsiElement(CHARACTER)('c')
+                RegExpCharImpl: <b>
+                  PsiElement(CHARACTER)('b')
+                RegExpCharImpl: <c>
+                  PsiElement(CHARACTER)('c')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <*>
                 PsiElement(STAR)('*')
diff --git a/RegExpSupport/testData/psi/Namedchars11.txt b/RegExpSupport/testData/psi/Namedchars11.txt
index 3e61776f9c17..ecb39da943a1 100644
--- a/RegExpSupport/testData/psi/Namedchars11.txt
+++ b/RegExpSupport/testData/psi/Namedchars11.txt
@@ -4,25 +4,24 @@ REGEXP_FILE
       RegExpClosureImpl: <[:^xdigit:]+>
         RegExpClassImpl: <[:^xdigit:]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <:^xdigit:>
-            RegExpCharImpl: <:>
-              PsiElement(CHARACTER)(':')
-            RegExpCharImpl: <^>
-              PsiElement(CHARACTER)('^')
-            RegExpCharImpl: <x>
-              PsiElement(CHARACTER)('x')
-            RegExpCharImpl: <d>
-              PsiElement(CHARACTER)('d')
-            RegExpCharImpl: <i>
-              PsiElement(CHARACTER)('i')
-            RegExpCharImpl: <g>
-              PsiElement(CHARACTER)('g')
-            RegExpCharImpl: <i>
-              PsiElement(CHARACTER)('i')
-            RegExpCharImpl: <t>
-              PsiElement(CHARACTER)('t')
-            RegExpCharImpl: <:>
-              PsiElement(CHARACTER)(':')
+          RegExpCharImpl: <:>
+            PsiElement(CHARACTER)(':')
+          RegExpCharImpl: <^>
+            PsiElement(CHARACTER)('^')
+          RegExpCharImpl: <x>
+            PsiElement(CHARACTER)('x')
+          RegExpCharImpl: <d>
+            PsiElement(CHARACTER)('d')
+          RegExpCharImpl: <i>
+            PsiElement(CHARACTER)('i')
+          RegExpCharImpl: <g>
+            PsiElement(CHARACTER)('g')
+          RegExpCharImpl: <i>
+            PsiElement(CHARACTER)('i')
+          RegExpCharImpl: <t>
+            PsiElement(CHARACTER)('t')
+          RegExpCharImpl: <:>
+            PsiElement(CHARACTER)(':')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <+>
           PsiElement(PLUS)('+')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Namedchars9.txt b/RegExpSupport/testData/psi/Namedchars9.txt
index adb95c1f51d6..f905c18956b2 100644
--- a/RegExpSupport/testData/psi/Namedchars9.txt
+++ b/RegExpSupport/testData/psi/Namedchars9.txt
@@ -4,23 +4,22 @@ REGEXP_FILE
       RegExpClosureImpl: <[:xdigit:]+>
         RegExpClassImpl: <[:xdigit:]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <:xdigit:>
-            RegExpCharImpl: <:>
-              PsiElement(CHARACTER)(':')
-            RegExpCharImpl: <x>
-              PsiElement(CHARACTER)('x')
-            RegExpCharImpl: <d>
-              PsiElement(CHARACTER)('d')
-            RegExpCharImpl: <i>
-              PsiElement(CHARACTER)('i')
-            RegExpCharImpl: <g>
-              PsiElement(CHARACTER)('g')
-            RegExpCharImpl: <i>
-              PsiElement(CHARACTER)('i')
-            RegExpCharImpl: <t>
-              PsiElement(CHARACTER)('t')
-            RegExpCharImpl: <:>
-              PsiElement(CHARACTER)(':')
+          RegExpCharImpl: <:>
+            PsiElement(CHARACTER)(':')
+          RegExpCharImpl: <x>
+            PsiElement(CHARACTER)('x')
+          RegExpCharImpl: <d>
+            PsiElement(CHARACTER)('d')
+          RegExpCharImpl: <i>
+            PsiElement(CHARACTER)('i')
+          RegExpCharImpl: <g>
+            PsiElement(CHARACTER)('g')
+          RegExpCharImpl: <i>
+            PsiElement(CHARACTER)('i')
+          RegExpCharImpl: <t>
+            PsiElement(CHARACTER)('t')
+          RegExpCharImpl: <:>
+            PsiElement(CHARACTER)(':')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <+>
           PsiElement(PLUS)('+')
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/Parse3.txt b/RegExpSupport/testData/psi/Parse3.txt
index 6ec0e3a596b5..d021eaa4bc23 100644
--- a/RegExpSupport/testData/psi/Parse3.txt
+++ b/RegExpSupport/testData/psi/Parse3.txt
@@ -12,20 +12,18 @@ REGEXP_FILE
                   RegExpBranchImpl: <[hH][tT]{2}[pP]>
                     RegExpClassImpl: <[hH]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <hH>
-                        RegExpCharImpl: <h>
-                          PsiElement(CHARACTER)('h')
-                        RegExpCharImpl: <H>
-                          PsiElement(CHARACTER)('H')
+                      RegExpCharImpl: <h>
+                        PsiElement(CHARACTER)('h')
+                      RegExpCharImpl: <H>
+                        PsiElement(CHARACTER)('H')
                       PsiElement(CLASS_END)(']')
                     RegExpClosureImpl: <[tT]{2}>
                       RegExpClassImpl: <[tT]>
                         PsiElement(CLASS_BEGIN)('[')
-                        RegExpUnionImpl: <tT>
-                          RegExpCharImpl: <t>
-                            PsiElement(CHARACTER)('t')
-                          RegExpCharImpl: <T>
-                            PsiElement(CHARACTER)('T')
+                        RegExpCharImpl: <t>
+                          PsiElement(CHARACTER)('t')
+                        RegExpCharImpl: <T>
+                          PsiElement(CHARACTER)('T')
                         PsiElement(CLASS_END)(']')
                       RegExpQuantifierImpl: <{2}>
                         PsiElement(LBRACE)('{')
@@ -34,37 +32,33 @@ REGEXP_FILE
                         PsiElement(RBRACE)('}')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                   PsiElement(UNION)('|')
                   RegExpBranchImpl: <[fF][tT][pP]>
                     RegExpClassImpl: <[fF]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <fF>
-                        RegExpCharImpl: <f>
-                          PsiElement(CHARACTER)('f')
-                        RegExpCharImpl: <F>
-                          PsiElement(CHARACTER)('F')
+                      RegExpCharImpl: <f>
+                        PsiElement(CHARACTER)('f')
+                      RegExpCharImpl: <F>
+                        PsiElement(CHARACTER)('F')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[tT]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <tT>
-                        RegExpCharImpl: <t>
-                          PsiElement(CHARACTER)('t')
-                        RegExpCharImpl: <T>
-                          PsiElement(CHARACTER)('T')
+                      RegExpCharImpl: <t>
+                        PsiElement(CHARACTER)('t')
+                      RegExpCharImpl: <T>
+                        PsiElement(CHARACTER)('T')
                       PsiElement(CLASS_END)(']')
                     RegExpClassImpl: <[pP]>
                       PsiElement(CLASS_BEGIN)('[')
-                      RegExpUnionImpl: <pP>
-                        RegExpCharImpl: <p>
-                          PsiElement(CHARACTER)('p')
-                        RegExpCharImpl: <P>
-                          PsiElement(CHARACTER)('P')
+                      RegExpCharImpl: <p>
+                        PsiElement(CHARACTER)('p')
+                      RegExpCharImpl: <P>
+                        PsiElement(CHARACTER)('P')
                       PsiElement(CLASS_END)(']')
                 PsiElement(GROUP_END)(')')
               RegExpCharImpl: <:>
@@ -79,27 +73,26 @@ REGEXP_FILE
       RegExpClosureImpl: <[a-zA-Z0-9\-]+>
         RegExpClassImpl: <[a-zA-Z0-9\-]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <a-zA-Z0-9\->
-            RegExpCharRangeImpl: <a-z>
-              RegExpCharImpl: <a>
-                PsiElement(CHARACTER)('a')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <z>
-                PsiElement(CHARACTER)('z')
-            RegExpCharRangeImpl: <A-Z>
-              RegExpCharImpl: <A>
-                PsiElement(CHARACTER)('A')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <Z>
-                PsiElement(CHARACTER)('Z')
-            RegExpCharRangeImpl: <0-9>
-              RegExpCharImpl: <0>
-                PsiElement(CHARACTER)('0')
-              PsiElement(MINUS)('-')
-              RegExpCharImpl: <9>
-                PsiElement(CHARACTER)('9')
-            RegExpCharImpl: <\->
-              PsiElement(ESC_CHARACTER)('\-')
+          RegExpCharRangeImpl: <a-z>
+            RegExpCharImpl: <a>
+              PsiElement(CHARACTER)('a')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <z>
+              PsiElement(CHARACTER)('z')
+          RegExpCharRangeImpl: <A-Z>
+            RegExpCharImpl: <A>
+              PsiElement(CHARACTER)('A')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <Z>
+              PsiElement(CHARACTER)('Z')
+          RegExpCharRangeImpl: <0-9>
+            RegExpCharImpl: <0>
+              PsiElement(CHARACTER)('0')
+            PsiElement(MINUS)('-')
+            RegExpCharImpl: <9>
+              PsiElement(CHARACTER)('9')
+          RegExpCharImpl: <\->
+            PsiElement(ESC_CHARACTER)('\-')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <+>
           PsiElement(PLUS)('+')
@@ -113,27 +106,26 @@ REGEXP_FILE
               RegExpClosureImpl: <[a-zA-Z0-9\-]+>
                 RegExpClassImpl: <[a-zA-Z0-9\-]>
                   PsiElement(CLASS_BEGIN)('[')
-                  RegExpUnionImpl: <a-zA-Z0-9\->
-                    RegExpCharRangeImpl: <a-z>
-                      RegExpCharImpl: <a>
-                        PsiElement(CHARACTER)('a')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <z>
-                        PsiElement(CHARACTER)('z')
-                    RegExpCharRangeImpl: <A-Z>
-                      RegExpCharImpl: <A>
-                        PsiElement(CHARACTER)('A')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <Z>
-                        PsiElement(CHARACTER)('Z')
-                    RegExpCharRangeImpl: <0-9>
-                      RegExpCharImpl: <0>
-                        PsiElement(CHARACTER)('0')
-                      PsiElement(MINUS)('-')
-                      RegExpCharImpl: <9>
-                        PsiElement(CHARACTER)('9')
-                    RegExpCharImpl: <\->
-                      PsiElement(ESC_CHARACTER)('\-')
+                  RegExpCharRangeImpl: <a-z>
+                    RegExpCharImpl: <a>
+                      PsiElement(CHARACTER)('a')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <z>
+                      PsiElement(CHARACTER)('z')
+                  RegExpCharRangeImpl: <A-Z>
+                    RegExpCharImpl: <A>
+                      PsiElement(CHARACTER)('A')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <Z>
+                      PsiElement(CHARACTER)('Z')
+                  RegExpCharRangeImpl: <0-9>
+                    RegExpCharImpl: <0>
+                      PsiElement(CHARACTER)('0')
+                    PsiElement(MINUS)('-')
+                    RegExpCharImpl: <9>
+                      PsiElement(CHARACTER)('9')
+                  RegExpCharImpl: <\->
+                    PsiElement(ESC_CHARACTER)('\-')
                   PsiElement(CLASS_END)(']')
                 RegExpQuantifierImpl: <+>
                   PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/RealLife10.txt b/RegExpSupport/testData/psi/RealLife10.txt
index 791dd5e75a83..4d89217c22e4 100644
--- a/RegExpSupport/testData/psi/RealLife10.txt
+++ b/RegExpSupport/testData/psi/RealLife10.txt
@@ -87,11 +87,10 @@ REGEXP_FILE
                                   RegExpClassImpl: <[^"\\]>
                                     PsiElement(CLASS_BEGIN)('[')
                                     PsiElement(CARET)('^')
-                                    RegExpUnionImpl: <"\\>
-                                      RegExpCharImpl: <">
-                                        PsiElement(CHARACTER)('"')
-                                      RegExpCharImpl: <\\>
-                                        PsiElement(ESC_CHARACTER)('\\')
+                                    RegExpCharImpl: <">
+                                      PsiElement(CHARACTER)('"')
+                                    RegExpCharImpl: <\\>
+                                      PsiElement(ESC_CHARACTER)('\\')
                                     PsiElement(CLASS_END)(']')
                                 PsiElement(UNION)('|')
                                 RegExpBranchImpl: <\\">
@@ -134,21 +133,20 @@ REGEXP_FILE
                           RegExpClosureImpl: <[0-9A-Z_]+>
                             RegExpClassImpl: <[0-9A-Z_]>
                               PsiElement(CLASS_BEGIN)('[')
-                              RegExpUnionImpl: <0-9A-Z_>
-                                RegExpCharRangeImpl: <0-9>
-                                  RegExpCharImpl: <0>
-                                    PsiElement(CHARACTER)('0')
-                                  PsiElement(MINUS)('-')
-                                  RegExpCharImpl: <9>
-                                    PsiElement(CHARACTER)('9')
-                                RegExpCharRangeImpl: <A-Z>
-                                  RegExpCharImpl: <A>
-                                    PsiElement(CHARACTER)('A')
-                                  PsiElement(MINUS)('-')
-                                  RegExpCharImpl: <Z>
-                                    PsiElement(CHARACTER)('Z')
-                                RegExpCharImpl: <_>
-                                  PsiElement(CHARACTER)('_')
+                              RegExpCharRangeImpl: <0-9>
+                                RegExpCharImpl: <0>
+                                  PsiElement(CHARACTER)('0')
+                                PsiElement(MINUS)('-')
+                                RegExpCharImpl: <9>
+                                  PsiElement(CHARACTER)('9')
+                              RegExpCharRangeImpl: <A-Z>
+                                RegExpCharImpl: <A>
+                                  PsiElement(CHARACTER)('A')
+                                PsiElement(MINUS)('-')
+                                RegExpCharImpl: <Z>
+                                  PsiElement(CHARACTER)('Z')
+                              RegExpCharImpl: <_>
+                                PsiElement(CHARACTER)('_')
                               PsiElement(CLASS_END)(']')
                             RegExpQuantifierImpl: <+>
                               PsiElement(PLUS)('+')
@@ -196,21 +194,20 @@ REGEXP_FILE
                           RegExpClosureImpl: <[0-9xa-f]+>
                             RegExpClassImpl: <[0-9xa-f]>
                               PsiElement(CLASS_BEGIN)('[')
-                              RegExpUnionImpl: <0-9xa-f>
-                                RegExpCharRangeImpl: <0-9>
-                                  RegExpCharImpl: <0>
-                                    PsiElement(CHARACTER)('0')
-                                  PsiElement(MINUS)('-')
-                                  RegExpCharImpl: <9>
-                                    PsiElement(CHARACTER)('9')
-                                RegExpCharImpl: <x>
-                                  PsiElement(CHARACTER)('x')
-                                RegExpCharRangeImpl: <a-f>
-                                  RegExpCharImpl: <a>
-                                    PsiElement(CHARACTER)('a')
-                                  PsiElement(MINUS)('-')
-                                  RegExpCharImpl: <f>
-                                    PsiElement(CHARACTER)('f')
+                              RegExpCharRangeImpl: <0-9>
+                                RegExpCharImpl: <0>
+                                  PsiElement(CHARACTER)('0')
+                                PsiElement(MINUS)('-')
+                                RegExpCharImpl: <9>
+                                  PsiElement(CHARACTER)('9')
+                              RegExpCharImpl: <x>
+                                PsiElement(CHARACTER)('x')
+                              RegExpCharRangeImpl: <a-f>
+                                RegExpCharImpl: <a>
+                                  PsiElement(CHARACTER)('a')
+                                PsiElement(MINUS)('-')
+                                RegExpCharImpl: <f>
+                                  PsiElement(CHARACTER)('f')
                               PsiElement(CLASS_END)(']')
                             RegExpQuantifierImpl: <+>
                               PsiElement(PLUS)('+')
@@ -258,21 +255,20 @@ REGEXP_FILE
                           RegExpClosureImpl: <[0-9xa-f]+>
                             RegExpClassImpl: <[0-9xa-f]>
                               PsiElement(CLASS_BEGIN)('[')
-                              RegExpUnionImpl: <0-9xa-f>
-                                RegExpCharRangeImpl: <0-9>
-                                  RegExpCharImpl: <0>
-                                    PsiElement(CHARACTER)('0')
-                                  PsiElement(MINUS)('-')
-                                  RegExpCharImpl: <9>
-                                    PsiElement(CHARACTER)('9')
-                                RegExpCharImpl: <x>
-                                  PsiElement(CHARACTER)('x')
-                                RegExpCharRangeImpl: <a-f>
-                                  RegExpCharImpl: <a>
-                                    PsiElement(CHARACTER)('a')
-                                  PsiElement(MINUS)('-')
-                                  RegExpCharImpl: <f>
-                                    PsiElement(CHARACTER)('f')
+                              RegExpCharRangeImpl: <0-9>
+                                RegExpCharImpl: <0>
+                                  PsiElement(CHARACTER)('0')
+                                PsiElement(MINUS)('-')
+                                RegExpCharImpl: <9>
+                                  PsiElement(CHARACTER)('9')
+                              RegExpCharImpl: <x>
+                                PsiElement(CHARACTER)('x')
+                              RegExpCharRangeImpl: <a-f>
+                                RegExpCharImpl: <a>
+                                  PsiElement(CHARACTER)('a')
+                                PsiElement(MINUS)('-')
+                                RegExpCharImpl: <f>
+                                  PsiElement(CHARACTER)('f')
                               PsiElement(CLASS_END)(']')
                             RegExpQuantifierImpl: <+>
                               PsiElement(PLUS)('+')
@@ -322,21 +318,20 @@ REGEXP_FILE
                           RegExpClosureImpl: <[0-9xa-f]+>
                             RegExpClassImpl: <[0-9xa-f]>
                               PsiElement(CLASS_BEGIN)('[')
-                              RegExpUnionImpl: <0-9xa-f>
-                                RegExpCharRangeImpl: <0-9>
-                                  RegExpCharImpl: <0>
-                                    PsiElement(CHARACTER)('0')
-                                  PsiElement(MINUS)('-')
-                                  RegExpCharImpl: <9>
-                                    PsiElement(CHARACTER)('9')
-                                RegExpCharImpl: <x>
-                                  PsiElement(CHARACTER)('x')
-                                RegExpCharRangeImpl: <a-f>
-                                  RegExpCharImpl: <a>
-                                    PsiElement(CHARACTER)('a')
-                                  PsiElement(MINUS)('-')
-                                  RegExpCharImpl: <f>
-                                    PsiElement(CHARACTER)('f')
+                              RegExpCharRangeImpl: <0-9>
+                                RegExpCharImpl: <0>
+                                  PsiElement(CHARACTER)('0')
+                                PsiElement(MINUS)('-')
+                                RegExpCharImpl: <9>
+                                  PsiElement(CHARACTER)('9')
+                              RegExpCharImpl: <x>
+                                PsiElement(CHARACTER)('x')
+                              RegExpCharRangeImpl: <a-f>
+                                RegExpCharImpl: <a>
+                                  PsiElement(CHARACTER)('a')
+                                PsiElement(MINUS)('-')
+                                RegExpCharImpl: <f>
+                                  PsiElement(CHARACTER)('f')
                               PsiElement(CLASS_END)(']')
                             RegExpQuantifierImpl: <+>
                               PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/RealLife3.txt b/RegExpSupport/testData/psi/RealLife3.txt
index 7c8277968b62..a4a7508269fe 100644
--- a/RegExpSupport/testData/psi/RealLife3.txt
+++ b/RegExpSupport/testData/psi/RealLife3.txt
@@ -23,37 +23,36 @@ REGEXP_FILE
             RegExpClosureImpl: <[0-9 a-z_A-Z\-\\./]+>
               RegExpClassImpl: <[0-9 a-z_A-Z\-\\./]>
                 PsiElement(CLASS_BEGIN)('[')
-                RegExpUnionImpl: <0-9 a-z_A-Z\-\\./>
-                  RegExpCharRangeImpl: <0-9>
-                    RegExpCharImpl: <0>
-                      PsiElement(CHARACTER)('0')
-                    PsiElement(MINUS)('-')
-                    RegExpCharImpl: <9>
-                      PsiElement(CHARACTER)('9')
-                  RegExpCharImpl: < >
-                    PsiElement(CHARACTER)(' ')
-                  RegExpCharRangeImpl: <a-z>
-                    RegExpCharImpl: <a>
-                      PsiElement(CHARACTER)('a')
-                    PsiElement(MINUS)('-')
-                    RegExpCharImpl: <z>
-                      PsiElement(CHARACTER)('z')
-                  RegExpCharImpl: <_>
-                    PsiElement(CHARACTER)('_')
-                  RegExpCharRangeImpl: <A-Z>
-                    RegExpCharImpl: <A>
-                      PsiElement(CHARACTER)('A')
-                    PsiElement(MINUS)('-')
-                    RegExpCharImpl: <Z>
-                      PsiElement(CHARACTER)('Z')
-                  RegExpCharImpl: <\->
-                    PsiElement(ESC_CHARACTER)('\-')
-                  RegExpCharImpl: <\\>
-                    PsiElement(ESC_CHARACTER)('\\')
-                  RegExpCharImpl: <.>
-                    PsiElement(CHARACTER)('.')
-                  RegExpCharImpl: </>
-                    PsiElement(CHARACTER)('/')
+                RegExpCharRangeImpl: <0-9>
+                  RegExpCharImpl: <0>
+                    PsiElement(CHARACTER)('0')
+                  PsiElement(MINUS)('-')
+                  RegExpCharImpl: <9>
+                    PsiElement(CHARACTER)('9')
+                RegExpCharImpl: < >
+                  PsiElement(CHARACTER)(' ')
+                RegExpCharRangeImpl: <a-z>
+                  RegExpCharImpl: <a>
+                    PsiElement(CHARACTER)('a')
+                  PsiElement(MINUS)('-')
+                  RegExpCharImpl: <z>
+                    PsiElement(CHARACTER)('z')
+                RegExpCharImpl: <_>
+                  PsiElement(CHARACTER)('_')
+                RegExpCharRangeImpl: <A-Z>
+                  RegExpCharImpl: <A>
+                    PsiElement(CHARACTER)('A')
+                  PsiElement(MINUS)('-')
+                  RegExpCharImpl: <Z>
+                    PsiElement(CHARACTER)('Z')
+                RegExpCharImpl: <\->
+                  PsiElement(ESC_CHARACTER)('\-')
+                RegExpCharImpl: <\\>
+                  PsiElement(ESC_CHARACTER)('\\')
+                RegExpCharImpl: <.>
+                  PsiElement(CHARACTER)('.')
+                RegExpCharImpl: </>
+                  PsiElement(CHARACTER)('/')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <+>
                 PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/RealLife4.txt b/RegExpSupport/testData/psi/RealLife4.txt
index 3812cec58f06..cb525eae96fb 100644
--- a/RegExpSupport/testData/psi/RealLife4.txt
+++ b/RegExpSupport/testData/psi/RealLife4.txt
@@ -6,15 +6,14 @@ REGEXP_FILE
       RegExpClosureImpl: <[\w\+\.\-]{2,}>
         RegExpClassImpl: <[\w\+\.\-]>
           PsiElement(CLASS_BEGIN)('[')
-          RegExpUnionImpl: <\w\+\.\->
-            RegExpSimpleClassImpl: <\w>
-              PsiElement(CHAR_CLASS)('\w')
-            RegExpCharImpl: <\+>
-              PsiElement(REDUNDANT_ESCAPE)('\+')
-            RegExpCharImpl: <\.>
-              PsiElement(REDUNDANT_ESCAPE)('\.')
-            RegExpCharImpl: <\->
-              PsiElement(ESC_CHARACTER)('\-')
+          RegExpSimpleClassImpl: <\w>
+            PsiElement(CHAR_CLASS)('\w')
+          RegExpCharImpl: <\+>
+            PsiElement(REDUNDANT_ESCAPE)('\+')
+          RegExpCharImpl: <\.>
+            PsiElement(REDUNDANT_ESCAPE)('\.')
+          RegExpCharImpl: <\->
+            PsiElement(ESC_CHARACTER)('\-')
           PsiElement(CLASS_END)(']')
         RegExpQuantifierImpl: <{2,}>
           PsiElement(LBRACE)('{')
diff --git a/RegExpSupport/testData/psi/RealLife6.txt b/RegExpSupport/testData/psi/RealLife6.txt
index 408b4e6bbcdc..187de14cc022 100644
--- a/RegExpSupport/testData/psi/RealLife6.txt
+++ b/RegExpSupport/testData/psi/RealLife6.txt
@@ -39,11 +39,10 @@ REGEXP_FILE
               RegExpClassImpl: <[^:/]>
                 PsiElement(CLASS_BEGIN)('[')
                 PsiElement(CARET)('^')
-                RegExpUnionImpl: <:/>
-                  RegExpCharImpl: <:>
-                    PsiElement(CHARACTER)(':')
-                  RegExpCharImpl: </>
-                    PsiElement(CHARACTER)('/')
+                RegExpCharImpl: <:>
+                  PsiElement(CHARACTER)(':')
+                RegExpCharImpl: </>
+                  PsiElement(CHARACTER)('/')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <+>
                 PsiElement(PLUS)('+')
diff --git a/RegExpSupport/testData/psi/RealLife7.txt b/RegExpSupport/testData/psi/RealLife7.txt
index f291adce8fa0..2d4268e9dc82 100644
--- a/RegExpSupport/testData/psi/RealLife7.txt
+++ b/RegExpSupport/testData/psi/RealLife7.txt
@@ -37,11 +37,10 @@ REGEXP_FILE
               RegExpClassImpl: <[^:/]>
                 PsiElement(CLASS_BEGIN)('[')
                 PsiElement(CARET)('^')
-                RegExpUnionImpl: <:/>
-                  RegExpCharImpl: <:>
-                    PsiElement(CHARACTER)(':')
-                  RegExpCharImpl: </>
-                    PsiElement(CHARACTER)('/')
+                RegExpCharImpl: <:>
+                  PsiElement(CHARACTER)(':')
+                RegExpCharImpl: </>
+                  PsiElement(CHARACTER)('/')
                 PsiElement(CLASS_END)(']')
               RegExpQuantifierImpl: <+>
                 PsiElement(PLUS)('+')