diff --git a/RegExpSupport/RegExpSupport.iml b/RegExpSupport/RegExpSupport.iml
index 4597318e7885..355cc42fcd21 100644
--- a/RegExpSupport/RegExpSupport.iml
+++ b/RegExpSupport/RegExpSupport.iml
@@ -18,6 +18,7 @@
+
diff --git a/RegExpSupport/test/test/MainParseTest.java b/RegExpSupport/test/test/MainParseTest.java
index 56141057d4d7..8f46144f6767 100644
--- a/RegExpSupport/test/test/MainParseTest.java
+++ b/RegExpSupport/test/test/MainParseTest.java
@@ -15,7 +15,7 @@
*/
package test;
-import com.intellij.openapi.util.io.FileUtil;
+import org.intellij.lang.regexp.RegExpFileType;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
@@ -30,185 +30,191 @@ import java.util.regex.PatternSyntaxException;
public class MainParseTest extends BaseParseTestcase {
- private ByteArrayOutputStream myOut;
+ private ByteArrayOutputStream myOut;
- enum Result {
- OK, ERR
+ enum Result {
+ OK, ERR
+ }
+
+ static class Test {
+ String pattern;
+ boolean showWarnings = true;
+ boolean showInfo = false;
+ Result expectedResult;
+
+ Test(String pattern, Result result, boolean warn, boolean info) {
+ this.pattern = pattern;
+ expectedResult = result;
+ showWarnings = warn;
+ showInfo = info;
}
- static class Test {
- boolean showWarnings = true;
- boolean showInfo = false;
- Result expectedResult;
+ }
- Test(Result result, boolean warn, boolean info) {
- expectedResult = result;
- showWarnings = warn;
- showInfo = info;
+ private final Map myMap = new LinkedHashMap();
+
+ @Override
+ protected void setUp() throws Exception {
+ final Document document = new SAXBuilder().build(new File(getTestDataRoot(), "/RETest.xml"));
+ final List list = XPath.selectNodes(document.getRootElement(), "//test");
+
+ int i = 0;
+ for (Element element : list) {
+ final String name;
+ final Element parent = (Element)element.getParent();
+ final String s = parent.getName();
+ final String t = parent.getAttribute("id") == null ? "" : parent.getAttribute("id").getValue() + "-";
+ if (!"tests".equals(s)) {
+ name = s + "/test-" + t + ++i + ".regexp";
+ }
+ else {
+ name = "test-" + t + ++i + ".regexp";
+ }
+ final Result result = Result.valueOf((String)XPath.selectSingleNode(element, "string(expected)"));
+ final boolean warn = !"false".equals(element.getAttributeValue("warning"));
+ final boolean info = "true".equals(element.getAttributeValue("info"));
+
+ final String pattern = (String)XPath.selectSingleNode(element, "string(pattern)");
+ myMap.put(name, new Test(pattern, result, warn, info));
+ if (!"false".equals(element.getAttributeValue("verify"))) {
+ try {
+ Pattern.compile(pattern);
+ if (result == Result.ERR) {
+ System.out.println("Incorrect FAIL value for " + pattern);
+ }
}
- }
-
- private final Map myMap = new LinkedHashMap();
-
- @Override
- protected void setUp() throws Exception {
- final Document document = new SAXBuilder().build(new File(getTestDataRoot(), "/RETest.xml"));
- final List list = XPath.selectNodes(document.getRootElement(), "//test");
- new File(getTestDataPath()).mkdirs();
-
- int i = 0;
- for (Element element : list) {
- final String name;
- final Element parent = (Element)element.getParent();
- final String s = parent.getName();
- final String t = parent.getAttribute("id") == null ? "" : parent.getAttribute("id").getValue() + "-";
- if (!"tests".equals(s)) {
- name = s + "/test-" + t + ++i + ".regexp";
- } else {
- name = "test-" + t + ++i + ".regexp";
- }
- final Result result = Result.valueOf((String)XPath.selectSingleNode(element, "string(expected)"));
- final boolean warn = !"false".equals(element.getAttributeValue("warning"));
- final boolean info = "true".equals(element.getAttributeValue("info"));
- myMap.put(name, new Test(result, warn, info));
-
- final File file = new File(getTestDataPath(), name);
- file.getParentFile().mkdirs();
-
- final FileWriter stream = new FileWriter(file);
- final String pattern = (String)XPath.selectSingleNode(element, "string(pattern)");
- if (!"false".equals(element.getAttributeValue("verify"))) try {
- Pattern.compile(pattern);
- if (result == Result.ERR) {
- System.out.println("Incorrect FAIL value for " + pattern);
- }
- } catch (PatternSyntaxException e) {
- if (result == Result.OK) {
- System.out.println("Incorrect OK value for " + pattern);
- }
- }
- stream.write(pattern);
- stream.close();
+ catch (PatternSyntaxException e) {
+ if (result == Result.OK) {
+ System.out.println("Incorrect OK value for " + pattern);
+ }
}
-
- super.setUp();
-
- myOut = new ByteArrayOutputStream();
- System.setErr(new PrintStream(myOut));
+ }
}
- @Override
- protected String getTestDataPath() {
- return super.getTestDataPath()+"/gen/";
- }
+ super.setUp();
- public void testSimple() throws Exception {
- doTest("simple/");
- }
+ myOut = new ByteArrayOutputStream();
+ System.setErr(new PrintStream(myOut));
+ }
- public void testQuantifiers() throws Exception {
- doTest("quantifiers/");
- }
+ @Override
+ protected String getTestDataPath() {
+ return super.getTestDataPath() + "/gen/";
+ }
- public void testGroups() throws Exception {
- doTest("groups/");
- }
+ public void testSimple() throws Exception {
+ doTest("simple/");
+ }
- public void testCharclasses() throws Exception {
- doTest("charclasses/");
- }
+ public void testQuantifiers() throws Exception {
+ doTest("quantifiers/");
+ }
- public void testEscapes() throws Exception {
- doTest("escapes/");
- }
+ public void testGroups() throws Exception {
+ doTest("groups/");
+ }
- public void testAnchors() throws Exception {
- doTest("anchors/");
- }
+ public void testCharclasses() throws Exception {
+ doTest("charclasses/");
+ }
- public void testNamedchars() throws Exception {
- doTest("namedchars/");
- }
+ public void testEscapes() throws Exception {
+ doTest("escapes/");
+ }
- public void testBackrefs() throws Exception {
- doTest("backrefs/");
- }
+ public void testAnchors() throws Exception {
+ doTest("anchors/");
+ }
- public void testComplex() throws Exception {
- doTest("complex/");
- }
+ public void testNamedchars() throws Exception {
+ doTest("namedchars/");
+ }
- public void testIncomplete() throws Exception {
- doTest("incomplete/");
- }
+ public void testBackrefs() throws Exception {
+ doTest("backrefs/");
+ }
- public void testRealLife() throws Exception {
- doTest("real-life/");
- }
+ public void testComplex() throws Exception {
+ doTest("complex/");
+ }
- public void testRegressions() throws Exception {
- doTest("regressions/");
- }
+ public void testIncomplete() throws Exception {
+ doTest("incomplete/");
+ }
- public void testBugs() throws Exception {
- doTest("bug/");
- }
+ public void testRealLife() throws Exception {
+ doTest("real-life/");
+ }
- public void testFromXML() throws Exception {
- doTest(null);
- }
+ public void testRegressions() throws Exception {
+ doTest("regressions/");
+ }
- private void doTest(String prefix) throws IOException {
- int n = 0;
- int failed = 0;
- for (String name : myMap.keySet()) {
- if (prefix == null && name.contains("/")) {
- continue;
- }
- if (prefix != null && !name.startsWith(prefix)) {
- continue;
- }
- System.out.print("filename = " + name);
- n++;
+ public void testBugs() throws Exception {
+ doTest("bug/");
+ }
- final MainParseTest.Test test = myMap.get(name);
- try {
- myFixture.testHighlighting(test.showWarnings, true, test.showInfo, name);
+ public void testFromXML() throws Exception {
+ doTest(null);
+ }
- if (test.expectedResult == Result.ERR) {
- System.out.println(" FAILED. Expression incorrectly parsed OK: " + FileUtil.loadFile(new File(getTestDataPath(), name)));
- failed++;
- } else {
- System.out.println(" OK");
- }
- } catch (Throwable e) {
- if (test.expectedResult == Result.ERR) {
- System.out.println(" OK");
- } else {
- e.printStackTrace();
- System.out.println(" FAILED. Expression = " + FileUtil.loadFile(new File(getTestDataPath(), name)));
- if (myOut.size() > 0) {
- String line;
- final BufferedReader reader = new BufferedReader(new StringReader(myOut.toString()));
- do {
- line = reader.readLine();
- } while (line != null && (line.trim().length() == 0 || line.trim().equals("ERROR:")));
- if (line != null) {
- if (line.matches(".*java.lang.Error: junit.framework.AssertionFailedError:.*")) {
- System.out.println("ERROR: " + line.replace("java.lang.Error: junit.framework.AssertionFailedError:", ""));
- }
- } else {
- System.out.println("ERROR: " + myOut.toString());
- }
- }
- failed++;
- }
- }
- myOut.reset();
+ private void doTest(String prefix) throws IOException {
+ int n = 0;
+ int failed = 0;
+ for (String name : myMap.keySet()) {
+ if (prefix == null && name.contains("/")) {
+ continue;
+ }
+ if (prefix != null && !name.startsWith(prefix)) {
+ continue;
+ }
+ System.out.print("filename = " + name);
+ n++;
+
+ final MainParseTest.Test test = myMap.get(name);
+ try {
+ myFixture.configureByText(RegExpFileType.INSTANCE, test.pattern);
+ myFixture.testHighlighting(test.showWarnings, true, test.showInfo);
+
+ if (test.expectedResult == Result.ERR) {
+ System.out.println(" FAILED. Expression incorrectly parsed OK: " + test.pattern);
+ failed++;
}
-
- System.out.println("");
- System.out.println(n + " Tests executed, " + failed + " failed");
-
- assertFalse(failed > 0);
+ else {
+ System.out.println(" OK");
+ }
+ }
+ catch (Throwable e) {
+ if (test.expectedResult == Result.ERR) {
+ System.out.println(" OK");
+ }
+ else {
+ e.printStackTrace();
+ System.out.println(" FAILED. Expression = " + test.pattern);
+ if (myOut.size() > 0) {
+ String line;
+ final BufferedReader reader = new BufferedReader(new StringReader(myOut.toString()));
+ do {
+ line = reader.readLine();
+ }
+ while (line != null && (line.trim().length() == 0 || line.trim().equals("ERROR:")));
+ if (line != null) {
+ if (line.matches(".*java.lang.Error: junit.framework.AssertionFailedError:.*")) {
+ System.out.println("ERROR: " + line.replace("java.lang.Error: junit.framework.AssertionFailedError:", ""));
+ }
+ }
+ else {
+ System.out.println("ERROR: " + myOut.toString());
+ }
+ }
+ failed++;
+ }
+ }
+ myOut.reset();
}
+
+ System.out.println("");
+ System.out.println(n + " Tests executed, " + failed + " failed");
+
+ assertFalse(failed > 0);
+ }
}
diff --git a/RegExpSupport/testData/psi/gen/anchors/test-148.regexp b/RegExpSupport/testData/psi/gen/anchors/test-148.regexp
deleted file mode 100644
index 4c2ffb6911cc..000000000000
--- a/RegExpSupport/testData/psi/gen/anchors/test-148.regexp
+++ /dev/null
@@ -1 +0,0 @@
-^*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/anchors/test-149.regexp b/RegExpSupport/testData/psi/gen/anchors/test-149.regexp
deleted file mode 100644
index 0defc92a647d..000000000000
--- a/RegExpSupport/testData/psi/gen/anchors/test-149.regexp
+++ /dev/null
@@ -1 +0,0 @@
-$*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/anchors/test-150.regexp b/RegExpSupport/testData/psi/gen/anchors/test-150.regexp
deleted file mode 100644
index c7157cf11482..000000000000
--- a/RegExpSupport/testData/psi/gen/anchors/test-150.regexp
+++ /dev/null
@@ -1 +0,0 @@
-^abc
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/anchors/test-151.regexp b/RegExpSupport/testData/psi/gen/anchors/test-151.regexp
deleted file mode 100644
index 51224a9040de..000000000000
--- a/RegExpSupport/testData/psi/gen/anchors/test-151.regexp
+++ /dev/null
@@ -1 +0,0 @@
-^abc$
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/anchors/test-152.regexp b/RegExpSupport/testData/psi/gen/anchors/test-152.regexp
deleted file mode 100644
index 2c376cc3c5aa..000000000000
--- a/RegExpSupport/testData/psi/gen/anchors/test-152.regexp
+++ /dev/null
@@ -1 +0,0 @@
-abc$
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/anchors/test-153.regexp b/RegExpSupport/testData/psi/gen/anchors/test-153.regexp
deleted file mode 100644
index e0aa8a9ce724..000000000000
--- a/RegExpSupport/testData/psi/gen/anchors/test-153.regexp
+++ /dev/null
@@ -1 +0,0 @@
-^
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/anchors/test-154.regexp b/RegExpSupport/testData/psi/gen/anchors/test-154.regexp
deleted file mode 100644
index 6f4f765ed699..000000000000
--- a/RegExpSupport/testData/psi/gen/anchors/test-154.regexp
+++ /dev/null
@@ -1 +0,0 @@
-$
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/anchors/test-155.regexp b/RegExpSupport/testData/psi/gen/anchors/test-155.regexp
deleted file mode 100644
index 76fe59be4930..000000000000
--- a/RegExpSupport/testData/psi/gen/anchors/test-155.regexp
+++ /dev/null
@@ -1 +0,0 @@
-$b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/anchors/test-156.regexp b/RegExpSupport/testData/psi/gen/anchors/test-156.regexp
deleted file mode 100644
index 5c84a9bff850..000000000000
--- a/RegExpSupport/testData/psi/gen/anchors/test-156.regexp
+++ /dev/null
@@ -1 +0,0 @@
-^(ab|cd)e
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/anchors/test-157.regexp b/RegExpSupport/testData/psi/gen/anchors/test-157.regexp
deleted file mode 100644
index 7ff5ebea56da..000000000000
--- a/RegExpSupport/testData/psi/gen/anchors/test-157.regexp
+++ /dev/null
@@ -1 +0,0 @@
-^a(bc+|b[eh])g|.h$
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/backrefs/test-167.regexp b/RegExpSupport/testData/psi/gen/backrefs/test-167.regexp
deleted file mode 100644
index 06c24f902379..000000000000
--- a/RegExpSupport/testData/psi/gen/backrefs/test-167.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(ac*)c*d[ac]*\1
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/backrefs/test-168.regexp b/RegExpSupport/testData/psi/gen/backrefs/test-168.regexp
deleted file mode 100644
index ed13c0ce0042..000000000000
--- a/RegExpSupport/testData/psi/gen/backrefs/test-168.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(.)=\1
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/backrefs/test-169.regexp b/RegExpSupport/testData/psi/gen/backrefs/test-169.regexp
deleted file mode 100644
index de00802bb80c..000000000000
--- a/RegExpSupport/testData/psi/gen/backrefs/test-169.regexp
+++ /dev/null
@@ -1 +0,0 @@
-([ab])=\1
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/backrefs/test-170.regexp b/RegExpSupport/testData/psi/gen/backrefs/test-170.regexp
deleted file mode 100644
index 627b356ad6ec..000000000000
--- a/RegExpSupport/testData/psi/gen/backrefs/test-170.regexp
+++ /dev/null
@@ -1 +0,0 @@
-([ab]+)=\1
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/backrefs/test-171.regexp b/RegExpSupport/testData/psi/gen/backrefs/test-171.regexp
deleted file mode 100644
index d220b63415b5..000000000000
--- a/RegExpSupport/testData/psi/gen/backrefs/test-171.regexp
+++ /dev/null
@@ -1 +0,0 @@
-([ab]+)=\2
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/backrefs/test-172.regexp b/RegExpSupport/testData/psi/gen/backrefs/test-172.regexp
deleted file mode 100644
index 230e75052bed..000000000000
--- a/RegExpSupport/testData/psi/gen/backrefs/test-172.regexp
+++ /dev/null
@@ -1 +0,0 @@
-([ab]+)=\3
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/backrefs/test-173.regexp b/RegExpSupport/testData/psi/gen/backrefs/test-173.regexp
deleted file mode 100644
index 9e6690457671..000000000000
--- a/RegExpSupport/testData/psi/gen/backrefs/test-173.regexp
+++ /dev/null
@@ -1 +0,0 @@
-([ab]+=\1)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-44.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-44.regexp
deleted file mode 100644
index 31cd0b600b76..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-44.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[bc]d
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-45.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-45.regexp
deleted file mode 100644
index b8148b5e5007..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-45.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[b-d]e
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-46.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-46.regexp
deleted file mode 100644
index 2c69eda5b43a..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-46.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[b-d]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-47.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-47.regexp
deleted file mode 100644
index e0306bd1a26c..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-47.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[b-a]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-48.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-48.regexp
deleted file mode 100644
index 849161ff923e..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-48.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[-b]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-49.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-49.regexp
deleted file mode 100644
index 0abb8cf0da04..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-49.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[b-]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-50.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-50.regexp
deleted file mode 100644
index b898b3c49010..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-50.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[a-[b]]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-51.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-51.regexp
deleted file mode 100644
index 783927946a47..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-51.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[b&&[cd]]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-52.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-52.regexp
deleted file mode 100644
index 8fb3c01f9213..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-52.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[b-&&[cd]]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-53.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-53.regexp
deleted file mode 100644
index e04d654779cf..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-53.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[b&&-]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-54.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-54.regexp
deleted file mode 100644
index d1da51fd4b9e..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-54.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[b&&-b]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-55.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-55.regexp
deleted file mode 100644
index 20563e159a49..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-55.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[&&]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-56.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-56.regexp
deleted file mode 100644
index db17ef1ba95f..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-56.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[b&&c&&d]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-57.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-57.regexp
deleted file mode 100644
index da8971512580..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-57.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[b&&c&&d-e&&f]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-58.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-58.regexp
deleted file mode 100644
index 4d7f058ae0d9..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-58.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[a[b][c]]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-59.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-59.regexp
deleted file mode 100644
index 8d80e861df2a..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-59.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[a-[]]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-60.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-60.regexp
deleted file mode 100644
index 08c77a9170d5..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-60.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[a-[b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-61.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-61.regexp
deleted file mode 100644
index 7298fa3c75ee..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-61.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[a[^b]]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-62.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-62.regexp
deleted file mode 100644
index 33f88c372e5a..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-62.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[a[b[c]][d]]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-63.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-63.regexp
deleted file mode 100644
index 174c763ba78d..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-63.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[\t--]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-64.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-64.regexp
deleted file mode 100644
index 174c763ba78d..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-64.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[\t--]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-65.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-65.regexp
deleted file mode 100644
index 05d45406503b..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-65.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[\t---]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-66.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-66.regexp
deleted file mode 100644
index f1221d75a25d..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-66.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[-]?c
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-67.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-67.regexp
deleted file mode 100644
index f7a637f9864f..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-67.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-68.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-68.regexp
deleted file mode 100644
index 5176079d3f85..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-68.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-69.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-69.regexp
deleted file mode 100644
index 446aaae86c66..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-69.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[a-[
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-70.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-70.regexp
deleted file mode 100644
index 148769a51866..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-70.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[]]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-71.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-71.regexp
deleted file mode 100644
index cd44fa7e31a3..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-71.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[^bc]d
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-72.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-72.regexp
deleted file mode 100644
index 1256da3f8728..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-72.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[^bc]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-73.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-73.regexp
deleted file mode 100644
index 6d73727ee63b..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-73.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[]b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-74.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-74.regexp
deleted file mode 100644
index 6b65fc34ea19..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-74.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[abhgefdc]ij
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-75.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-75.regexp
deleted file mode 100644
index 2eaaa6832e21..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-75.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[a-zA-Z_][a-zA-Z0-9_]*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-76.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-76.regexp
deleted file mode 100644
index 512c96f2beb7..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-76.regexp
+++ /dev/null
@@ -1 +0,0 @@
-([a-c]+?)c
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-77.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-77.regexp
deleted file mode 100644
index f9e33f92e194..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-77.regexp
+++ /dev/null
@@ -1 +0,0 @@
-([ab]*?)b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-78.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-78.regexp
deleted file mode 100644
index c540ca21ae67..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-78.regexp
+++ /dev/null
@@ -1 +0,0 @@
-([ab]*)b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-79.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-79.regexp
deleted file mode 100644
index 1a5d5a45777d..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-79.regexp
+++ /dev/null
@@ -1 +0,0 @@
-([ab]??)b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-80.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-80.regexp
deleted file mode 100644
index 9d74773e5ce1..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-80.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(c[ab]?)b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-81.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-81.regexp
deleted file mode 100644
index cf03384c3cd0..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-81.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(c[ab]??)b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-82.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-82.regexp
deleted file mode 100644
index 6c290c1fc5be..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-82.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(c[ab]*?)b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-83.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-83.regexp
deleted file mode 100644
index 9056c560adeb..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-83.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[bcd]+dcdcde
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-84.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-84.regexp
deleted file mode 100644
index 1f2ccbd9b231..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-84.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[k]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-85.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-85.regexp
deleted file mode 100644
index 5c3adfbc1ca8..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-85.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[bcd]*dcdcde
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-86.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-86.regexp
deleted file mode 100644
index 7b59aa589fcc..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-86.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[^ab]*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-87.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-87.regexp
deleted file mode 100644
index c6c0dedb5d7e..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-87.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[.]b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-88.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-88.regexp
deleted file mode 100644
index 9e29ef2b3510..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-88.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[+*?]b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-89.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-89.regexp
deleted file mode 100644
index c6e50ea37302..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-89.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a[\p{IsDigit}\p{IsAlpha}]b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-90.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-90.regexp
deleted file mode 100644
index 32d5ffc873cc..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-90.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[\p{L}&&[^\p{Lu}]]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-91.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-91.regexp
deleted file mode 100644
index b8f801aab307..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-91.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a\p
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-92.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-92.regexp
deleted file mode 100644
index b572a785ab5a..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-92.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a\p{}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-93.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-93.regexp
deleted file mode 100644
index e50e8ffd62a8..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-93.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a\p}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-94.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-94.regexp
deleted file mode 100644
index 69432dc2a6bd..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-94.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a\p{123}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-95.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-95.regexp
deleted file mode 100644
index d67268815cd2..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-95.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a\p{*}b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-96.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-96.regexp
deleted file mode 100644
index 01dab09f071a..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-96.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[\w-\w]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-97.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-97.regexp
deleted file mode 100644
index 111c522193f1..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-97.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[a-\w]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/charclasses/test-98.regexp b/RegExpSupport/testData/psi/gen/charclasses/test-98.regexp
deleted file mode 100644
index bf43658b618e..000000000000
--- a/RegExpSupport/testData/psi/gen/charclasses/test-98.regexp
+++ /dev/null
@@ -1,3 +0,0 @@
-(?x)abc #foo \q bar
-# foo
-(?-xi)xyz(?i:ABC)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/complex/test-174.regexp b/RegExpSupport/testData/psi/gen/complex/test-174.regexp
deleted file mode 100644
index f702d6a314f5..000000000000
--- a/RegExpSupport/testData/psi/gen/complex/test-174.regexp
+++ /dev/null
@@ -1 +0,0 @@
-z(\w\s+(?:\w\s+\w)+)z
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/complex/test-175.regexp b/RegExpSupport/testData/psi/gen/complex/test-175.regexp
deleted file mode 100644
index 8545c430edca..000000000000
--- a/RegExpSupport/testData/psi/gen/complex/test-175.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(([hH][tT]{2}[pP]|[fF][tT][pP]):\/\/)?[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/complex/test-176.regexp b/RegExpSupport/testData/psi/gen/complex/test-176.regexp
deleted file mode 100644
index a6e5584498e7..000000000000
--- a/RegExpSupport/testData/psi/gen/complex/test-176.regexp
+++ /dev/null
@@ -1 +0,0 @@
-((?:[hH][tT]{2}[pP]|[fF][tT][pP]):\/\/)?[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/complex/test-177.regexp b/RegExpSupport/testData/psi/gen/complex/test-177.regexp
deleted file mode 100644
index a5877a00e479..000000000000
--- a/RegExpSupport/testData/psi/gen/complex/test-177.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(([hH][tT]{2}[pP]|[fF][tT][pP]):\/\/)?[a-zA-Z0-9\-]+(?:\.[a-zA-Z0-9\-]+)*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/complex/test-178.regexp b/RegExpSupport/testData/psi/gen/complex/test-178.regexp
deleted file mode 100644
index a11ff0b96dfc..000000000000
--- a/RegExpSupport/testData/psi/gen/complex/test-178.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(?:([hH][tT]{2}[pP]|[fF][tT][pP]):\/\/)?[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/complex/test-179.regexp b/RegExpSupport/testData/psi/gen/complex/test-179.regexp
deleted file mode 100644
index beb85f9c74fe..000000000000
--- a/RegExpSupport/testData/psi/gen/complex/test-179.regexp
+++ /dev/null
@@ -1 +0,0 @@
-^(?:([hH][tT]{2}[pP]|[fF][tT][pP]):\/\/)?[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*$
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/complex/test-180.regexp b/RegExpSupport/testData/psi/gen/complex/test-180.regexp
deleted file mode 100644
index cf57ee276614..000000000000
--- a/RegExpSupport/testData/psi/gen/complex/test-180.regexp
+++ /dev/null
@@ -1 +0,0 @@
-^(?:(?:[hH][tT]{2}[pP]|[fF][tT][pP]):\/\/)?[a-zA-Z0-9\-]+(?:\.[a-zA-Z0-9\-]+)*$
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-131.regexp b/RegExpSupport/testData/psi/gen/escapes/test-131.regexp
deleted file mode 100644
index cf4917be96dd..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-131.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\q
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-132.regexp b/RegExpSupport/testData/psi/gen/escapes/test-132.regexp
deleted file mode 100644
index 133d674d1ea4..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-132.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\#
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-133.regexp b/RegExpSupport/testData/psi/gen/escapes/test-133.regexp
deleted file mode 100644
index 1e728b64319b..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-133.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a\
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-134.regexp b/RegExpSupport/testData/psi/gen/escapes/test-134.regexp
deleted file mode 100644
index fd927efe76e1..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-134.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a\(b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-135.regexp b/RegExpSupport/testData/psi/gen/escapes/test-135.regexp
deleted file mode 100644
index 58cc31551b65..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-135.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a\(*b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-136.regexp b/RegExpSupport/testData/psi/gen/escapes/test-136.regexp
deleted file mode 100644
index d2be9d8338db..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-136.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a\\b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-137.regexp b/RegExpSupport/testData/psi/gen/escapes/test-137.regexp
deleted file mode 100644
index 73fc30c21cec..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-137.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\u004a
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-138.regexp b/RegExpSupport/testData/psi/gen/escapes/test-138.regexp
deleted file mode 100644
index 874c1491043f..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-138.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\0123
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-139.regexp b/RegExpSupport/testData/psi/gen/escapes/test-139.regexp
deleted file mode 100644
index 17851a41712f..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-139.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\0
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-140.regexp b/RegExpSupport/testData/psi/gen/escapes/test-140.regexp
deleted file mode 100644
index 88fc5677fa49..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-140.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\x4a
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-141.regexp b/RegExpSupport/testData/psi/gen/escapes/test-141.regexp
deleted file mode 100644
index b876608192ee..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-141.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[\x4a-\x4b]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-142.regexp b/RegExpSupport/testData/psi/gen/escapes/test-142.regexp
deleted file mode 100644
index c79cb3df58b1..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-142.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[a-a]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-143.regexp b/RegExpSupport/testData/psi/gen/escapes/test-143.regexp
deleted file mode 100644
index 96b64accbf38..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-143.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[\x4a-\x3f]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-144.regexp b/RegExpSupport/testData/psi/gen/escapes/test-144.regexp
deleted file mode 100644
index d46dc71afdf9..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-144.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a\Qabc?*+.))]][]\Eb
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-145.regexp b/RegExpSupport/testData/psi/gen/escapes/test-145.regexp
deleted file mode 100644
index 4de8aefa45d0..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-145.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(a\Qabc?*+.))]][]\Eb)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-146.regexp b/RegExpSupport/testData/psi/gen/escapes/test-146.regexp
deleted file mode 100644
index f8a968100411..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-146.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[\Qabc?*+.))]][]\E]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/escapes/test-147.regexp b/RegExpSupport/testData/psi/gen/escapes/test-147.regexp
deleted file mode 100644
index fceecd5f20e4..000000000000
--- a/RegExpSupport/testData/psi/gen/escapes/test-147.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a\Qabc?*+.))]][]\E)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-100.regexp b/RegExpSupport/testData/psi/gen/groups/test-100.regexp
deleted file mode 100644
index 728a06b0d769..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-100.regexp
+++ /dev/null
@@ -1 +0,0 @@
-()*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-101.regexp b/RegExpSupport/testData/psi/gen/groups/test-101.regexp
deleted file mode 100644
index e098f3c46473..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-101.regexp
+++ /dev/null
@@ -1 +0,0 @@
-()
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-102.regexp b/RegExpSupport/testData/psi/gen/groups/test-102.regexp
deleted file mode 100644
index 3fb22492cd5a..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-102.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(|)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-103.regexp b/RegExpSupport/testData/psi/gen/groups/test-103.regexp
deleted file mode 100644
index 028ad05c9dd1..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-103.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(*)b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-104.regexp b/RegExpSupport/testData/psi/gen/groups/test-104.regexp
deleted file mode 100644
index d1b3159a5113..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-104.regexp
+++ /dev/null
@@ -1 +0,0 @@
-((a))
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-105.regexp b/RegExpSupport/testData/psi/gen/groups/test-105.regexp
deleted file mode 100644
index 4405e9f60330..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-105.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(a)b(c)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-106.regexp b/RegExpSupport/testData/psi/gen/groups/test-106.regexp
deleted file mode 100644
index 8d8ea931f30b..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-106.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(a*)*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-107.regexp b/RegExpSupport/testData/psi/gen/groups/test-107.regexp
deleted file mode 100644
index 28cdf1441d7e..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-107.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(a*)+
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-108.regexp b/RegExpSupport/testData/psi/gen/groups/test-108.regexp
deleted file mode 100644
index 5e14c1dff29e..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-108.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(a|)*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-109.regexp b/RegExpSupport/testData/psi/gen/groups/test-109.regexp
deleted file mode 100644
index 13e6ca15ee1f..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-109.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(ab|cd)e
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-110.regexp b/RegExpSupport/testData/psi/gen/groups/test-110.regexp
deleted file mode 100644
index 74b819d17950..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-110.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(.*)c(.*)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-111.regexp b/RegExpSupport/testData/psi/gen/groups/test-111.regexp
deleted file mode 100644
index 13b86b1902d0..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-111.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\((.*), (.*)\)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-112.regexp b/RegExpSupport/testData/psi/gen/groups/test-112.regexp
deleted file mode 100644
index a70cd4a61cd4..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-112.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a(bc)d
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-113.regexp b/RegExpSupport/testData/psi/gen/groups/test-113.regexp
deleted file mode 100644
index 38b357094bf5..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-113.regexp
+++ /dev/null
@@ -1 +0,0 @@
-([abc])*d
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-114.regexp b/RegExpSupport/testData/psi/gen/groups/test-114.regexp
deleted file mode 100644
index fcb123a959d3..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-114.regexp
+++ /dev/null
@@ -1 +0,0 @@
-((((((((((a)))))))))
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-115.regexp b/RegExpSupport/testData/psi/gen/groups/test-115.regexp
deleted file mode 100644
index 38be5c713623..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-115.regexp
+++ /dev/null
@@ -1 +0,0 @@
-([abc])*bcd
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-116.regexp b/RegExpSupport/testData/psi/gen/groups/test-116.regexp
deleted file mode 100644
index 297507f137d3..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-116.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(a|b)c*d
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-117.regexp b/RegExpSupport/testData/psi/gen/groups/test-117.regexp
deleted file mode 100644
index 28d54b019c5a..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-117.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a([bc]*)c*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-118.regexp b/RegExpSupport/testData/psi/gen/groups/test-118.regexp
deleted file mode 100644
index b5f4a6022c45..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-118.regexp
+++ /dev/null
@@ -1 +0,0 @@
-((a)(b)c)(d)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-119.regexp b/RegExpSupport/testData/psi/gen/groups/test-119.regexp
deleted file mode 100644
index d08cd9e05865..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-119.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(ab|a)b*c
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-120.regexp b/RegExpSupport/testData/psi/gen/groups/test-120.regexp
deleted file mode 100644
index b8a83168ea51..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-120.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(ab|ab*)bc
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-121.regexp b/RegExpSupport/testData/psi/gen/groups/test-121.regexp
deleted file mode 100644
index e3cb9eb73706..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-121.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(a|b|c|d|e)f
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-122.regexp b/RegExpSupport/testData/psi/gen/groups/test-122.regexp
deleted file mode 100644
index cd7f3d1ad1ed..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-122.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a([bc]*)(c*d)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-123.regexp b/RegExpSupport/testData/psi/gen/groups/test-123.regexp
deleted file mode 100644
index 010f0c36da3c..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-123.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a([bc]+)(c*d)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-124.regexp b/RegExpSupport/testData/psi/gen/groups/test-124.regexp
deleted file mode 100644
index 9f1b8880b85f..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-124.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a([bc]*)(c+d)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-125.regexp b/RegExpSupport/testData/psi/gen/groups/test-125.regexp
deleted file mode 100644
index 039b33eca23d..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-125.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(a+|b)*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-126.regexp b/RegExpSupport/testData/psi/gen/groups/test-126.regexp
deleted file mode 100644
index c944e26b2242..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-126.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(a+|b)+
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-127.regexp b/RegExpSupport/testData/psi/gen/groups/test-127.regexp
deleted file mode 100644
index b4c3bf660e3c..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-127.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(a+|b)?
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-128.regexp b/RegExpSupport/testData/psi/gen/groups/test-128.regexp
deleted file mode 100644
index 4822cc12e7f9..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-128.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(^*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-129.regexp b/RegExpSupport/testData/psi/gen/groups/test-129.regexp
deleted file mode 100644
index 87686f5577e6..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-129.regexp
+++ /dev/null
@@ -1 +0,0 @@
-)(
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-130.regexp b/RegExpSupport/testData/psi/gen/groups/test-130.regexp
deleted file mode 100644
index 6860c06b3ef4..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-130.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(?i:*)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/groups/test-99.regexp b/RegExpSupport/testData/psi/gen/groups/test-99.regexp
deleted file mode 100644
index 5cc3ada65db5..000000000000
--- a/RegExpSupport/testData/psi/gen/groups/test-99.regexp
+++ /dev/null
@@ -1 +0,0 @@
-()ef
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/incomplete/test-181.regexp b/RegExpSupport/testData/psi/gen/incomplete/test-181.regexp
deleted file mode 100644
index 52544bcb7fd7..000000000000
--- a/RegExpSupport/testData/psi/gen/incomplete/test-181.regexp
+++ /dev/null
@@ -1 +0,0 @@
-abc\
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/incomplete/test-182.regexp b/RegExpSupport/testData/psi/gen/incomplete/test-182.regexp
deleted file mode 100644
index 4b0b991ba6d1..000000000000
--- a/RegExpSupport/testData/psi/gen/incomplete/test-182.regexp
+++ /dev/null
@@ -1 +0,0 @@
-abc[\
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/incomplete/test-183.regexp b/RegExpSupport/testData/psi/gen/incomplete/test-183.regexp
deleted file mode 100644
index e88225c069bd..000000000000
--- a/RegExpSupport/testData/psi/gen/incomplete/test-183.regexp
+++ /dev/null
@@ -1 +0,0 @@
-abc\x
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/incomplete/test-184.regexp b/RegExpSupport/testData/psi/gen/incomplete/test-184.regexp
deleted file mode 100644
index b44aa295c9a7..000000000000
--- a/RegExpSupport/testData/psi/gen/incomplete/test-184.regexp
+++ /dev/null
@@ -1 +0,0 @@
-abc\x1
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/incomplete/test-185.regexp b/RegExpSupport/testData/psi/gen/incomplete/test-185.regexp
deleted file mode 100644
index 37c84ecfa02f..000000000000
--- a/RegExpSupport/testData/psi/gen/incomplete/test-185.regexp
+++ /dev/null
@@ -1 +0,0 @@
-abc\u
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/incomplete/test-186.regexp b/RegExpSupport/testData/psi/gen/incomplete/test-186.regexp
deleted file mode 100644
index adaf143b8674..000000000000
--- a/RegExpSupport/testData/psi/gen/incomplete/test-186.regexp
+++ /dev/null
@@ -1 +0,0 @@
-abc\u22
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/incomplete/test-187.regexp b/RegExpSupport/testData/psi/gen/incomplete/test-187.regexp
deleted file mode 100644
index f5c63ee221b7..000000000000
--- a/RegExpSupport/testData/psi/gen/incomplete/test-187.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\Qabc
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/incomplete/test-188.regexp b/RegExpSupport/testData/psi/gen/incomplete/test-188.regexp
deleted file mode 100644
index bf9340a5ce18..000000000000
--- a/RegExpSupport/testData/psi/gen/incomplete/test-188.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\Q
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/incomplete/test-189.regexp b/RegExpSupport/testData/psi/gen/incomplete/test-189.regexp
deleted file mode 100644
index a9aa247a80cf..000000000000
--- a/RegExpSupport/testData/psi/gen/incomplete/test-189.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\E
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/namedchars/test-158.regexp b/RegExpSupport/testData/psi/gen/namedchars/test-158.regexp
deleted file mode 100644
index f1384df943bf..000000000000
--- a/RegExpSupport/testData/psi/gen/namedchars/test-158.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a*b\s+c
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/namedchars/test-159.regexp b/RegExpSupport/testData/psi/gen/namedchars/test-159.regexp
deleted file mode 100644
index 181e70125e52..000000000000
--- a/RegExpSupport/testData/psi/gen/namedchars/test-159.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\d+
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/namedchars/test-160.regexp b/RegExpSupport/testData/psi/gen/namedchars/test-160.regexp
deleted file mode 100644
index 23ea52385ca4..000000000000
--- a/RegExpSupport/testData/psi/gen/namedchars/test-160.regexp
+++ /dev/null
@@ -1 +0,0 @@
-^\p{javaJavaIdentifierStart}+\p{javaJavaIdentifierPart}+$
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/namedchars/test-161.regexp b/RegExpSupport/testData/psi/gen/namedchars/test-161.regexp
deleted file mode 100644
index 4999cec7c20a..000000000000
--- a/RegExpSupport/testData/psi/gen/namedchars/test-161.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\p{IsDigit}\p{IsAlpha}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/namedchars/test-162.regexp b/RegExpSupport/testData/psi/gen/namedchars/test-162.regexp
deleted file mode 100644
index 37d7c567f94e..000000000000
--- a/RegExpSupport/testData/psi/gen/namedchars/test-162.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[a-e]?d\\e
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/namedchars/test-163.regexp b/RegExpSupport/testData/psi/gen/namedchars/test-163.regexp
deleted file mode 100644
index cdb493b394bc..000000000000
--- a/RegExpSupport/testData/psi/gen/namedchars/test-163.regexp
+++ /dev/null
@@ -1 +0,0 @@
-((\w+)/)*(\w+)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/namedchars/test-164.regexp b/RegExpSupport/testData/psi/gen/namedchars/test-164.regexp
deleted file mode 100644
index dea04865f459..000000000000
--- a/RegExpSupport/testData/psi/gen/namedchars/test-164.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\p{Digit}+
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/namedchars/test-165.regexp b/RegExpSupport/testData/psi/gen/namedchars/test-165.regexp
deleted file mode 100644
index e4ae5f28ef52..000000000000
--- a/RegExpSupport/testData/psi/gen/namedchars/test-165.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[:xdigit:]+
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/namedchars/test-166.regexp b/RegExpSupport/testData/psi/gen/namedchars/test-166.regexp
deleted file mode 100644
index 237832321aca..000000000000
--- a/RegExpSupport/testData/psi/gen/namedchars/test-166.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\p{unknown}+
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-23.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-23.regexp
deleted file mode 100644
index 621e0acdca33..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-23.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a?
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-24.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-24.regexp
deleted file mode 100644
index 73d5e2e5afc8..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-24.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a+
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-25.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-25.regexp
deleted file mode 100644
index 1b62325c13f0..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-25.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-26.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-26.regexp
deleted file mode 100644
index 4089fa4465de..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-26.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a??
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-27.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-27.regexp
deleted file mode 100644
index 0d61bcd373ae..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-27.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a+?
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-28.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-28.regexp
deleted file mode 100644
index ed61acd6a635..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-28.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a*?
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-29.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-29.regexp
deleted file mode 100644
index 30c029295402..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-29.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a?+
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-30.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-30.regexp
deleted file mode 100644
index 02290a794169..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-30.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a++
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-31.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-31.regexp
deleted file mode 100644
index 61a6919f86a7..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-31.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a*+
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-32.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-32.regexp
deleted file mode 100644
index ddc50bbfb0e6..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-32.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a**
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-33.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-33.regexp
deleted file mode 100644
index 1e3f71766f3b..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-33.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{2}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-34.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-34.regexp
deleted file mode 100644
index 70bf8c0d5e43..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-34.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{1,2}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-35.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-35.regexp
deleted file mode 100644
index db3920b15629..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-35.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{2,1}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-36.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-36.regexp
deleted file mode 100644
index fcd5bbf2cc15..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-36.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{0,1}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-37.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-37.regexp
deleted file mode 100644
index bad2ab0f153e..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-37.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{1,}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-38.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-38.regexp
deleted file mode 100644
index 7b318644d83e..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-38.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{0,}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-39.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-39.regexp
deleted file mode 100644
index 5ac31d8a4dd8..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-39.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{1}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-40.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-40.regexp
deleted file mode 100644
index d030e91f9b29..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-40.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{3,3}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-41.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-41.regexp
deleted file mode 100644
index a4d456bffa8c..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-41.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-42.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-42.regexp
deleted file mode 100644
index 04d961322748..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-42.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/quantifiers/test-43.regexp b/RegExpSupport/testData/psi/gen/quantifiers/test-43.regexp
deleted file mode 100644
index 8f0ede12302e..000000000000
--- a/RegExpSupport/testData/psi/gen/quantifiers/test-43.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/real-life/test-218.regexp b/RegExpSupport/testData/psi/gen/real-life/test-218.regexp
deleted file mode 100644
index f12e82f387af..000000000000
--- a/RegExpSupport/testData/psi/gen/real-life/test-218.regexp
+++ /dev/null
@@ -1 +0,0 @@
-x:found="(true|false)"
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/real-life/test-219.regexp b/RegExpSupport/testData/psi/gen/real-life/test-219.regexp
deleted file mode 100644
index d260a5d5ca1c..000000000000
--- a/RegExpSupport/testData/psi/gen/real-life/test-219.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(?:\s)|(?:/\*.*\*/)|(?://[^\n]*)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/real-life/test-220.regexp b/RegExpSupport/testData/psi/gen/real-life/test-220.regexp
deleted file mode 100644
index 72bf49f37bfa..000000000000
--- a/RegExpSupport/testData/psi/gen/real-life/test-220.regexp
+++ /dev/null
@@ -1 +0,0 @@
-((?:\p{Alpha}\:)?[0-9 a-z_A-Z\-\\./]+)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/real-life/test-221.regexp b/RegExpSupport/testData/psi/gen/real-life/test-221.regexp
deleted file mode 100644
index 6101caf8cc9a..000000000000
--- a/RegExpSupport/testData/psi/gen/real-life/test-221.regexp
+++ /dev/null
@@ -1 +0,0 @@
-^[\w\+\.\-]{2,}:
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/real-life/test-222.regexp b/RegExpSupport/testData/psi/gen/real-life/test-222.regexp
deleted file mode 100644
index 341fbffa2ddf..000000000000
--- a/RegExpSupport/testData/psi/gen/real-life/test-222.regexp
+++ /dev/null
@@ -1 +0,0 @@
-#(.*)$
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/real-life/test-223.regexp b/RegExpSupport/testData/psi/gen/real-life/test-223.regexp
deleted file mode 100644
index 82b5b02ccf3f..000000000000
--- a/RegExpSupport/testData/psi/gen/real-life/test-223.regexp
+++ /dev/null
@@ -1 +0,0 @@
-^(([^:]+)://)?([^:/]+)(:([0-9]+))?(/.*)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/real-life/test-224.regexp b/RegExpSupport/testData/psi/gen/real-life/test-224.regexp
deleted file mode 100644
index e2556bafd97f..000000000000
--- a/RegExpSupport/testData/psi/gen/real-life/test-224.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(([^:]+)://)?([^:/]+)(:([0-9]+))?(/.*)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/real-life/test-225.regexp b/RegExpSupport/testData/psi/gen/real-life/test-225.regexp
deleted file mode 100644
index 72478081e538..000000000000
--- a/RegExpSupport/testData/psi/gen/real-life/test-225.regexp
+++ /dev/null
@@ -1 +0,0 @@
-usd [+-]?[0-9]+.[0-9][0-9]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/real-life/test-226.regexp b/RegExpSupport/testData/psi/gen/real-life/test-226.regexp
deleted file mode 100644
index 6500c4c5fcff..000000000000
--- a/RegExpSupport/testData/psi/gen/real-life/test-226.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\b(\w+)(\s+\1)+\b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/real-life/test-227.regexp b/RegExpSupport/testData/psi/gen/real-life/test-227.regexp
deleted file mode 100644
index 708a4e880341..000000000000
--- a/RegExpSupport/testData/psi/gen/real-life/test-227.regexp
+++ /dev/null
@@ -1 +0,0 @@
-.*?(<(error|warning|info)(?: descr="((?:[^"\\]|\\")*)")?(?: type="([0-9A-Z_]+)")?(?: foreground="([0-9xa-f]+)")?(?: background="([0-9xa-f]+)")?(?: effectcolor="([0-9xa-f]+)")?(?: effecttype="([A-Z]+)")?(?: fonttype="([0-9]+)")?(/)?>)(.*)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/regressions/test-190.regexp b/RegExpSupport/testData/psi/gen/regressions/test-190.regexp
deleted file mode 100644
index f46d387bf94c..000000000000
--- a/RegExpSupport/testData/psi/gen/regressions/test-190.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/regressions/test-191.regexp b/RegExpSupport/testData/psi/gen/regressions/test-191.regexp
deleted file mode 100644
index 2866b7ca8bea..000000000000
--- a/RegExpSupport/testData/psi/gen/regressions/test-191.regexp
+++ /dev/null
@@ -1 +0,0 @@
-[^^]
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/regressions/test-192.regexp b/RegExpSupport/testData/psi/gen/regressions/test-192.regexp
deleted file mode 100644
index 9712c002e2b5..000000000000
--- a/RegExpSupport/testData/psi/gen/regressions/test-192.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a)b
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/regressions/test-193.regexp b/RegExpSupport/testData/psi/gen/regressions/test-193.regexp
deleted file mode 100644
index 573dfe79d8a0..000000000000
--- a/RegExpSupport/testData/psi/gen/regressions/test-193.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\s*@return(?:s)?\s*(?:(?:\{|:)?\s*(?([^\s\}]+)\s*\}?\s*)?(.*)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-1.regexp b/RegExpSupport/testData/psi/gen/simple/test-1.regexp
deleted file mode 100644
index a3871d450825..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-1.regexp
+++ /dev/null
@@ -1 +0,0 @@
-|
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-10.regexp b/RegExpSupport/testData/psi/gen/simple/test-10.regexp
deleted file mode 100644
index 85604e8e3267..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-10.regexp
+++ /dev/null
@@ -1 +0,0 @@
-ab?bc
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-11.regexp b/RegExpSupport/testData/psi/gen/simple/test-11.regexp
deleted file mode 100644
index 2d682d6eb100..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-11.regexp
+++ /dev/null
@@ -1 +0,0 @@
-ab?c
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-12.regexp b/RegExpSupport/testData/psi/gen/simple/test-12.regexp
deleted file mode 100644
index 6bc0e647512d..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-12.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a.c
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-13.regexp b/RegExpSupport/testData/psi/gen/simple/test-13.regexp
deleted file mode 100644
index 8327d324e351..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-13.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a.*c
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-14.regexp b/RegExpSupport/testData/psi/gen/simple/test-14.regexp
deleted file mode 100644
index d60ccecb32e5..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-14.regexp
+++ /dev/null
@@ -1 +0,0 @@
-*a
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-15.regexp b/RegExpSupport/testData/psi/gen/simple/test-15.regexp
deleted file mode 100644
index 5ac31d8a4dd8..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-15.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{1}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-16.regexp b/RegExpSupport/testData/psi/gen/simple/test-16.regexp
deleted file mode 100644
index 8f0ede12302e..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-16.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-17.regexp b/RegExpSupport/testData/psi/gen/simple/test-17.regexp
deleted file mode 100644
index a4d456bffa8c..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-17.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-18.regexp b/RegExpSupport/testData/psi/gen/simple/test-18.regexp
deleted file mode 100644
index 04d961322748..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-18.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-19.regexp b/RegExpSupport/testData/psi/gen/simple/test-19.regexp
deleted file mode 100644
index 064b76ba8700..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-19.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{1,}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-2.regexp b/RegExpSupport/testData/psi/gen/simple/test-2.regexp
deleted file mode 100644
index f15abef68928..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-2.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(|\$.*)\.class
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-20.regexp b/RegExpSupport/testData/psi/gen/simple/test-20.regexp
deleted file mode 100644
index 70bf8c0d5e43..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-20.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{1,2}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-21.regexp b/RegExpSupport/testData/psi/gen/simple/test-21.regexp
deleted file mode 100644
index 5d4a3b60940c..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-21.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a{1,foo}
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-22.regexp b/RegExpSupport/testData/psi/gen/simple/test-22.regexp
deleted file mode 100644
index 30a84ecdcb9f..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-22.regexp
+++ /dev/null
@@ -1 +0,0 @@
-\;
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-3.regexp b/RegExpSupport/testData/psi/gen/simple/test-3.regexp
deleted file mode 100644
index f2ba8f84ab5c..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-3.regexp
+++ /dev/null
@@ -1 +0,0 @@
-abc
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-4.regexp b/RegExpSupport/testData/psi/gen/simple/test-4.regexp
deleted file mode 100644
index 64368c75ab0a..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-4.regexp
+++ /dev/null
@@ -1 +0,0 @@
-multiple words of text
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-5.regexp b/RegExpSupport/testData/psi/gen/simple/test-5.regexp
deleted file mode 100644
index 18c7b561aee5..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-5.regexp
+++ /dev/null
@@ -1 +0,0 @@
-ab|cd
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-6.regexp b/RegExpSupport/testData/psi/gen/simple/test-6.regexp
deleted file mode 100644
index 1b62325c13f0..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-6.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-7.regexp b/RegExpSupport/testData/psi/gen/simple/test-7.regexp
deleted file mode 100644
index 7217bd21abb5..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-7.regexp
+++ /dev/null
@@ -1 +0,0 @@
-ab*c
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-8.regexp b/RegExpSupport/testData/psi/gen/simple/test-8.regexp
deleted file mode 100644
index 6faaddf02078..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-8.regexp
+++ /dev/null
@@ -1 +0,0 @@
-ab*bc
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/simple/test-9.regexp b/RegExpSupport/testData/psi/gen/simple/test-9.regexp
deleted file mode 100644
index 8c39c1ce7b37..000000000000
--- a/RegExpSupport/testData/psi/gen/simple/test-9.regexp
+++ /dev/null
@@ -1 +0,0 @@
-ab+bc
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-194.regexp b/RegExpSupport/testData/psi/gen/test-194.regexp
deleted file mode 100644
index ceb7eb874ecb..000000000000
--- a/RegExpSupport/testData/psi/gen/test-194.regexp
+++ /dev/null
@@ -1 +0,0 @@
-abc)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-195.regexp b/RegExpSupport/testData/psi/gen/test-195.regexp
deleted file mode 100644
index 5a8b47125e18..000000000000
--- a/RegExpSupport/testData/psi/gen/test-195.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(abc
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-196.regexp b/RegExpSupport/testData/psi/gen/test-196.regexp
deleted file mode 100644
index 65865c493ef4..000000000000
--- a/RegExpSupport/testData/psi/gen/test-196.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a+b+c
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-197.regexp b/RegExpSupport/testData/psi/gen/test-197.regexp
deleted file mode 100644
index ddc50bbfb0e6..000000000000
--- a/RegExpSupport/testData/psi/gen/test-197.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a**
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-198.regexp b/RegExpSupport/testData/psi/gen/test-198.regexp
deleted file mode 100644
index 02290a794169..000000000000
--- a/RegExpSupport/testData/psi/gen/test-198.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a++
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-199.regexp b/RegExpSupport/testData/psi/gen/test-199.regexp
deleted file mode 100644
index 3071219be370..000000000000
--- a/RegExpSupport/testData/psi/gen/test-199.regexp
+++ /dev/null
@@ -1 +0,0 @@
-ab*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-200.regexp b/RegExpSupport/testData/psi/gen/test-200.regexp
deleted file mode 100644
index 07aa75bcea3d..000000000000
--- a/RegExpSupport/testData/psi/gen/test-200.regexp
+++ /dev/null
@@ -1 +0,0 @@
-abcd*efg
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-201.regexp b/RegExpSupport/testData/psi/gen/test-201.regexp
deleted file mode 100644
index a9f7a97b437b..000000000000
--- a/RegExpSupport/testData/psi/gen/test-201.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a|b|c|d|e
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-202.regexp b/RegExpSupport/testData/psi/gen/test-202.regexp
deleted file mode 100644
index f93df417c95a..000000000000
--- a/RegExpSupport/testData/psi/gen/test-202.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(bc+d$|ef*g.|h?i(j|k))
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-203.regexp b/RegExpSupport/testData/psi/gen/test-203.regexp
deleted file mode 100644
index b1cbadd0ac36..000000000000
--- a/RegExpSupport/testData/psi/gen/test-203.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a*(b*c*)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-204.regexp b/RegExpSupport/testData/psi/gen/test-204.regexp
deleted file mode 100644
index ad4b70769ae2..000000000000
--- a/RegExpSupport/testData/psi/gen/test-204.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a?b+c*
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-205.regexp b/RegExpSupport/testData/psi/gen/test-205.regexp
deleted file mode 100644
index 90e2ddefe35d..000000000000
--- a/RegExpSupport/testData/psi/gen/test-205.regexp
+++ /dev/null
@@ -1 +0,0 @@
-i am a green (giant|man|martian)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-206.regexp b/RegExpSupport/testData/psi/gen/test-206.regexp
deleted file mode 100644
index 5ba6e66b65b5..000000000000
--- a/RegExpSupport/testData/psi/gen/test-206.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(wee|week)(knights|knight)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-207.regexp b/RegExpSupport/testData/psi/gen/test-207.regexp
deleted file mode 100644
index 093a5aaea05b..000000000000
--- a/RegExpSupport/testData/psi/gen/test-207.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(a.*b)(a.*b)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-208.regexp b/RegExpSupport/testData/psi/gen/test-208.regexp
deleted file mode 100644
index fc18144d0c4b..000000000000
--- a/RegExpSupport/testData/psi/gen/test-208.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(\s*\w+)?
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-209.regexp b/RegExpSupport/testData/psi/gen/test-209.regexp
deleted file mode 100644
index 1ac3ea2e4656..000000000000
--- a/RegExpSupport/testData/psi/gen/test-209.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(?:a)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-210.regexp b/RegExpSupport/testData/psi/gen/test-210.regexp
deleted file mode 100644
index c2c5886df451..000000000000
--- a/RegExpSupport/testData/psi/gen/test-210.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(?:\w)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-211.regexp b/RegExpSupport/testData/psi/gen/test-211.regexp
deleted file mode 100644
index c537a30ed32a..000000000000
--- a/RegExpSupport/testData/psi/gen/test-211.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(?:\w\s\w)+
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-212.regexp b/RegExpSupport/testData/psi/gen/test-212.regexp
deleted file mode 100644
index 346accc1daf7..000000000000
--- a/RegExpSupport/testData/psi/gen/test-212.regexp
+++ /dev/null
@@ -1 +0,0 @@
-(a\w)(?:,(a\w))+
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-213.regexp b/RegExpSupport/testData/psi/gen/test-213.regexp
deleted file mode 100644
index 5f908f51b18a..000000000000
--- a/RegExpSupport/testData/psi/gen/test-213.regexp
+++ /dev/null
@@ -1 +0,0 @@
-abc.*?x+yz
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-214.regexp b/RegExpSupport/testData/psi/gen/test-214.regexp
deleted file mode 100644
index 092d02946583..000000000000
--- a/RegExpSupport/testData/psi/gen/test-214.regexp
+++ /dev/null
@@ -1 +0,0 @@
-abc.+?x+yz
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-215.regexp b/RegExpSupport/testData/psi/gen/test-215.regexp
deleted file mode 100644
index b1f6f0b2f8ea..000000000000
--- a/RegExpSupport/testData/psi/gen/test-215.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a.+?(c|d)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-216.regexp b/RegExpSupport/testData/psi/gen/test-216.regexp
deleted file mode 100644
index 0f0692460442..000000000000
--- a/RegExpSupport/testData/psi/gen/test-216.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a.+(c|d)
\ No newline at end of file
diff --git a/RegExpSupport/testData/psi/gen/test-217.regexp b/RegExpSupport/testData/psi/gen/test-217.regexp
deleted file mode 100644
index 7b29151067a0..000000000000
--- a/RegExpSupport/testData/psi/gen/test-217.regexp
+++ /dev/null
@@ -1 +0,0 @@
-a+?b+?c+?
\ No newline at end of file