diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index 9a8b5868550f..9a301ff8c3f0 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -504,6 +504,7 @@
+
diff --git a/.idea/libraries/pty4j.xml b/.idea/libraries/pty4j.xml
index b47e771e3700..20840ccf322c 100644
--- a/.idea/libraries/pty4j.xml
+++ b/.idea/libraries/pty4j.xml
@@ -1,12 +1,22 @@
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/purejavacomm.xml b/.idea/libraries/purejavacomm.xml
deleted file mode 100644
index 07752feef813..000000000000
--- a/.idea/libraries/purejavacomm.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/sa_jdwp.xml b/.idea/libraries/sa_jdwp.xml
index 9356ede057ee..d240560985a7 100644
--- a/.idea/libraries/sa_jdwp.xml
+++ b/.idea/libraries/sa_jdwp.xml
@@ -1,12 +1,12 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java b/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java
index 8b0d0e92ad2a..01115b5d5a33 100644
--- a/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java
+++ b/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java
@@ -65,15 +65,15 @@ class _RegExLexer implements FlexLexer {
* Translates characters to character classes
*/
private static final String ZZ_CMAP_PACKED =
- "\10\0\2\61\1\76\1\0\1\61\1\76\22\0\1\14\1\74\1\0"+
- "\1\75\1\16\1\0\1\72\1\64\1\2\1\3\1\20\1\21\1\56"+
- "\1\13\1\1\1\0\1\53\3\55\4\54\2\47\1\70\1\0\1\63"+
- "\1\71\1\73\1\17\1\0\1\30\1\30\1\37\1\35\1\45\1\46"+
- "\1\31\1\57\1\40\2\66\1\44\1\67\1\60\1\66\1\42\1\50"+
- "\1\65\1\34\1\66\1\43\1\33\1\33\1\33\1\66\1\32\1\6"+
+ "\10\0\2\61\1\76\1\0\1\61\1\76\22\0\1\14\1\75\1\0"+
+ "\1\72\1\16\1\0\1\71\1\64\1\2\1\3\1\20\1\21\1\56"+
+ "\1\13\1\1\1\0\1\53\3\55\4\54\2\47\1\67\1\0\1\63"+
+ "\1\70\1\74\1\17\1\0\1\30\1\30\1\37\1\35\1\45\1\46"+
+ "\1\31\1\57\1\40\2\73\1\44\1\66\1\60\1\73\1\42\1\50"+
+ "\1\65\1\34\1\73\1\43\1\33\1\33\1\33\1\73\1\32\1\6"+
"\1\10\1\7\1\23\1\12\1\0\1\25\1\26\1\36\1\35\1\25"+
- "\1\25\1\27\1\57\1\40\1\66\1\62\1\43\1\66\1\24\1\66"+
- "\1\41\1\66\1\24\1\33\1\24\1\52\1\33\1\33\1\51\1\66"+
+ "\1\25\1\27\1\57\1\40\1\73\1\62\1\43\1\73\1\24\1\73"+
+ "\1\41\1\73\1\24\1\33\1\24\1\52\1\33\1\33\1\51\1\73"+
"\1\31\1\4\1\22\1\5\54\0\1\11\12\0\1\11\4\0\1\11"+
"\5\0\27\11\1\0\37\11\1\0\u01ca\11\4\0\14\11\16\0\5\11"+
"\7\0\1\11\1\0\1\11\201\0\5\11\1\0\2\11\2\0\4\11"+
@@ -215,24 +215,24 @@ class _RegExLexer implements FlexLexer {
"\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16"+
"\1\17\1\20\1\21\1\22\1\23\1\2\1\24\1\25"+
"\1\26\1\27\1\30\1\31\2\32\1\33\1\34\1\35"+
- "\1\33\1\36\1\37\1\40\1\12\1\41\1\2\1\42"+
- "\1\12\1\43\1\44\1\45\1\46\1\47\1\50\1\1"+
- "\1\26\1\51\1\52\1\53\1\54\3\53\1\26\1\53"+
- "\1\26\1\53\1\55\1\56\2\0\1\57\1\60\1\61"+
- "\1\62\1\63\1\64\1\65\1\66\1\67\1\12\1\67"+
- "\1\70\2\71\1\72\1\73\1\12\1\74\1\75\1\76"+
- "\1\77\1\100\1\101\1\102\1\12\1\103\1\104\1\105"+
- "\1\106\1\107\1\110\1\111\1\112\1\113\1\114\1\115"+
- "\1\0\1\116\2\26\1\117\2\55\1\120\1\0\1\121"+
- "\1\122\1\123\1\124\1\125\1\126\1\0\1\127\1\0"+
- "\1\130\4\0\1\131\1\132\1\133\1\74\1\134\1\135"+
- "\1\136\1\137\2\140\1\141\1\142\1\143\1\144\1\145"+
- "\1\146\1\147\1\150\1\0\1\151\1\152\1\0\1\153"+
- "\2\0\1\74\1\154\1\137\2\140\1\155\1\156\1\137"+
- "\1\157\1\160";
+ "\1\33\1\36\1\37\1\40\1\12\1\41\1\42\1\43"+
+ "\1\2\1\44\1\45\1\24\1\46\1\47\1\50\1\51"+
+ "\1\52\1\53\1\26\1\54\1\55\1\56\1\57\3\56"+
+ "\1\26\1\56\1\26\1\56\1\60\1\61\2\0\1\62"+
+ "\1\63\1\64\1\65\1\66\1\67\1\70\1\71\1\72"+
+ "\1\12\1\72\1\73\2\74\1\75\1\76\1\12\1\77"+
+ "\1\100\1\101\1\102\1\103\1\104\1\105\1\12\1\106"+
+ "\1\107\1\110\1\111\1\112\1\113\1\114\1\115\1\116"+
+ "\1\117\1\120\1\121\1\0\1\122\2\26\1\123\2\60"+
+ "\1\124\1\0\1\125\1\126\1\127\1\130\1\0\1\131"+
+ "\1\132\1\133\1\0\1\134\4\0\1\135\1\136\1\137"+
+ "\1\77\1\140\1\141\1\142\1\143\2\144\1\145\1\146"+
+ "\1\147\1\150\1\151\1\152\1\153\1\154\1\0\1\155"+
+ "\1\156\1\0\1\157\2\0\1\77\1\160\1\143\2\144"+
+ "\1\161\1\162\1\143\1\163\1\164";
private static int [] zzUnpackAction() {
- int [] result = new int[176];
+ int [] result = new int[179];
int offset = 0;
offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
return result;
@@ -264,24 +264,25 @@ class _RegExLexer implements FlexLexer {
"\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u0627\0\u04ec"+
"\0\u04ec\0\u0666\0\u06a5\0\u04ec\0\u04ec\0\u04ec\0\u0627\0\u04ec"+
"\0\u06e4\0\u04ec\0\u0723\0\u04ec\0\u0762\0\u04ec\0\u07a1\0\u04ec"+
- "\0\u07e0\0\u04ec\0\u081f\0\u04ec\0\u04ec\0\u04ec\0\u085e\0\u089d"+
- "\0\u04ec\0\u04ec\0\u08dc\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u091b"+
- "\0\u095a\0\u0999\0\u09d8\0\u0a17\0\u0a56\0\u0a95\0\u0ad4\0\u0b13"+
- "\0\u0b52\0\u0b91\0\u04ec\0\u04ec\0\u04ec\0\u0bd0\0\u04ec\0\u04ec"+
- "\0\u04ec\0\u04ec\0\u0c0f\0\u0c4e\0\u04ec\0\u04ec\0\u0c8d\0\u04ec"+
- "\0\u04ec\0\u04ec\0\u04ec\0\u0ccc\0\u04ec\0\u0d0b\0\u0d4a\0\u0d89"+
- "\0\u04ec\0\u04ec\0\u0dc8\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec"+
- "\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u0e07\0\u04ec"+
- "\0\u0e46\0\u04ec\0\u04ec\0\u04ec\0\u0e85\0\u04ec\0\u0ec4\0\u0f03"+
- "\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u0f42\0\u04ec\0\u0f81"+
- "\0\u04ec\0\u0fc0\0\u0fff\0\u103e\0\u107d\0\u04ec\0\u04ec\0\u04ec"+
- "\0\u10bc\0\u04ec\0\u10fb\0\u04ec\0\u113a\0\u1179\0\u11b8\0\u04ec"+
- "\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u11f7"+
- "\0\u04ec\0\u04ec\0\u1236\0\u04ec\0\u1275\0\u12b4\0\u04ec\0\u04ec"+
- "\0\u12f3\0\u1332\0\u04ec\0\u04ec\0\u04ec\0\u1371\0\u04ec\0\u04ec";
+ "\0\u04ec\0\u04ec\0\u07e0\0\u04ec\0\u04ec\0\u081f\0\u04ec\0\u04ec"+
+ "\0\u04ec\0\u085e\0\u089d\0\u04ec\0\u08dc\0\u04ec\0\u04ec\0\u04ec"+
+ "\0\u04ec\0\u091b\0\u095a\0\u0999\0\u09d8\0\u0a17\0\u0a56\0\u0a95"+
+ "\0\u0ad4\0\u0b13\0\u0b52\0\u0b91\0\u04ec\0\u04ec\0\u04ec\0\u0bd0"+
+ "\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u0c0f\0\u0c4e\0\u04ec\0\u04ec"+
+ "\0\u0c8d\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u0ccc\0\u04ec\0\u0d0b"+
+ "\0\u0d4a\0\u0d89\0\u04ec\0\u04ec\0\u0dc8\0\u04ec\0\u04ec\0\u04ec"+
+ "\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec"+
+ "\0\u04ec\0\u0e07\0\u04ec\0\u0e46\0\u04ec\0\u04ec\0\u04ec\0\u0e85"+
+ "\0\u04ec\0\u0ec4\0\u0f03\0\u04ec\0\u04ec\0\u04ec\0\u0f42\0\u04ec"+
+ "\0\u04ec\0\u04ec\0\u0f81\0\u04ec\0\u0fc0\0\u0fff\0\u103e\0\u107d"+
+ "\0\u04ec\0\u04ec\0\u04ec\0\u10bc\0\u04ec\0\u10fb\0\u04ec\0\u113a"+
+ "\0\u1179\0\u11b8\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec"+
+ "\0\u04ec\0\u04ec\0\u11f7\0\u04ec\0\u04ec\0\u1236\0\u04ec\0\u1275"+
+ "\0\u12b4\0\u04ec\0\u04ec\0\u12f3\0\u1332\0\u04ec\0\u04ec\0\u04ec"+
+ "\0\u1371\0\u04ec\0\u04ec";
private static int [] zzUnpackRowMap() {
- int [] result = new int[176];
+ int [] result = new int[179];
int offset = 0;
offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
return result;
@@ -306,94 +307,99 @@ class _RegExLexer implements FlexLexer {
private static final String ZZ_TRANS_PACKED_0 =
"\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34"+
"\1\35\3\25\1\36\1\25\1\37\1\40\1\41\1\42"+
- "\1\43\1\44\35\25\1\45\13\25\1\46\1\45\10\25"+
- "\1\47\66\25\5\50\1\51\3\50\1\52\11\50\1\44"+
- "\23\52\1\50\3\52\4\50\2\52\1\50\1\52\2\50"+
- "\3\52\14\50\1\51\7\50\1\53\31\50\1\53\3\50"+
- "\3\53\1\54\20\50\23\0\1\55\53\0\10\56\1\57"+
- "\66\56\6\60\1\61\1\62\1\63\3\60\1\64\44\60"+
- "\1\64\14\60\1\64\6\25\1\65\1\66\1\67\2\25"+
- "\1\70\1\36\44\25\1\45\10\25\1\71\3\25\1\45"+
- "\4\50\1\72\3\50\1\73\21\50\1\74\1\50\1\74"+
- "\2\50\1\74\2\50\1\74\1\50\1\74\13\50\1\74"+
- "\6\50\1\74\13\50\1\72\3\50\1\73\66\50\3\75"+
- "\1\76\5\75\1\77\1\75\1\100\10\75\23\77\1\75"+
- "\3\77\4\75\2\77\1\75\1\77\2\75\3\77\1\101"+
- "\6\75\76\14\1\102\10\75\3\103\3\75\1\103\5\75"+
- "\23\103\1\75\3\103\4\75\2\103\1\75\1\103\2\75"+
- "\3\103\3\75\1\104\13\75\3\103\3\75\1\103\5\75"+
- "\23\103\1\75\3\103\4\75\2\103\1\75\1\103\1\75"+
- "\1\105\3\103\12\75\1\76\4\75\3\103\3\75\1\103"+
- "\5\75\23\103\1\75\3\103\4\75\2\103\1\75\1\103"+
- "\2\75\3\103\12\75\1\76\4\75\3\103\2\75\1\53"+
- "\1\103\5\75\23\103\1\53\3\103\3\53\1\75\2\103"+
- "\1\75\1\103\2\75\3\103\7\75\11\106\1\52\11\106"+
- "\1\44\23\52\1\106\3\52\4\106\2\52\1\106\1\52"+
- "\1\107\1\106\3\52\1\110\2\106\1\107\3\106\1\111"+
- "\1\112\7\111\1\113\12\111\23\113\1\111\3\113\4\111"+
- "\2\113\1\111\1\113\2\111\3\113\7\111\11\114\1\115"+
- "\12\114\23\115\1\114\3\115\4\114\2\115\1\114\1\115"+
- "\2\114\3\115\1\114\1\116\5\114\4\0\1\117\210\0"+
- "\1\120\74\0\1\121\31\0\1\121\3\0\3\121\1\122"+
- "\43\0\1\123\53\0\1\124\3\125\1\126\1\127\1\125"+
- "\1\124\1\125\2\124\1\130\1\131\1\124\6\125\2\132"+
- "\1\133\1\134\3\135\3\136\1\137\2\140\2\141\3\142"+
- "\1\143\1\144\1\145\1\146\1\147\1\150\2\144\1\124"+
- "\1\151\1\152\1\131\1\153\2\124\1\136\2\143\6\124"+
- "\1\131\45\0\1\154\33\0\2\52\5\0\5\52\6\0"+
- "\32\52\1\0\2\52\1\0\1\52\2\0\3\52\24\0"+
- "\1\53\31\0\1\53\3\0\3\53\22\0\1\155\21\0"+
- "\1\156\44\0\1\157\1\155\14\0\1\160\13\0\1\161"+
- "\24\0\1\162\27\0\1\163\21\0\1\164\44\0\2\163"+
- "\5\0\6\124\3\125\2\124\1\130\1\131\7\124\3\132"+
- "\4\143\3\136\1\137\2\140\2\141\3\142\1\143\1\144"+
- "\1\145\1\146\1\147\1\150\2\144\1\124\1\151\1\152"+
- "\1\131\1\143\2\124\3\143\6\124\1\131\72\0\1\165"+
- "\4\0\6\124\1\125\1\124\1\125\2\124\1\130\1\131"+
- "\7\124\2\132\5\143\3\136\1\137\2\140\2\141\3\142"+
- "\1\143\1\144\1\145\1\146\1\147\1\150\2\144\1\124"+
- "\1\151\1\152\1\131\1\143\2\124\3\143\6\124\1\131"+
- "\11\0\1\77\12\0\23\77\1\0\3\77\4\0\2\77"+
- "\1\0\1\77\2\0\3\77\20\0\1\100\12\0\23\100"+
- "\1\0\3\100\4\0\2\100\1\0\1\100\2\0\3\100"+
- "\17\0\7\103\5\0\32\103\1\0\2\103\1\0\1\103"+
- "\2\0\3\103\16\0\1\166\70\0\1\167\76\0\1\167"+
- "\5\0\1\170\70\0\1\167\7\0\1\171\1\0\1\171"+
- "\1\0\1\172\6\0\23\171\1\172\3\171\3\172\1\0"+
- "\2\171\1\0\1\171\2\0\3\171\100\0\1\167\7\0"+
+ "\1\43\1\44\35\25\1\45\10\25\1\46\3\25\1\45"+
+ "\10\25\1\47\66\25\5\50\1\51\3\50\1\52\11\50"+
+ "\1\44\23\52\1\50\3\52\4\50\2\52\1\50\1\52"+
+ "\2\50\2\52\4\50\1\52\10\50\1\51\7\50\1\53"+
+ "\31\50\1\53\3\50\3\53\1\54\20\50\23\0\1\55"+
+ "\53\0\10\56\1\57\66\56\6\60\1\61\1\62\1\63"+
+ "\3\60\1\64\44\60\1\64\14\60\1\64\6\25\1\65"+
+ "\1\66\1\67\2\25\1\70\1\71\44\25\1\72\7\25"+
+ "\1\73\1\74\3\25\1\72\4\50\1\75\3\50\1\76"+
+ "\21\50\1\77\1\50\1\77\2\50\1\77\2\50\1\77"+
+ "\1\50\1\77\13\50\1\77\5\50\1\77\14\50\1\75"+
+ "\3\50\1\76\66\50\3\100\1\101\5\100\1\102\1\100"+
+ "\1\103\10\100\23\102\1\100\3\102\4\100\2\102\1\100"+
+ "\1\102\2\100\2\102\1\104\3\100\1\102\3\100\76\14"+
+ "\1\0\10\100\3\105\3\100\1\105\5\100\23\105\1\100"+
+ "\3\105\4\100\2\105\1\100\1\105\2\100\2\105\4\100"+
+ "\1\105\1\106\12\100\3\105\3\100\1\105\5\100\23\105"+
+ "\1\100\3\105\4\100\2\105\1\100\1\105\1\100\1\107"+
+ "\2\105\4\100\1\105\6\100\1\101\4\100\3\105\3\100"+
+ "\1\105\5\100\23\105\1\100\3\105\4\100\2\105\1\100"+
+ "\1\105\2\100\2\105\4\100\1\105\6\100\1\101\4\100"+
+ "\3\105\2\100\1\53\1\105\5\100\23\105\1\53\3\105"+
+ "\3\53\1\100\2\105\1\100\1\105\2\100\2\105\4\100"+
+ "\1\105\3\100\11\110\1\52\11\110\1\44\23\52\1\110"+
+ "\3\52\4\110\2\52\1\110\1\52\1\111\1\110\2\52"+
+ "\1\112\3\110\1\52\1\111\2\110\1\113\1\114\7\113"+
+ "\1\115\12\113\23\115\1\113\3\115\4\113\2\115\1\113"+
+ "\1\115\2\113\2\115\4\113\1\115\3\113\11\116\1\117"+
+ "\12\116\23\117\1\116\3\117\4\116\2\117\1\116\1\117"+
+ "\2\116\2\117\1\116\1\120\2\116\1\117\3\116\4\0"+
+ "\1\121\210\0\1\122\74\0\1\123\31\0\1\123\3\0"+
+ "\3\123\1\124\43\0\1\125\53\0\1\126\3\127\1\130"+
+ "\1\131\1\127\1\126\1\127\2\126\1\132\1\133\1\126"+
+ "\6\127\2\134\1\135\1\136\3\137\3\140\1\141\2\142"+
+ "\2\143\3\144\1\145\1\146\1\147\1\150\1\151\1\152"+
+ "\2\146\1\126\1\153\1\154\1\133\1\155\2\126\1\140"+
+ "\1\145\4\126\1\145\2\126\1\133\45\0\1\156\33\0"+
"\2\52\5\0\5\52\6\0\32\52\1\0\2\52\1\0"+
- "\1\52\2\0\3\52\1\0\1\167\14\0\1\173\61\0"+
- "\1\167\12\0\1\174\17\0\2\175\1\0\1\175\4\0"+
- "\3\175\5\0\3\175\3\0\3\175\23\0\1\176\37\0"+
- "\1\177\20\0\1\200\1\201\3\0\1\202\1\203\1\0"+
- "\1\204\1\205\1\206\6\0\1\207\7\0\1\121\31\0"+
- "\1\121\3\0\3\121\1\210\25\0\1\211\7\0\1\212"+
- "\31\0\1\212\3\0\3\212\36\0\1\213\31\0\1\213"+
- "\3\0\3\213\1\214\24\0\1\215\155\0\1\216\1\217"+
- "\12\0\77\220\47\0\1\221\3\0\3\221\25\0\1\222"+
- "\20\0\2\223\1\0\1\223\4\0\3\223\5\0\3\223"+
- "\3\0\3\223\25\0\1\224\20\0\2\225\1\0\1\225"+
- "\4\0\3\225\5\0\3\225\3\0\3\225\74\0\1\226"+
- "\1\227\1\226\104\0\1\230\1\231\21\0\1\232\100\0"+
- "\1\171\1\0\1\171\1\0\1\172\6\0\23\171\1\172"+
- "\3\171\3\172\1\0\2\171\1\0\1\171\2\0\3\171"+
- "\14\0\1\233\17\0\2\175\1\0\1\175\4\0\3\175"+
- "\5\0\3\175\3\0\3\175\104\0\1\234\5\0\1\235"+
- "\76\0\1\236\2\0\1\237\2\0\3\240\1\0\73\240"+
- "\5\0\1\207\7\0\1\210\31\0\1\210\3\0\3\210"+
- "\26\0\1\241\7\0\1\212\31\0\1\212\3\0\3\212"+
- "\26\0\1\242\7\0\1\213\31\0\1\213\3\0\3\213"+
- "\1\243\25\0\1\244\7\0\1\245\31\0\1\245\3\0"+
- "\3\245\50\0\1\246\116\0\1\247\3\0\3\247\46\0"+
- "\2\250\1\0\1\250\4\0\3\250\5\0\3\250\3\0"+
- "\3\250\46\0\2\251\1\0\1\251\4\0\3\251\5\0"+
- "\3\251\3\0\3\251\74\0\3\252\74\0\3\253\21\0"+
- "\3\240\1\254\73\240\5\0\1\242\7\0\1\243\31\0"+
- "\1\243\3\0\3\243\26\0\1\255\7\0\1\245\31\0"+
- "\1\245\3\0\3\245\26\0\1\135\116\0\2\256\1\0"+
- "\1\256\4\0\3\256\5\0\3\256\3\0\3\256\74\0"+
- "\3\257\46\0\2\260\1\0\1\260\4\0\3\260\5\0"+
- "\3\260\3\0\3\260\21\0";
+ "\1\52\2\0\2\52\4\0\1\52\20\0\1\53\31\0"+
+ "\1\53\3\0\3\53\22\0\1\157\21\0\1\160\43\0"+
+ "\1\161\1\157\15\0\1\162\13\0\1\163\24\0\1\164"+
+ "\27\0\1\165\21\0\1\166\43\0\2\165\6\0\6\126"+
+ "\3\127\2\126\1\132\1\167\7\126\3\134\4\145\3\140"+
+ "\1\141\2\142\2\143\3\144\1\145\1\146\1\147\1\150"+
+ "\1\151\1\152\2\146\1\126\1\153\1\154\1\167\1\145"+
+ "\2\126\2\145\4\126\1\145\2\126\1\167\71\0\1\170"+
+ "\5\0\6\126\1\127\1\126\1\127\2\126\1\132\10\126"+
+ "\2\134\5\145\3\140\1\141\2\142\2\143\3\144\1\145"+
+ "\1\146\1\147\1\150\1\151\1\152\2\146\1\126\1\153"+
+ "\1\154\1\126\1\145\2\126\2\145\4\126\1\145\3\126"+
+ "\11\0\1\102\12\0\23\102\1\0\3\102\4\0\2\102"+
+ "\1\0\1\102\2\0\2\102\4\0\1\102\14\0\1\103"+
+ "\12\0\23\103\1\0\3\103\4\0\2\103\1\0\1\103"+
+ "\2\0\2\103\4\0\1\103\13\0\7\105\5\0\32\105"+
+ "\1\0\2\105\1\0\1\105\2\0\2\105\4\0\1\105"+
+ "\12\0\1\171\70\0\1\172\76\0\1\172\5\0\1\173"+
+ "\70\0\1\172\7\0\1\174\1\0\1\174\1\0\1\175"+
+ "\6\0\23\174\1\175\3\174\3\175\1\0\2\174\1\0"+
+ "\1\174\2\0\2\174\4\0\1\174\73\0\1\172\10\0"+
+ "\2\52\5\0\5\52\6\0\32\52\1\0\2\52\1\0"+
+ "\1\52\2\0\2\52\1\0\1\172\2\0\1\52\12\0"+
+ "\1\176\60\0\1\172\13\0\1\177\17\0\2\200\1\0"+
+ "\1\200\4\0\3\200\5\0\3\200\3\0\3\200\23\0"+
+ "\1\201\37\0\1\202\20\0\1\203\1\204\2\0\1\205"+
+ "\1\206\1\0\1\207\1\0\1\210\1\211\6\0\1\212"+
+ "\7\0\1\123\31\0\1\123\3\0\3\123\1\213\25\0"+
+ "\1\214\7\0\1\215\31\0\1\215\3\0\3\215\36\0"+
+ "\1\216\31\0\1\216\3\0\3\216\1\217\24\0\1\220"+
+ "\155\0\1\221\1\222\12\0\77\223\47\0\1\224\3\0"+
+ "\3\224\25\0\1\225\20\0\2\226\1\0\1\226\4\0"+
+ "\3\226\5\0\3\226\3\0\3\226\25\0\1\227\20\0"+
+ "\2\230\1\0\1\230\4\0\3\230\5\0\3\230\3\0"+
+ "\3\230\74\0\1\231\1\232\1\231\104\0\1\233\1\234"+
+ "\21\0\1\235\100\0\1\174\1\0\1\174\1\0\1\175"+
+ "\6\0\23\174\1\175\3\174\3\175\1\0\2\174\1\0"+
+ "\1\174\2\0\2\174\4\0\1\174\10\0\1\236\17\0"+
+ "\2\200\1\0\1\200\4\0\3\200\5\0\3\200\3\0"+
+ "\3\200\104\0\1\237\4\0\1\240\76\0\1\241\4\0"+
+ "\1\242\1\0\3\243\1\0\73\243\5\0\1\212\7\0"+
+ "\1\213\31\0\1\213\3\0\3\213\26\0\1\244\7\0"+
+ "\1\215\31\0\1\215\3\0\3\215\26\0\1\245\7\0"+
+ "\1\216\31\0\1\216\3\0\3\216\1\246\25\0\1\247"+
+ "\7\0\1\250\31\0\1\250\3\0\3\250\50\0\1\251"+
+ "\116\0\1\252\3\0\3\252\46\0\2\253\1\0\1\253"+
+ "\4\0\3\253\5\0\3\253\3\0\3\253\46\0\2\254"+
+ "\1\0\1\254\4\0\3\254\5\0\3\254\3\0\3\254"+
+ "\74\0\3\255\74\0\3\256\21\0\3\243\1\257\73\243"+
+ "\5\0\1\245\7\0\1\246\31\0\1\246\3\0\3\246"+
+ "\26\0\1\260\7\0\1\250\31\0\1\250\3\0\3\250"+
+ "\26\0\1\137\116\0\2\261\1\0\1\261\4\0\3\261"+
+ "\5\0\3\261\3\0\3\261\74\0\3\262\46\0\2\263"+
+ "\1\0\1\263\4\0\3\263\5\0\3\263\3\0\3\263"+
+ "\21\0";
private static int [] zzUnpackTrans() {
int [] result = new int[5040];
@@ -437,16 +443,16 @@ class _RegExLexer implements FlexLexer {
"\13\0\1\1\10\0\2\11\1\1\1\11\1\1\1\11"+
"\1\1\1\11\1\1\11\11\1\1\2\11\2\1\3\11"+
"\1\1\1\11\1\1\1\11\1\1\1\11\1\1\1\11"+
- "\1\1\1\11\1\1\1\11\1\1\3\11\2\1\2\11"+
+ "\1\1\3\11\1\1\2\11\1\1\3\11\2\1\1\11"+
"\1\1\4\11\11\1\2\0\3\11\1\1\4\11\2\1"+
"\2\11\1\1\4\11\1\1\1\11\3\1\2\11\1\1"+
- "\13\11\1\0\1\11\1\1\3\11\1\1\1\11\1\0"+
- "\1\1\5\11\1\0\1\11\1\0\1\11\4\0\3\11"+
+ "\14\11\1\0\1\11\1\1\3\11\1\1\1\11\1\0"+
+ "\1\1\3\11\1\0\3\11\1\0\1\11\4\0\3\11"+
"\1\1\1\11\1\1\1\11\3\1\10\11\1\0\2\11"+
"\1\0\1\11\2\0\2\11\2\1\3\11\1\1\2\11";
private static int [] zzUnpackAttribute() {
- int [] result = new int[176];
+ int [] result = new int[179];
int offset = 0;
offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
return result;
@@ -526,6 +532,7 @@ class _RegExLexer implements FlexLexer {
private boolean allowMysqlBracketExpressions;
private int maxOctal = 0777;
private int minOctalDigits = 1;
+ private boolean whitespaceInClass;
_RegExLexer(EnumSet capabilities) {
this((java.io.Reader)null);
@@ -557,6 +564,7 @@ class _RegExLexer implements FlexLexer {
}
this.allowExtendedUnicodeCharacter = capabilities.contains(EXTENDED_UNICODE_CHARACTER);
this.allowOneHexCharEscape = capabilities.contains(ONE_HEX_CHAR_ESCAPE);
+ this.whitespaceInClass = capabilities.contains(WHITESPACE_IN_CLASS);
}
private void yypushstate(int state) {
@@ -826,243 +834,255 @@ class _RegExLexer implements FlexLexer {
case 1:
{ yypopstate(); return RegExpTT.COMMENT;
}
- case 113: break;
+ case 117: break;
case 2:
{ return RegExpTT.CHARACTER;
}
- case 114: break;
+ case 118: break;
case 3:
{ return RegExpTT.DOT;
}
- case 115: break;
+ case 119: break;
case 4:
{ capturingGroupCount++; return RegExpTT.GROUP_BEGIN;
}
- case 116: break;
+ case 120: break;
case 5:
{ return RegExpTT.GROUP_END;
}
- case 117: break;
+ case 121: break;
case 6:
{ if (allowDanglingMetacharacters != Boolean.TRUE) { yypushstate(QUANTIFIER); return RegExpTT.LBRACE; } return RegExpTT.CHARACTER;
}
- case 118: break;
+ case 122: break;
case 7:
{ return (allowDanglingMetacharacters != Boolean.FALSE) ? RegExpTT.CHARACTER : RegExpTT.RBRACE;
}
- case 119: break;
+ case 123: break;
case 8:
{ yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN;
}
- case 120: break;
+ case 124: break;
case 9:
{ return allowDanglingMetacharacters == Boolean.FALSE ? RegExpTT.CLASS_END : RegExpTT.CHARACTER;
}
- case 121: break;
+ case 125: break;
case 10:
{ return StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN;
}
- case 122: break;
+ case 126: break;
case 11:
{ return commentMode ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CHARACTER;
}
- case 123: break;
+ case 127: break;
case 12:
{ return RegExpTT.DOLLAR;
}
- case 124: break;
+ case 128: break;
case 13:
{ return RegExpTT.QUEST;
}
- case 125: break;
+ case 129: break;
case 14:
{ return RegExpTT.STAR;
}
- case 126: break;
+ case 130: break;
case 15:
{ return RegExpTT.PLUS;
}
- case 127: break;
+ case 131: break;
case 16:
{ return RegExpTT.UNION;
}
- case 128: break;
+ case 132: break;
case 17:
{ return RegExpTT.CARET;
}
- case 129: break;
+ case 133: break;
case 18:
{ return commentMode ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CTRL_CHARACTER;
}
- case 130: break;
+ case 134: break;
case 19:
- { if (commentMode) { yypushstate(COMMENT); return RegExpTT.COMMENT; } else return RegExpTT.CHARACTER;
+ { if (commentMode) { yypushstate(COMMENT); } else return RegExpTT.CHARACTER;
}
- case 131: break;
+ case 135: break;
case 20:
{ yypopstate(); yypushback(1);
}
- case 132: break;
+ case 136: break;
case 21:
{ yypopstate(); return RegExpTT.RBRACE;
}
- case 133: break;
+ case 137: break;
case 22:
{ return RegExpTT.NAME;
}
- case 134: break;
+ case 138: break;
case 23:
{ return RegExpTT.NUMBER;
}
- case 135: break;
+ case 139: break;
case 24:
{ return RegExpTT.COMMA;
}
- case 136: break;
+ case 140: break;
case 25:
{ yybegin(CLASS1); return RegExpTT.CARET;
}
- case 137: break;
+ case 141: break;
case 26:
{ states.set(states.size() - 1, CLASS2); return RegExpTT.CHARACTER;
}
- case 138: break;
+ case 142: break;
case 27:
{ yypushback(1); yybegin(CLASS2);
}
- case 139: break;
+ case 143: break;
case 28:
{ yybegin(CLASS2); if (allowNestedCharacterClasses) { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } return RegExpTT.CHARACTER;
}
- case 140: break;
+ case 144: break;
case 29:
{ if (allowEmptyCharacterClass) { yypopstate(); return RegExpTT.CLASS_END; } yybegin(CLASS2); return RegExpTT.CHARACTER;
}
- case 141: break;
+ case 145: break;
case 30:
- { if (commentMode) return com.intellij.psi.TokenType.WHITE_SPACE; yypushback(1); yybegin(CLASS2);
+ { if (commentMode && whitespaceInClass) return com.intellij.psi.TokenType.WHITE_SPACE; yypushback(1); yybegin(CLASS2);
}
- case 142: break;
+ case 146: break;
case 31:
{ if (allowNestedCharacterClasses) { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } return RegExpTT.CHARACTER;
}
- case 143: break;
+ case 147: break;
case 32:
{ yypopstate(); return RegExpTT.CLASS_END;
}
- case 144: break;
+ case 148: break;
case 33:
{ return RegExpTT.MINUS;
}
- case 145: break;
- case 34:
- { yypopstate(); yypushstate(EMBRACED); return RegExpTT.LBRACE;
- }
- case 146: break;
- case 35:
- { yypopstate(); return RegExpTT.CATEGORY_SHORT_HAND;
- }
- case 147: break;
- case 36:
- { yybegin(YYINITIAL); yypushback(1);
- }
- case 148: break;
- case 37:
- { yybegin(YYINITIAL); return RegExpTT.GROUP_END;
- }
case 149: break;
- case 38:
- { handleOptions(); return RegExpTT.OPTIONS_ON;
+ case 34:
+ { return (commentMode && whitespaceInClass) ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CHARACTER;
}
case 150: break;
- case 39:
- { handleOptions(); return RegExpTT.OPTIONS_OFF;
+ case 35:
+ { return (commentMode && whitespaceInClass) ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CTRL_CHARACTER;
}
case 151: break;
- case 40:
- { yybegin(YYINITIAL); return RegExpTT.COLON;
+ case 36:
+ { if (commentMode && whitespaceInClass) yypushstate(COMMENT); else return RegExpTT.CHARACTER;
}
case 152: break;
- case 41:
- { yybegin(YYINITIAL); return RegExpTT.GT;
+ case 37:
+ { yypopstate(); yypushstate(EMBRACED); return RegExpTT.LBRACE;
}
case 153: break;
- case 42:
- { yybegin(YYINITIAL); return RegExpTT.QUOTE;
+ case 38:
+ { yypopstate(); return RegExpTT.CATEGORY_SHORT_HAND;
}
case 154: break;
- case 43:
- { return RegExpTT.BAD_CHARACTER;
+ case 39:
+ { yybegin(YYINITIAL); yypushback(1);
}
case 155: break;
- case 44:
- { return allowMysqlBracketExpressions ? RegExpTT.NAME : RegExpTT.BAD_CHARACTER;
+ case 40:
+ { yybegin(YYINITIAL); return RegExpTT.GROUP_END;
}
case 156: break;
- case 45:
- { yypopstate(); return (yycharat(-1) == 'u') ? StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN : RegExpTT.BAD_HEX_VALUE;
+ case 41:
+ { handleOptions(); return RegExpTT.OPTIONS_ON;
}
case 157: break;
- case 46:
- { yybegin(OPTIONS); return RegExpTT.SET_OPTIONS;
+ case 42:
+ { handleOptions(); return RegExpTT.OPTIONS_OFF;
}
case 158: break;
+ case 43:
+ { yybegin(YYINITIAL); return RegExpTT.COLON;
+ }
+ case 159: break;
+ case 44:
+ { yybegin(YYINITIAL); return RegExpTT.GT;
+ }
+ case 160: break;
+ case 45:
+ { yybegin(YYINITIAL); return RegExpTT.QUOTE;
+ }
+ case 161: break;
+ case 46:
+ { return RegExpTT.BAD_CHARACTER;
+ }
+ case 162: break;
case 47:
+ { return allowMysqlBracketExpressions ? RegExpTT.NAME : RegExpTT.BAD_CHARACTER;
+ }
+ case 163: break;
+ case 48:
+ { yypopstate(); return (yycharat(-1) == 'u') ? StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN : RegExpTT.BAD_HEX_VALUE;
+ }
+ case 164: break;
+ case 49:
+ { yybegin(OPTIONS); return RegExpTT.SET_OPTIONS;
+ }
+ case 165: break;
+ case 50:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1);
{ yypushstate(NEGATED_CLASS); return RegExpTT.CLASS_BEGIN;
}
- case 159: break;
- case 48:
+ case 166: break;
+ case 51:
{ return RegExpTT.REDUNDANT_ESCAPE;
}
- case 160: break;
- case 49:
+ case 167: break;
+ case 52:
{ return RegExpTT.ESC_CHARACTER;
}
- case 161: break;
- case 50:
+ case 168: break;
+ case 53:
{ return (allowDanglingMetacharacters != Boolean.TRUE) ? RegExpTT.ESC_CHARACTER : RegExpTT.REDUNDANT_ESCAPE;
}
- case 162: break;
- case 51:
+ case 169: break;
+ case 54:
{ return (allowDanglingMetacharacters == Boolean.FALSE) ? RegExpTT.ESC_CHARACTER : RegExpTT.REDUNDANT_ESCAPE;
}
- case 163: break;
- case 52:
+ case 170: break;
+ case 55:
{ return (yystate() == CLASS2) ? RegExpTT.ESC_CHARACTER : RegExpTT.REDUNDANT_ESCAPE;
}
- case 164: break;
- case 53:
+ case 171: break;
+ case 56:
{ return commentMode ? RegExpTT.ESC_CTRL_CHARACTER : RegExpTT.REDUNDANT_ESCAPE;
}
- case 165: break;
- case 54:
+ case 172: break;
+ case 57:
{ return RegExpTT.ESC_CTRL_CHARACTER;
}
- case 166: break;
- case 55:
+ case 173: break;
+ case 58:
{ return RegExpTT.BOUNDARY;
}
- case 167: break;
- case 56:
+ case 174: break;
+ case 59:
{ return RegExpTT.CHAR_CLASS;
}
- case 168: break;
- case 57:
+ case 175: break;
+ case 60:
{ if (xmlSchemaMode) return RegExpTT.CHAR_CLASS; else return StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN;
}
- case 169: break;
- case 58:
+ case 176: break;
+ case 61:
{ yypushstate(PROP); return RegExpTT.PROPERTY;
}
- case 170: break;
- case 59:
+ case 177: break;
+ case 62:
{ return allowTransformationEscapes ? RegExpTT.CHAR_CLASS : StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN;
}
- case 171: break;
- case 60:
+ case 178: break;
+ case 63:
{ String text = yytext().toString().substring(1);
if (allowOctalNoLeadingZero) {
if (Integer.parseInt(text) <= capturingGroupCount && yystate() != CLASS2) return RegExpTT.BACKREF;
@@ -1104,69 +1124,69 @@ class _RegExLexer implements FlexLexer {
return RegExpTT.BACKREF;
}
}
- case 172: break;
- case 61:
+ case 179: break;
+ case 64:
{ yypushstate(QUOTED); return RegExpTT.QUOTE_BEGIN;
}
- case 173: break;
- case 62:
+ case 180: break;
+ case 65:
{ return RegExpTT.BAD_HEX_VALUE;
}
- case 174: break;
- case 63:
+ case 181: break;
+ case 66:
{ return allowTransformationEscapes ? RegExpTT.CHAR_CLASS : StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN;
}
- case 175: break;
- case 64:
+ case 182: break;
+ case 67:
{ return (allowOctalNoLeadingZero ? RegExpTT.OCT_CHAR : RegExpTT.BAD_OCT_VALUE);
}
- case 176: break;
- case 65:
+ case 183: break;
+ case 68:
{ return (allowHexDigitClass || allowHorizontalWhitespaceClass ? RegExpTT.CHAR_CLASS : StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN);
}
- case 177: break;
- case 66:
+ case 184: break;
+ case 69:
{ yypushstate(NAMED); return RegExpTT.NAMED_CHARACTER;
}
- case 178: break;
- case 67:
+ case 185: break;
+ case 70:
{ yypopstate(); return RegExpTT.QUOTE_END;
}
- case 179: break;
- case 68:
+ case 186: break;
+ case 71:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1);
{ yybegin(CLASS2); if (allowMysqlBracketExpressions) { yypushback(1); } else if (allowNestedCharacterClasses) { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } else { return RegExpTT.CHARACTER; }
}
- case 180: break;
- case 69:
+ case 187: break;
+ case 72:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1);
{ yybegin(CLASS2); if (allowNestedCharacterClasses) { yypushstate(NEGATED_CLASS); return RegExpTT.CLASS_BEGIN; } return RegExpTT.CHARACTER;
}
- case 181: break;
- case 70:
+ case 188: break;
+ case 73:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1);
{ yybegin(CLASS2); if (allowPosixBracketExpressions) { yypushback(1); } else if (allowNestedCharacterClasses) { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } else { return RegExpTT.CHARACTER; }
}
- case 182: break;
- case 71:
+ case 189: break;
+ case 74:
{ yybegin(CLASS2); return allowEmptyCharacterClass ? RegExpTT.ESC_CHARACTER : RegExpTT.REDUNDANT_ESCAPE;
}
- case 183: break;
- case 72:
+ case 190: break;
+ case 75:
{ yybegin(CLASS2); return RegExpTT.ESC_CHARACTER;
}
- case 184: break;
- case 73:
+ case 191: break;
+ case 76:
{ yypushstate(QUOTED_CLASS1); return RegExpTT.QUOTE_BEGIN;
}
- case 185: break;
- case 74:
+ case 192: break;
+ case 77:
{ char c = yycharat(1);
if (allowPosixBracketExpressions && c == ':') {
yybegin(BRACKET_EXPRESSION);
@@ -1182,189 +1202,193 @@ class _RegExLexer implements FlexLexer {
return allowNestedCharacterClasses ? RegExpTT.CLASS_BEGIN : RegExpTT.CHARACTER;
}
}
- case 186: break;
- case 75:
+ case 193: break;
+ case 78:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1);
{ if (allowNestedCharacterClasses) { yypushstate(NEGATED_CLASS); return RegExpTT.CLASS_BEGIN; } return RegExpTT.CHARACTER;
}
- case 187: break;
- case 76:
- { if (allowNestedCharacterClasses) return RegExpTT.ANDAND; else yypushback(1); return RegExpTT.CHARACTER;
- }
- case 188: break;
- case 77:
- { yybegin(CLASS2); return RegExpTT.BRACKET_EXPRESSION_END;
- }
- case 189: break;
- case 78:
- { yybegin(CLASS2); return RegExpTT.MYSQL_CHAR_END;
- }
- case 190: break;
- case 79:
- { yybegin(CLASS2); return RegExpTT.MYSQL_CHAR_EQ_END;
- }
- case 191: break;
- case 80:
- { yybegin(PY_COND_REF); return RegExpTT.PYTHON_COND_REF;
- }
- case 192: break;
- case 81:
- { yybegin(NAMED_GROUP); capturingGroupCount++; return RegExpTT.RUBY_NAMED_GROUP;
- }
- case 193: break;
- case 82:
- { yybegin(QUOTED_NAMED_GROUP); capturingGroupCount++; return RegExpTT.RUBY_QUOTED_NAMED_GROUP;
- }
case 194: break;
- case 83:
- { return RegExpTT.NON_CAPT_GROUP;
+ case 79:
+ { return (commentMode && whitespaceInClass) ? RegExpTT.ESC_CTRL_CHARACTER : RegExpTT.REDUNDANT_ESCAPE;
}
case 195: break;
- case 84:
- { return RegExpTT.POS_LOOKAHEAD;
+ case 80:
+ { if (allowNestedCharacterClasses) return RegExpTT.ANDAND; else yypushback(1); return RegExpTT.CHARACTER;
}
case 196: break;
- case 85:
- { return RegExpTT.ATOMIC_GROUP;
+ case 81:
+ { yybegin(CLASS2); return RegExpTT.BRACKET_EXPRESSION_END;
}
case 197: break;
- case 86:
- { return RegExpTT.NEG_LOOKAHEAD;
+ case 82:
+ { yybegin(CLASS2); return RegExpTT.MYSQL_CHAR_END;
}
case 198: break;
+ case 83:
+ { yybegin(CLASS2); return RegExpTT.MYSQL_CHAR_EQ_END;
+ }
+ case 199: break;
+ case 84:
+ { yybegin(PY_COND_REF); return RegExpTT.PYTHON_COND_REF;
+ }
+ case 200: break;
+ case 85:
+ { yybegin(NAMED_GROUP); capturingGroupCount++; return RegExpTT.RUBY_NAMED_GROUP;
+ }
+ case 201: break;
+ case 86:
+ { yybegin(QUOTED_NAMED_GROUP); capturingGroupCount++; return RegExpTT.RUBY_QUOTED_NAMED_GROUP;
+ }
+ case 202: break;
case 87:
+ { return RegExpTT.NON_CAPT_GROUP;
+ }
+ case 203: break;
+ case 88:
+ { return RegExpTT.POS_LOOKAHEAD;
+ }
+ case 204: break;
+ case 89:
+ { return RegExpTT.ATOMIC_GROUP;
+ }
+ case 205: break;
+ case 90:
+ { return RegExpTT.NEG_LOOKAHEAD;
+ }
+ case 206: break;
+ case 91:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1);
{ yypushstate(QUANTIFIER); return RegExpTT.LBRACE;
}
- case 199: break;
- case 88:
+ case 207: break;
+ case 92:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1);
{ if (allowOmitBothNumbersInQuantifiers || allowDanglingMetacharacters != Boolean.TRUE) { yypushstate(QUANTIFIER); return RegExpTT.LBRACE; } else return RegExpTT.CHARACTER;
}
- case 200: break;
- case 89:
+ case 208: break;
+ case 93:
{ yybegin(NAMED_GROUP); return RegExpTT.RUBY_NAMED_GROUP_CALL;
}
- case 201: break;
- case 90:
+ case 209: break;
+ case 94:
{ yybegin(QUOTED_NAMED_GROUP); return RegExpTT.RUBY_QUOTED_NAMED_GROUP_CALL;
}
- case 202: break;
- case 91:
+ case 210: break;
+ case 95:
{ if (xmlSchemaMode) { yypushback(1); return RegExpTT.CHAR_CLASS; } else return RegExpTT.CTRL;
}
- case 203: break;
- case 92:
+ case 211: break;
+ case 96:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 2);
{ if (allowExtendedUnicodeCharacter) yypushstate(EMBRACED_HEX); else return RegExpTT.BAD_HEX_VALUE;
}
- case 204: break;
- case 93:
+ case 212: break;
+ case 97:
{ if (allowOneHexCharEscape) { return RegExpTT.HEX_CHAR; } else { yypushback(1); return RegExpTT.BAD_HEX_VALUE; }
}
- case 205: break;
- case 94:
+ case 213: break;
+ case 98:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 2);
{ if (allowExtendedUnicodeCharacter) yypushstate(EMBRACED_HEX); else return StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN;
}
- case 206: break;
- case 95:
+ case 214: break;
+ case 99:
{ yypushback(yylength() - 2); return StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN;
}
- case 207: break;
- case 96:
+ case 215: break;
+ case 100:
{ return RegExpTT.OCT_CHAR;
}
- case 208: break;
- case 97:
+ case 216: break;
+ case 101:
{ yybegin(NAMED_GROUP); return RegExpTT.RUBY_NAMED_GROUP_REF;
}
- case 209: break;
- case 98:
+ case 217: break;
+ case 102:
{ yybegin(QUOTED_NAMED_GROUP); return RegExpTT.RUBY_QUOTED_NAMED_GROUP_REF;
}
- case 210: break;
- case 99:
+ case 218: break;
+ case 103:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1);
{ return RegExpTT.CHARACTER;
}
- case 211: break;
- case 100:
+ case 219: break;
+ case 104:
{ yypopstate(); return (yycharat(-1) == 'u') ? RegExpTT.UNICODE_CHAR : RegExpTT.HEX_CHAR;
}
- case 212: break;
- case 101:
+ case 220: break;
+ case 105:
{ yybegin(NAMED_GROUP); capturingGroupCount++; return RegExpTT.PYTHON_NAMED_GROUP;
}
- case 213: break;
- case 102:
+ case 221: break;
+ case 106:
{ yybegin(PY_NAMED_GROUP_REF); return RegExpTT.PYTHON_NAMED_GROUP_REF;
}
- case 214: break;
- case 103:
+ case 222: break;
+ case 107:
{ return RegExpTT.POS_LOOKBEHIND;
}
- case 215: break;
- case 104:
+ case 223: break;
+ case 108:
{ return RegExpTT.NEG_LOOKBEHIND;
}
- case 216: break;
- case 105:
+ case 224: break;
+ case 109:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1);
{ if (allowOmitNumbersInQuantifiers || allowDanglingMetacharacters != Boolean.TRUE) { yypushstate(QUANTIFIER); return RegExpTT.LBRACE; } else return RegExpTT.CHARACTER;
}
- case 217: break;
- case 106:
+ case 225: break;
+ case 110:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 2);
{ return RegExpTT.ESC_CHARACTER;
}
- case 218: break;
- case 107:
+ case 226: break;
+ case 111:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 2);
{ return allowOmitBothNumbersInQuantifiers ? RegExpTT.ESC_CHARACTER : RegExpTT.REDUNDANT_ESCAPE;
}
- case 219: break;
- case 108:
+ case 227: break;
+ case 112:
{ return RegExpTT.HEX_CHAR;
}
- case 220: break;
- case 109:
+ case 228: break;
+ case 113:
{ return RegExpTT.COMMENT;
}
- case 221: break;
- case 110:
+ case 229: break;
+ case 114:
// lookahead expression with fixed base length
zzMarkedPos = Character.offsetByCodePoints
(zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 2);
{ return allowOmitNumbersInQuantifiers ? RegExpTT.ESC_CHARACTER : RegExpTT.REDUNDANT_ESCAPE;
}
- case 222: break;
- case 111:
+ case 230: break;
+ case 115:
{ if (allowOctalNoLeadingZero) yypushback(1); return RegExpTT.OCT_CHAR;
}
- case 223: break;
- case 112:
+ case 231: break;
+ case 116:
{ return RegExpTT.UNICODE_CHAR;
}
- case 224: break;
+ case 232: break;
default:
zzScanError(ZZ_NO_MATCH);
}
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpCapability.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpCapability.java
index eca27c81e8e6..6d532fd65c27 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpCapability.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpCapability.java
@@ -52,6 +52,11 @@ public enum RegExpCapability {
OMIT_BOTH_NUMBERS_IN_QUANTIFIERS,
COMMENT_MODE,
+ /**
+ * In comment mode, spaces, tabs, etc in a class are also whitespace. Comments also work inside classes (Java).
+ */
+ WHITESPACE_IN_CLASS,
+
/**
* '\h'
*/
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpCharImpl.java b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpCharImpl.java
index f3ef85e2b22a..5b26aa11a553 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpCharImpl.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpCharImpl.java
@@ -65,8 +65,9 @@ public class RegExpCharImpl extends RegExpElementImpl implements RegExpChar {
assert length > 0;
boolean escaped = false;
- for (int idx = 0; idx < length; idx++) {
- final char ch = s.charAt(idx);
+ int idx = 0;
+ while (idx < length) {
+ final int ch = s.codePointAt(idx);
if (!escaped) {
if (ch == '\\') {
escaped = true;
@@ -133,6 +134,7 @@ public class RegExpCharImpl extends RegExpElementImpl implements RegExpChar {
return ch;
}
}
+ idx = Character.charCount(ch);
}
return -1;
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex b/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
index c2233c8dc630..c4b98e88c5c5 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
+++ b/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex
@@ -44,6 +44,7 @@ import static org.intellij.lang.regexp.RegExpCapability.*;
private boolean allowMysqlBracketExpressions;
private int maxOctal = 0777;
private int minOctalDigits = 1;
+ private boolean whitespaceInClass;
_RegExLexer(EnumSet capabilities) {
this((java.io.Reader)null);
@@ -75,6 +76,7 @@ import static org.intellij.lang.regexp.RegExpCapability.*;
}
this.allowExtendedUnicodeCharacter = capabilities.contains(EXTENDED_UNICODE_CHARACTER);
this.allowOneHexCharEscape = capabilities.contains(ONE_HEX_CHAR_ESCAPE);
+ this.whitespaceInClass = capabilities.contains(WHITESPACE_IN_CLASS);
}
private void yypushstate(int state) {
@@ -253,7 +255,6 @@ HEX_CHAR=[0-9a-fA-F]
{ESCAPE} [hH] { return (allowHexDigitClass || allowHorizontalWhitespaceClass ? RegExpTT.CHAR_CLASS : StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN); }
{ESCAPE} "N" { yypushstate(NAMED); return RegExpTT.NAMED_CHARACTER; }
{ESCAPE} {TRANSFORMATION} { return allowTransformationEscapes ? RegExpTT.CHAR_CLASS : StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN; }
-{ESCAPE} [\n\b\t\r\f ] { return commentMode ? RegExpTT.ESC_CTRL_CHARACTER : RegExpTT.REDUNDANT_ESCAPE; }
{
{ESCAPE} {RBRACKET} { return RegExpTT.ESC_CHARACTER; }
@@ -261,19 +262,15 @@ HEX_CHAR=[0-9a-fA-F]
}
{
+ {ESCAPE} [\n\b\t\r\f ] { return commentMode ? RegExpTT.ESC_CTRL_CHARACTER : RegExpTT.REDUNDANT_ESCAPE; }
{ESCAPE} "k<" { yybegin(NAMED_GROUP); return RegExpTT.RUBY_NAMED_GROUP_REF; }
{ESCAPE} "k'" { yybegin(QUOTED_NAMED_GROUP); return RegExpTT.RUBY_QUOTED_NAMED_GROUP_REF; }
{ESCAPE} "g<" { yybegin(NAMED_GROUP); return RegExpTT.RUBY_NAMED_GROUP_CALL; }
{ESCAPE} "g'" { yybegin(QUOTED_NAMED_GROUP); return RegExpTT.RUBY_QUOTED_NAMED_GROUP_CALL; }
{ESCAPE} "R" { return RegExpTT.CHAR_CLASS; }
- {ESCAPE} {BOUNDARY} { return RegExpTT.BOUNDARY; }
+ {ESCAPE} {BOUNDARY} { return RegExpTT.BOUNDARY; }
}
-{ESCAPE} [A-Za-z] { return StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN; }
-{ESCAPE} {ANY} { return RegExpTT.REDUNDANT_ESCAPE; }
-
-{ESCAPE} { return StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN; }
-
{
{LBRACE} { yypopstate(); yypushstate(EMBRACED); return RegExpTT.LBRACE; }
"L"|"M"|"Z"|"S"|"N"|"P"|"C" { yypopstate(); return RegExpTT.CATEGORY_SHORT_HAND; }
@@ -332,7 +329,7 @@ HEX_CHAR=[0-9a-fA-F]
{LBRACKET} / [.=] { yybegin(CLASS2); if (allowMysqlBracketExpressions) { yypushback(1); } else if (allowNestedCharacterClasses) { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } else { return RegExpTT.CHARACTER; } }
{LBRACKET} / "^" { yybegin(CLASS2); if (allowNestedCharacterClasses) { yypushstate(NEGATED_CLASS); return RegExpTT.CLASS_BEGIN; } return RegExpTT.CHARACTER; }
{LBRACKET} { yybegin(CLASS2); if (allowNestedCharacterClasses) { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } return RegExpTT.CHARACTER; }
- [\n\b\t\r\f ] { if (commentMode) return com.intellij.psi.TokenType.WHITE_SPACE; yypushback(1); yybegin(CLASS2); }
+ [\n\b\t\r\f ] { if (commentMode && whitespaceInClass) return com.intellij.psi.TokenType.WHITE_SPACE; yypushback(1); yybegin(CLASS2); }
{ANY} { yypushback(1); yybegin(CLASS2); }
}
@@ -357,11 +354,17 @@ HEX_CHAR=[0-9a-fA-F]
{RBRACKET} { yypopstate(); return RegExpTT.CLASS_END; }
"&&" { if (allowNestedCharacterClasses) return RegExpTT.ANDAND; else yypushback(1); return RegExpTT.CHARACTER; }
"-" { return RegExpTT.MINUS; }
- " " { return commentMode ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CHARACTER; }
- [\n\b\t\r\f] { return commentMode ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CTRL_CHARACTER; }
- {ANY} { return RegExpTT.CHARACTER; }
+ " " { return (commentMode && whitespaceInClass) ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CHARACTER; }
+ [\n\b\t\r\f] { return (commentMode && whitespaceInClass) ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CTRL_CHARACTER; }
+ "#" { if (commentMode && whitespaceInClass) yypushstate(COMMENT); else return RegExpTT.CHARACTER; }
+ "^" { return RegExpTT.CHARACTER; }
+ {ESCAPE}[\n\b\t\r\f ] { return (commentMode && whitespaceInClass) ? RegExpTT.ESC_CTRL_CHARACTER : RegExpTT.REDUNDANT_ESCAPE; }
}
+{ESCAPE} [A-Za-z] { return StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN; }
+{ESCAPE} {ANY} { return RegExpTT.REDUNDANT_ESCAPE; }
+{ESCAPE} { return StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN; }
+
{
"^" { return RegExpTT.CARET; }
{NAME} { return RegExpTT.NAME; }
@@ -455,9 +458,9 @@ HEX_CHAR=[0-9a-fA-F]
{RBRACKET} { return allowDanglingMetacharacters == Boolean.FALSE ? RegExpTT.CLASS_END : RegExpTT.CHARACTER; }
-"#" { if (commentMode) { yypushstate(COMMENT); return RegExpTT.COMMENT; } else return RegExpTT.CHARACTER; }
+"#" { if (commentMode) { yypushstate(COMMENT); } else return RegExpTT.CHARACTER; }
{
- [^\r\n]*[\r\n]? { yypopstate(); return RegExpTT.COMMENT; }
+ [^\r\n]* { yypopstate(); return RegExpTT.COMMENT; }
}
" " { return commentMode ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CHARACTER; }
diff --git a/RegExpSupport/test/org/intellij/lang/regexp/RegExpLexerTest.java b/RegExpSupport/test/org/intellij/lang/regexp/RegExpLexerTest.java
index 7ddcf44e977e..e8a840df25c8 100644
--- a/RegExpSupport/test/org/intellij/lang/regexp/RegExpLexerTest.java
+++ b/RegExpSupport/test/org/intellij/lang/regexp/RegExpLexerTest.java
@@ -411,7 +411,7 @@ public class RegExpLexerTest extends LexerTestCase {
"QUOTE_END ('\\E')\n" +
"CLASS_END (']')\n" +
"CHARACTER (']')", lexer);
- final RegExpLexer lexer2 = new RegExpLexer(EnumSet.of(COMMENT_MODE));
+ final RegExpLexer lexer2 = new RegExpLexer(EnumSet.of(COMMENT_MODE, WHITESPACE_IN_CLASS));
doTest("[ \t\n]]", "CLASS_BEGIN ('[')\n" +
"WHITE_SPACE (' ')\n" +
"WHITE_SPACE ('\t')\n" +
@@ -421,6 +421,20 @@ public class RegExpLexerTest extends LexerTestCase {
doTest("[\\ ]", "CLASS_BEGIN ('[')\n" +
"ESC_CTRL_CHARACTER ('\\ ')\n" +
"CLASS_END (']')", lexer2);
+ doTest("[#comment\nabc]", "CLASS_BEGIN ('[')\n" +
+ "COMMENT ('#comment')\n" +
+ "WHITE_SPACE ('\\n')\n" +
+ "CHARACTER ('a')\n" +
+ "CHARACTER ('b')\n" +
+ "CHARACTER ('c')\n" +
+ "CLASS_END (']')", lexer2);
+ doTest("[ ^]]", "CLASS_BEGIN ('[')\n" +
+ "WHITE_SPACE (' ')\n" +
+ "CHARACTER ('^')\n" +
+ "CLASS_END (']')\n" +
+ "CHARACTER (']')", lexer2);
+ doTest("[\\", "CLASS_BEGIN ('[')\n" +
+ "INVALID_CHARACTER_ESCAPE_TOKEN ('\\')", lexer2);
final RegExpLexer lexer3 = new RegExpLexer(EnumSet.of(ALLOW_EMPTY_CHARACTER_CLASS));
doTest("[]]", "CLASS_BEGIN ('[')\n" +
"CLASS_END (']')\n" +
@@ -437,6 +451,16 @@ public class RegExpLexerTest extends LexerTestCase {
"CHARACTER (' ')\n" +
"ESC_CHARACTER ('\\]')\n" +
"CLASS_END (']')", lexer3);
+ final RegExpLexer lexer4 = new RegExpLexer(EnumSet.of(COMMENT_MODE));
+ doTest("[ ]", "CLASS_BEGIN ('[')\n" +
+ "CHARACTER (' ')\n" +
+ "CLASS_END (']')", lexer4);
+ doTest("[#]", "CLASS_BEGIN ('[')\n" +
+ "CHARACTER ('#')\n" +
+ "CLASS_END (']')", lexer4);
+ doTest("[\\ ]", "CLASS_BEGIN ('[')\n" +
+ "REDUNDANT_ESCAPE ('\\ ')\n" +
+ "CLASS_END (']')", lexer4);
}
public void testBoundaries() {
diff --git a/RegExpSupport/testData/psi/Charclasses63.txt b/RegExpSupport/testData/psi/Charclasses63.txt
index e139eac26005..6742716beb51 100644
--- a/RegExpSupport/testData/psi/Charclasses63.txt
+++ b/RegExpSupport/testData/psi/Charclasses63.txt
@@ -17,10 +17,10 @@ REGEXP_FILE
RegExpCharImpl:
PsiElement(CHARACTER)('c')
PsiWhiteSpace(' ')
- PsiComment(COMMENT)('#')
- PsiComment(COMMENT)('foo \q bar\n')
- PsiComment(COMMENT)('#')
- PsiComment(COMMENT)(' foo\n')
+ PsiComment(COMMENT)('#foo \q bar')
+ PsiWhiteSpace('\n')
+ PsiComment(COMMENT)('# foo')
+ PsiWhiteSpace('\n')
RegExpSetOptionsImpl: <(?-xi)>
PsiElement(SET_OPTIONS)('(?')
RegExpOptionsImpl: <-xi>
diff --git a/community-resources/src/idea-ce-eap.svg b/community-resources/src/idea-ce-eap.svg
new file mode 100644
index 000000000000..afd306feff70
--- /dev/null
+++ b/community-resources/src/idea-ce-eap.svg
@@ -0,0 +1,73 @@
+
diff --git a/community-resources/src/idea/IdeaApplicationInfo.xml b/community-resources/src/idea/IdeaApplicationInfo.xml
index 195d2fcc259a..37d99ca3526f 100644
--- a/community-resources/src/idea/IdeaApplicationInfo.xml
+++ b/community-resources/src/idea/IdeaApplicationInfo.xml
@@ -7,6 +7,7 @@
+
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index f9783293dce4..6c7d1398012c 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -1314,7 +1314,7 @@ public class BuildManager implements Disposable {
}
@NotNull
- private File getBuildLogDirectory() {
+ public static File getBuildLogDirectory() {
return new File(PathManager.getLogPath(), "build-log");
}
diff --git a/java/compiler/tests/com/intellij/compiler/BaseCompilerTestCase.java b/java/compiler/tests/com/intellij/compiler/BaseCompilerTestCase.java
index 665146b5668a..fb9f594aea46 100644
--- a/java/compiler/tests/com/intellij/compiler/BaseCompilerTestCase.java
+++ b/java/compiler/tests/com/intellij/compiler/BaseCompilerTestCase.java
@@ -23,10 +23,7 @@ import com.intellij.openapi.vfs.newvfs.NewVirtualFile;
import com.intellij.packaging.artifacts.Artifact;
import com.intellij.packaging.artifacts.ArtifactManager;
import com.intellij.packaging.impl.compiler.ArtifactCompileScope;
-import com.intellij.testFramework.ModuleTestCase;
-import com.intellij.testFramework.PlatformTestUtil;
-import com.intellij.testFramework.PsiTestUtil;
-import com.intellij.testFramework.VfsTestUtil;
+import com.intellij.testFramework.*;
import com.intellij.util.concurrency.Semaphore;
import com.intellij.util.io.TestFileSystemBuilder;
import com.intellij.util.ui.UIUtil;
@@ -250,20 +247,31 @@ public abstract class BaseCompilerTestCase extends ModuleTestCase {
};
PlatformTestUtil.saveProject(myProject);
CompilerTestUtil.saveApplicationSettings();
+ try {
+ CompilerTester.enableDebugLogging();
+ }
+ catch (IOException e) {
+ throw new RuntimeException(e);
+ }
action.accept(callback);
});
- final long start = System.currentTimeMillis();
- while (!semaphore.waitFor(10)) {
- if (System.currentTimeMillis() - start > 5 * 60 * 1000) {
- throw new RuntimeException("timeout");
+ try {
+ final long start = System.currentTimeMillis();
+ while (!semaphore.waitFor(10)) {
+ if (System.currentTimeMillis() - start > 50 * 60 * 1000) {
+ throw new RuntimeException("timeout");
+ }
+ if (SwingUtilities.isEventDispatchThread()) {
+ UIUtil.dispatchAllInvocationEvents();
+ }
}
if (SwingUtilities.isEventDispatchThread()) {
UIUtil.dispatchAllInvocationEvents();
}
}
- if (SwingUtilities.isEventDispatchThread()) {
- UIUtil.dispatchAllInvocationEvents();
+ finally {
+ CompilerTester.printBuildLog();
}
return result.get();
diff --git a/java/compiler/tests/com/intellij/compiler/CompilerTestCase.java b/java/compiler/tests/com/intellij/compiler/CompilerTestCase.java
index 716518122593..6f85459f4f65 100644
--- a/java/compiler/tests/com/intellij/compiler/CompilerTestCase.java
+++ b/java/compiler/tests/com/intellij/compiler/CompilerTestCase.java
@@ -38,7 +38,7 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
/**
- * @author Jeka
+ * @deprecated use {@link BaseCompilerTestCase} instead
*/
public abstract class CompilerTestCase extends ModuleTestCase {
private static final int COMPILING_TIMEOUT = 2 * 60 * 1000;
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
index 4e6e634ac83f..91f5d7373456 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
@@ -452,7 +452,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
final String address = myConnection.getAddress();
- if (myConnection instanceof PidRemoteConnection) {
+ if (myConnection instanceof PidRemoteConnection && !((PidRemoteConnection)myConnection).isFixedAddress()) {
PidRemoteConnection pidRemoteConnection = (PidRemoteConnection)myConnection;
Connector connector = pidRemoteConnection.getConnector(this);
String pid = pidRemoteConnection.getPid();
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/attach/JavaAttachDebuggerProvider.java b/java/debugger/impl/src/com/intellij/debugger/impl/attach/JavaAttachDebuggerProvider.java
index 6ca349ff7efa..270ecb1ded86 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/attach/JavaAttachDebuggerProvider.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/attach/JavaAttachDebuggerProvider.java
@@ -3,6 +3,7 @@ package com.intellij.debugger.impl.attach;
import com.intellij.debugger.DebuggerManagerEx;
import com.intellij.debugger.engine.RemoteStateState;
+import com.intellij.debugger.impl.DebuggerManagerImpl;
import com.intellij.debugger.impl.GenericDebuggerRunner;
import com.intellij.execution.*;
import com.intellij.execution.configurations.*;
@@ -57,7 +58,7 @@ public class JavaAttachDebuggerProvider implements XLocalAttachDebuggerProvider
@NotNull
@Override
public String getDebuggerDisplayName() {
- return "Java Debugger";
+ return myInfo.getDebuggerName();
}
@Override
@@ -68,16 +69,26 @@ public class JavaAttachDebuggerProvider implements XLocalAttachDebuggerProvider
private static final Key> ADDRESS_MAP_KEY = Key.create("ADDRESS_MAP");
- private static final XLocalAttachGroup ourAttachGroup = new XDefaultLocalAttachGroup() {
+ private static final XLocalAttachGroup ourAttachGroup = new JavaDebuggerAttachGroup("Java", -20);
+
+ static class JavaDebuggerAttachGroup extends XDefaultLocalAttachGroup {
+ private final String myName;
+ private final int myOrder;
+
+ JavaDebuggerAttachGroup(String name, int order) {
+ myName = name;
+ myOrder = order;
+ }
+
@Override
public int getOrder() {
- return 1;
+ return myOrder;
}
@NotNull
@Override
public String getGroupName() {
- return "Java";
+ return myName;
}
@NotNull
@@ -129,7 +140,14 @@ public class JavaAttachDebuggerProvider implements XLocalAttachDebuggerProvider
}
LocalAttachInfo info = getAttachInfo(project, processInfo, addressMap);
- return info != null ? Collections.singletonList(new JavaLocalAttachDebugger(project, info)) : Collections.emptyList();
+ if (info != null && isDebuggerAttach(info)) {
+ return Collections.singletonList(new JavaLocalAttachDebugger(project, info));
+ }
+ return Collections.emptyList();
+ }
+
+ boolean isDebuggerAttach(LocalAttachInfo info) {
+ return info instanceof DebuggerLocalAttachInfo;
}
private static Set getAttachedPids(@NotNull Project project) {
@@ -172,7 +190,7 @@ public class JavaAttachDebuggerProvider implements XLocalAttachDebuggerProvider
if (param.startsWith("address")) {
try {
address = param.split("=")[1];
- return new DebuggerLocalAttachInfo(socket, address, null, pid);
+ return new DebuggerLocalAttachInfo(socket, address, null, pid, false);
}
catch (Exception e) {
LOG.error(e);
@@ -222,14 +240,23 @@ public class JavaAttachDebuggerProvider implements XLocalAttachDebuggerProvider
String command = agentProperties.getProperty("sun.java.command");
if (!StringUtil.isEmpty(command)) {
command = StringUtil.replace(command, AppMainV2.class.getName(), "").trim();
- command = StringUtil.substringBefore(command, " ");
+ command = StringUtil.notNullize(StringUtil.substringBefore(command, " "), command);
}
String property = agentProperties.getProperty("sun.jdwp.listenerAddress");
if (property != null && property.indexOf(':') != -1) {
+ boolean autoAddress = false;
+ String args = agentProperties.getProperty("sun.jvm.args");
+ if (!StringUtil.isEmpty(args)) {
+ for (String arg : args.split(" ")) {
+ if (arg.startsWith("-agentlib:jdwp")) {
+ autoAddress = !arg.contains("address=");
+ break;
+ }
+ }
+ }
return new DebuggerLocalAttachInfo(!"dt_shmem".equals(StringUtil.substringBefore(property, ":")),
StringUtil.substringAfter(property, ":"),
- command,
- pid);
+ command, pid, autoAddress);
}
//do not allow further for idea process
@@ -267,18 +294,32 @@ public class JavaAttachDebuggerProvider implements XLocalAttachDebuggerProvider
}
private static class DebuggerLocalAttachInfo extends LocalAttachInfo {
- final boolean myUseSocket;
- final String myAddress;
+ private final boolean myUseSocket;
+ private final String myAddress;
+ private final boolean myAutoAddress;
- DebuggerLocalAttachInfo(boolean socket, @NotNull String address, String aClass, String pid) {
+ DebuggerLocalAttachInfo(boolean socket, @NotNull String address, String aClass, String pid, boolean autoAddress) {
super(aClass, pid);
myUseSocket = socket;
myAddress = address;
+ myAutoAddress = autoAddress;
}
@Override
RemoteConnection createConnection() {
- return new PidRemoteConnection(myPid);
+ return myAutoAddress
+ ? new PidRemoteConnection(myPid)
+ : new PidRemoteConnection(myPid, myUseSocket, DebuggerManagerImpl.LOCALHOST_ADDRESS_FALLBACK, myAddress, false);
+ }
+
+ @Override
+ String getSessionName() {
+ return myAutoAddress ? super.getSessionName() : "localhost:" + myAddress;
+ }
+
+ @Override
+ String getDebuggerName() {
+ return "Java Debugger";
}
@Override
@@ -318,8 +359,12 @@ public class JavaAttachDebuggerProvider implements XLocalAttachDebuggerProvider
return "pid " + myPid;
}
+ String getDebuggerName() {
+ return "Read Only Java Debugger";
+ }
+
String getProcessDisplayText(String text) {
- return text + " (read only)";
+ return text;
}
}
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/attach/JavaSAAttachDebuggerProvider.java b/java/debugger/impl/src/com/intellij/debugger/impl/attach/JavaSAAttachDebuggerProvider.java
new file mode 100644
index 000000000000..c67309c373d1
--- /dev/null
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/attach/JavaSAAttachDebuggerProvider.java
@@ -0,0 +1,23 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.debugger.impl.attach;
+
+import com.intellij.xdebugger.attach.XLocalAttachGroup;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author egor
+ */
+public class JavaSAAttachDebuggerProvider extends JavaAttachDebuggerProvider {
+ private static final XLocalAttachGroup ourAttachGroup = new JavaDebuggerAttachGroup("Java Read Only", -19);
+
+ @NotNull
+ @Override
+ public XLocalAttachGroup getAttachGroup() {
+ return ourAttachGroup;
+ }
+
+ @Override
+ boolean isDebuggerAttach(LocalAttachInfo info) {
+ return !super.isDebuggerAttach(info);
+ }
+}
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/attach/PidRemoteConnection.java b/java/debugger/impl/src/com/intellij/debugger/impl/attach/PidRemoteConnection.java
index 526463dda051..16ad857c127e 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/attach/PidRemoteConnection.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/attach/PidRemoteConnection.java
@@ -11,13 +11,17 @@ import com.sun.jdi.connect.Connector;
*/
public class PidRemoteConnection extends RemoteConnection {
private final String myPid;
+ private final boolean myFixedAddress;
public PidRemoteConnection(String pid) {
- this(pid, false);
+ super(false, null, null, false);
+ myFixedAddress = false;
+ myPid = pid;
}
- PidRemoteConnection(String pid, boolean serverMode) {
- super(false, null, null, serverMode);
+ public PidRemoteConnection(String pid, boolean useSockets, String hostName, String address, boolean serverMode) {
+ super(useSockets, hostName, address, serverMode);
+ myFixedAddress = true;
myPid = pid;
}
@@ -26,6 +30,11 @@ public class PidRemoteConnection extends RemoteConnection {
}
public Connector getConnector(DebugProcessImpl debugProcess) throws ExecutionException {
+ assert !myFixedAddress;
return DebugProcessImpl.findConnector("com.sun.jdi.ProcessAttach");
}
+
+ public boolean isFixedAddress() {
+ return myFixedAddress;
+ }
}
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/attach/SAJDWPRemoteConnection.java b/java/debugger/impl/src/com/intellij/debugger/impl/attach/SAJDWPRemoteConnection.java
index 6311b9499bda..84f7e0758189 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/attach/SAJDWPRemoteConnection.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/attach/SAJDWPRemoteConnection.java
@@ -29,7 +29,8 @@ public class SAJDWPRemoteConnection extends PidRemoteConnection {
private static final Logger LOG = Logger.getInstance(SAJDWPRemoteConnection.class);
public SAJDWPRemoteConnection(String pid) {
- super(pid, true);
+ super(pid);
+ setServerMode(true);
setAddress("0");
}
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
index 77f1e5dd0cce..471f952c2158 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
@@ -307,8 +307,8 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration annotation.accept(this));
- UExpression receiver = node.getReceiver();
- receiver.accept(this);
- if (!(receiver instanceof UInstanceExpression)) {
- node.getSelector().accept(this);
- }
- return true;
+ return false;
}
@Override
@@ -203,6 +197,10 @@ public class RefJavaUtilImpl extends RefJavaUtil {
}
private void visitReferenceExpression(UExpression node) {
+ UElement uastParent = node.getUastParent();
+ if (uastParent instanceof UQualifiedReferenceExpression && ((UQualifiedReferenceExpression)uastParent).getSelector() == node) {
+ return;
+ }
PsiElement psiResolved = null;
if (node instanceof UResolvable) {
psiResolved = ((UResolvable)node).resolve();
@@ -302,7 +300,7 @@ public class RefJavaUtilImpl extends RefJavaUtil {
final UDeclaration from,
boolean defaultConstructorOnly) {
if (psiClass != null) {
- RefClassImpl refClass = (RefClassImpl)refFrom.getRefManager().getReference(psiClass.getNavigationElement());
+ RefClassImpl refClass = ObjectUtils.tryCast(refFrom.getRefManager().getReference(psiClass.getNavigationElement()), RefClassImpl.class);
if (refClass != null) {
boolean hasConstructorsMarked = false;
diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml
index 6c70a0438e3f..ff147317611c 100644
--- a/java/java-impl/src/META-INF/JavaPlugin.xml
+++ b/java/java-impl/src/META-INF/JavaPlugin.xml
@@ -907,6 +907,11 @@
groupKey="group.names.probable.bugs" groupBundle="messages.InspectionsBundle"
enabledByDefault="true" level="WARNING"
implementationClass="com.siyeh.ig.bugs.SortedCollectionWithNonComparableKeysInspection" />
+
@@ -1045,10 +1050,6 @@
com.intellij.codeInsight.intention.impl.MoveInitializerToConstructorAction
Java/Declaration
-
- com.intellij.codeInsight.intention.impl.JoinDeclarationAndAssignmentAction
- Java/Declaration
-
com.intellij.codeInsight.intention.impl.SplitDeclarationAction
Java/Declaration
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/InlineStreamMapAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/InlineStreamMapAction.java
index 7aa89c18a760..fdcc8b4bc905 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/InlineStreamMapAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/InlineStreamMapAction.java
@@ -240,7 +240,7 @@ public class InlineStreamMapAction extends PsiElementBaseIntentionAction {
}
ct.replace(e, replacement);
}
- ct.replace(nextParameters[0], prevParameters[0]);
+ ct.replace(lambda.getParameterList(), previousLambda.getParameterList());
ExpressionUtils.bindReferenceTo(nextRef, newName);
PsiExpression prevQualifier = mapCall.getMethodExpression().getQualifierExpression();
if(prevQualifier == null) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/JoinDeclarationAndAssignmentAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/JoinDeclarationAndAssignmentAction.java
deleted file mode 100644
index aea31ebf1744..000000000000
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/JoinDeclarationAndAssignmentAction.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2000-2017 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 com.intellij.codeInsight.intention.impl;
-
-import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.FileModificationService;
-import com.intellij.codeInsight.editorActions.DeclarationJoinLinesHandler;
-import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
-import com.intellij.codeInspection.RemoveInitializerFix;
-import com.intellij.lang.java.JavaLanguage;
-import com.intellij.openapi.application.WriteAction;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Pair;
-import com.intellij.psi.*;
-import com.intellij.psi.search.LocalSearchScope;
-import com.intellij.psi.search.searches.ReferencesSearch;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.IncorrectOperationException;
-import org.jetbrains.annotations.NotNull;
-
-public class JoinDeclarationAndAssignmentAction extends PsiElementBaseIntentionAction {
- @Override
- @NotNull
- public String getFamilyName() {
- return CodeInsightBundle.message("intention.join.declaration.family");
- }
-
- @Override
- public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
-
- if (element instanceof PsiCompiledElement) return false;
- if (!element.getManager().isInProject(element)) return false;
- if (!element.getLanguage().isKindOf(JavaLanguage.INSTANCE)) return false;
-
- if (getPair(element) != null) {
- setText(CodeInsightBundle.message("intention.join.declaration.text"));
- return true;
- }
- return false;
- }
-
- private static Pair getPair(PsiElement element) {
- PsiAssignmentExpression assignmentExpression = PsiTreeUtil.getParentOfType(element, PsiAssignmentExpression.class);
- PsiDeclarationStatement declarationStatement = PsiTreeUtil.getParentOfType(element, PsiDeclarationStatement.class);
- if (declarationStatement != null) {
- assignmentExpression = getAssignmentStatement(declarationStatement);
- } else if (assignmentExpression != null) {
- declarationStatement = getDeclarationStatement(assignmentExpression);
- }
-
- if (declarationStatement != null && assignmentExpression != null) {
- final PsiExpression lExpression = assignmentExpression.getLExpression();
- final PsiExpression rExpression = assignmentExpression.getRExpression();
- if (lExpression instanceof PsiReferenceExpression && rExpression != null) {
- final PsiElement resolve = ((PsiReferenceExpression)lExpression).resolve();
- if (resolve instanceof PsiLocalVariable && resolve.getParent() == declarationStatement) {
- final PsiLocalVariable variable = (PsiLocalVariable)resolve;
- if (ReferencesSearch.search(variable, new LocalSearchScope(rExpression), false).findFirst() != null) {
- return null;
- }
- return Pair.createNonNull(variable, assignmentExpression);
- }
- }
- }
- return null;
- }
-
- private static PsiAssignmentExpression getAssignmentStatement(PsiDeclarationStatement statement) {
- final PsiElement element = PsiTreeUtil.skipWhitespacesForward(statement);
- if (element instanceof PsiExpressionStatement) {
- final PsiExpression expression = ((PsiExpressionStatement)element).getExpression();
- if (expression instanceof PsiAssignmentExpression) {
- return (PsiAssignmentExpression)expression;
- }
- }
- return null;
- }
-
- private static PsiDeclarationStatement getDeclarationStatement(PsiAssignmentExpression assignmentExpression) {
- final PsiElement parent = assignmentExpression.getParent();
- if (parent instanceof PsiExpressionStatement) {
- final PsiElement element = PsiTreeUtil.skipWhitespacesBackward(parent);
- if (element instanceof PsiDeclarationStatement) {
- return (PsiDeclarationStatement)element;
- }
- }
- return null;
- }
-
- @Override
- public boolean startInWriteAction() {
- return false;
- }
-
- @Override
- public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException {
- if (!FileModificationService.getInstance().preparePsiElementForWrite(element)) return;
-
- final Pair pair = getPair(element);
- if (pair == null) return;
- final PsiLocalVariable variable = pair.getFirst();
- final PsiAssignmentExpression assignmentExpression = pair.getSecond();
- final PsiExpression initializer = variable.getInitializer();
- if (initializer != null && assignmentExpression.getOperationTokenType() == JavaTokenType.EQ) {
- RemoveInitializerFix.sideEffectAwareRemove(project, initializer, initializer, variable);
- }
- WriteAction.run(() -> {
- final PsiExpression initializerExpression = DeclarationJoinLinesHandler.getInitializerExpression(variable, assignmentExpression);
- if (initializerExpression != null) {
- variable.setInitializer(initializerExpression);
- assignmentExpression.delete();
- }
- });
- }
-}
diff --git a/java/java-impl/src/com/intellij/codeInspection/JoinDeclarationAndAssignmentJavaInspection.java b/java/java-impl/src/com/intellij/codeInspection/JoinDeclarationAndAssignmentJavaInspection.java
new file mode 100644
index 000000000000..ba604afcbaba
--- /dev/null
+++ b/java/java-impl/src/com/intellij/codeInspection/JoinDeclarationAndAssignmentJavaInspection.java
@@ -0,0 +1,136 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.codeInspection;
+
+import com.intellij.codeInsight.FileModificationService;
+import com.intellij.codeInsight.editorActions.DeclarationJoinLinesHandler;
+import com.intellij.openapi.application.WriteAction;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Pair;
+import com.intellij.psi.*;
+import com.intellij.psi.search.LocalSearchScope;
+import com.intellij.psi.search.searches.ReferencesSearch;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.ObjectUtils;
+import com.siyeh.ig.psiutils.CommentTracker;
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * It's called "Java" inspection because the name without "Java" already exists.
+ *
+ * @author Pavel.Dolgov
+ */
+public class JoinDeclarationAndAssignmentJavaInspection extends AbstractBaseJavaLocalInspectionTool {
+ @NotNull
+ @Override
+ public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
+ return new JavaElementVisitor() {
+ @Override
+ public void visitAssignmentExpression(PsiAssignmentExpression assignmentExpression) {
+ super.visitAssignmentExpression(assignmentExpression);
+
+ final Pair.NonNull pair = getPair(assignmentExpression);
+ if (pair != null) {
+ String name = pair.getFirst().getName();
+ if (name != null) {
+ String message = InspectionsBundle.message("inspection.join.declaration.and.assignment.message", name);
+ JoinDeclarationAndAssignmentFix fix = new JoinDeclarationAndAssignmentFix();
+ holder.registerProblem(pair.getFirst(), message, fix);
+ holder.registerProblem(pair.getSecond(), message, fix);
+ }
+ }
+ }
+ };
+ }
+
+ @Nullable
+ private static Pair.NonNull getPair(@Nullable PsiElement element) {
+ PsiLocalVariable variable = null;
+ PsiAssignmentExpression assignmentExpression = null;
+ if (element instanceof PsiAssignmentExpression) {
+ assignmentExpression = (PsiAssignmentExpression)element;
+ variable = findVariable(assignmentExpression);
+ }
+ else if (element instanceof PsiLocalVariable) {
+ variable = (PsiLocalVariable)element;
+ assignmentExpression = findAssignment(variable);
+ }
+ if (variable != null && assignmentExpression != null) {
+ PsiExpression rExpression = assignmentExpression.getRExpression();
+ if (rExpression != null &&
+ ReferencesSearch.search(variable, new LocalSearchScope(rExpression), false).findFirst() == null) {
+ return Pair.createNonNull(variable, assignmentExpression);
+ }
+ }
+ return null;
+ }
+
+ @Nullable
+ private static PsiLocalVariable findVariable(@NotNull PsiAssignmentExpression assignmentExpression) {
+ PsiElement assignmentParent = assignmentExpression.getParent();
+ if (assignmentParent instanceof PsiExpressionStatement) {
+ PsiElement candidate = PsiTreeUtil.skipWhitespacesAndCommentsBackward(assignmentParent);
+ if (candidate instanceof PsiDeclarationStatement) {
+ PsiExpression lExpression = assignmentExpression.getLExpression();
+ if (lExpression instanceof PsiReferenceExpression) {
+ PsiElement resolved = ((PsiReferenceExpression)lExpression).resolve();
+ if (resolved instanceof PsiLocalVariable && resolved.getParent() == candidate) {
+ return (PsiLocalVariable)resolved;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ @Nullable
+ private static PsiAssignmentExpression findAssignment(@NotNull PsiVariable variable) {
+ PsiDeclarationStatement statement = ObjectUtils.tryCast(variable.getParent(), PsiDeclarationStatement.class);
+ PsiElement candidate = PsiTreeUtil.skipWhitespacesAndCommentsForward(statement);
+ if (candidate instanceof PsiExpressionStatement) {
+ PsiExpression expression = ((PsiExpressionStatement)candidate).getExpression();
+ if (expression instanceof PsiAssignmentExpression) {
+ return (PsiAssignmentExpression)expression;
+ }
+ }
+ return null;
+ }
+
+
+ private static class JoinDeclarationAndAssignmentFix implements LocalQuickFix {
+ @Nls(capitalization = Nls.Capitalization.Sentence)
+ @NotNull
+ @Override
+ public String getFamilyName() {
+ return InspectionsBundle.message("inspection.join.declaration.and.assignment.fix.family.name");
+ }
+
+ @Override
+ public boolean startInWriteAction() {
+ return false;
+ }
+
+ @Override
+ public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
+ Pair.NonNull pair = getPair(descriptor.getPsiElement());
+ if (pair != null) {
+ PsiLocalVariable variable = pair.getFirst();
+ PsiAssignmentExpression assignmentExpression = pair.getSecond();
+ PsiExpression initializer = variable.getInitializer();
+ if (initializer != null && assignmentExpression.getOperationTokenType() == JavaTokenType.EQ) {
+ RemoveInitializerFix.sideEffectAwareRemove(project, initializer, initializer, variable);
+ }
+
+ if (!FileModificationService.getInstance().prepareFileForWrite(assignmentExpression.getContainingFile())) return;
+ WriteAction.run(() -> {
+ PsiExpression initializerExpression = DeclarationJoinLinesHandler.getInitializerExpression(variable, assignmentExpression);
+ if (initializerExpression != null) {
+ variable.setInitializer(initializerExpression);
+ new CommentTracker().deleteAndRestoreComments(assignmentExpression);
+ }
+ });
+ }
+ }
+ }
+}
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
index d65f8bc96aef..60eaea27d91d 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
@@ -91,6 +91,7 @@ public class MoveClassesOrPackagesDialog extends MoveDialogBase {
}
/** @deprecated use {@link #MoveClassesOrPackagesDialog(Project, boolean, PsiElement[], PsiElement, MoveCallback, String, PsiDirectory, boolean, boolean)} */
+ @Deprecated
@ApiStatus.ScheduledForRemoval(inVersion = "2019.1")
@SuppressWarnings("DeprecatedIsStillUsed")
public MoveClassesOrPackagesDialog(Project project,
@@ -145,6 +146,7 @@ public class MoveClassesOrPackagesDialog extends MoveDialogBase {
}
/** @deprecated use {@link #MoveClassesOrPackagesDialog(Project, boolean, PsiElement[], PsiElement, MoveCallback, String, PsiDirectory, boolean, boolean)} */
+ @Deprecated
@ApiStatus.ScheduledForRemoval(inVersion = "2019.1")
@SuppressWarnings("DeprecatedIsStillUsed")
public void setData(PsiElement[] elementsToMove,
diff --git a/java/java-impl/src/inspectionDescriptions/JoinDeclarationAndAssignmentJava.html b/java/java-impl/src/inspectionDescriptions/JoinDeclarationAndAssignmentJava.html
new file mode 100644
index 000000000000..bc4690658d79
--- /dev/null
+++ b/java/java-impl/src/inspectionDescriptions/JoinDeclarationAndAssignmentJava.html
@@ -0,0 +1,5 @@
+
+
+Reports variable assignments that can be joined with the variable's declaration.
+
+
\ No newline at end of file
diff --git a/java/java-impl/src/intentionDescriptions/JoinDeclarationAndAssignmentAction/after.java.template b/java/java-impl/src/intentionDescriptions/JoinDeclarationAndAssignmentAction/after.java.template
deleted file mode 100644
index f0d31c13ecbe..000000000000
--- a/java/java-impl/src/intentionDescriptions/JoinDeclarationAndAssignmentAction/after.java.template
+++ /dev/null
@@ -1,5 +0,0 @@
-public class X {
- void f() {
- int i = 0;
- }
-}
\ No newline at end of file
diff --git a/java/java-impl/src/intentionDescriptions/JoinDeclarationAndAssignmentAction/before.java.template b/java/java-impl/src/intentionDescriptions/JoinDeclarationAndAssignmentAction/before.java.template
deleted file mode 100644
index 17b0e530a8f7..000000000000
--- a/java/java-impl/src/intentionDescriptions/JoinDeclarationAndAssignmentAction/before.java.template
+++ /dev/null
@@ -1,6 +0,0 @@
-public class X {
- void f() {
- int i;
- i = 0;
- }
-}
\ No newline at end of file
diff --git a/java/java-impl/src/intentionDescriptions/JoinDeclarationAndAssignmentAction/description.html b/java/java-impl/src/intentionDescriptions/JoinDeclarationAndAssignmentAction/description.html
deleted file mode 100644
index a12e0cedeb87..000000000000
--- a/java/java-impl/src/intentionDescriptions/JoinDeclarationAndAssignmentAction/description.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-This intention converts a local variable declaration and consequence assignment to the same variable into one declaration
-
-
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/inlineStreamMap/afterLambdaWithType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/inlineStreamMap/afterLambdaWithType.java
new file mode 100644
index 000000000000..9a375917e36e
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/inlineStreamMap/afterLambdaWithType.java
@@ -0,0 +1,8 @@
+// "Inline 'map' body into the next 'forEach' call" "true"
+import java.util.List;
+
+public class Main {
+ public static void test(List list) {
+ list.stream().forEach((String s) -> System.out.println(s.trim()));
+ }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/inlineStreamMap/afterLambdaWithType2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/inlineStreamMap/afterLambdaWithType2.java
new file mode 100644
index 000000000000..16e59f26c0f9
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/inlineStreamMap/afterLambdaWithType2.java
@@ -0,0 +1,8 @@
+// "Inline 'map' body into the next 'forEach' call" "true"
+import java.util.List;
+
+public class Main {
+ public static void test(List list) {
+ list.stream().forEach(s -> System.out.println(s.trim()));
+ }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/inlineStreamMap/beforeLambdaWithType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/inlineStreamMap/beforeLambdaWithType.java
new file mode 100644
index 000000000000..240175b17a09
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/inlineStreamMap/beforeLambdaWithType.java
@@ -0,0 +1,8 @@
+// "Inline 'map' body into the next 'forEach' call" "true"
+import java.util.List;
+
+public class Main {
+ public static void test(List list) {
+ list.stream().map((String s) -> s.trim()).forEach(x -> System.out.println(x));
+ }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/inlineStreamMap/beforeLambdaWithType2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/inlineStreamMap/beforeLambdaWithType2.java
new file mode 100644
index 000000000000..aa060d73a6c4
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/inlineStreamMap/beforeLambdaWithType2.java
@@ -0,0 +1,8 @@
+// "Inline 'map' body into the next 'forEach' call" "true"
+import java.util.List;
+
+public class Main {
+ public static void test(List list) {
+ list.stream().map(s -> s.trim()).forEach((String x) -> System.out.println(x));
+ }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/afterComment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/afterComment.java
new file mode 100644
index 000000000000..39af6b8af2ae
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/afterComment.java
@@ -0,0 +1,8 @@
+// "Join declaration and assignment" "true"
+class Test {
+ {
+ String ss = "hello"; // comment A
+ // comment B
+ /*comment C*/ /*comment D*/ // comment E
+ }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/beforeComment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/beforeComment.java
new file mode 100644
index 000000000000..c12c5447385c
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/beforeComment.java
@@ -0,0 +1,8 @@
+// "Join declaration and assignment" "true"
+class Test {
+ {
+ String ss = ""; // comment A
+ // comment B
+ /*comment C*/ ss /*comment D*/ = "hello"; // comment E
+ }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/deadCode/methodCallQualifiedWithSuper/expected.xml b/java/java-tests/testData/inspection/deadCode/methodCallQualifiedWithSuper/expected.xml
new file mode 100644
index 000000000000..4704d91e891d
--- /dev/null
+++ b/java/java-tests/testData/inspection/deadCode/methodCallQualifiedWithSuper/expected.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/deadCode/methodCallQualifiedWithSuper/src/Test.java b/java/java-tests/testData/inspection/deadCode/methodCallQualifiedWithSuper/src/Test.java
new file mode 100644
index 000000000000..80f0c2150e96
--- /dev/null
+++ b/java/java-tests/testData/inspection/deadCode/methodCallQualifiedWithSuper/src/Test.java
@@ -0,0 +1,17 @@
+class A {
+ void m(String string) {
+
+ }
+}
+
+class B extends A {
+ void m(String string) {
+ super.m(string + "///");
+ }
+}
+
+public class Test {
+ public static void main(String[] args) {
+ new B().m("abc");
+ }
+}
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/JoinDeclarationAndAssignmentTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/JoinDeclarationAndAssignmentTest.java
new file mode 100644
index 000000000000..f8ad374b867d
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/JoinDeclarationAndAssignmentTest.java
@@ -0,0 +1,24 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.java.codeInsight.daemon.quickFix;
+
+import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
+import com.intellij.codeInspection.JoinDeclarationAndAssignmentJavaInspection;
+import com.intellij.codeInspection.LocalInspectionTool;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Pavel.Dolgov
+ */
+public class JoinDeclarationAndAssignmentTest extends LightQuickFixParameterizedTestCase {
+
+ @NotNull
+ @Override
+ protected LocalInspectionTool[] configureLocalInspectionTools() {
+ return new LocalInspectionTool[]{new JoinDeclarationAndAssignmentJavaInspection()};
+ }
+
+ @Override
+ protected String getBasePath() {
+ return "/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration";
+ }
+}
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/JoinDeclarationTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/JoinDeclarationTest.java
deleted file mode 100644
index 7b7264969235..000000000000
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/JoinDeclarationTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2000-2017 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 com.intellij.java.codeInsight.intention;
-
-import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
-
-public class JoinDeclarationTest extends LightQuickFixParameterizedTestCase {
-
- @Override
- protected String getBasePath() {
- return "/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration";
- }
-}
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/UnusedDeclarationTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/UnusedDeclarationTest.java
index 2b4c47b1641d..fdc78d84bb89 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInspection/UnusedDeclarationTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/UnusedDeclarationTest.java
@@ -238,4 +238,8 @@ public class UnusedDeclarationTest extends AbstractUnusedDeclarationTest {
public void testTypeParameterUsed() {
doTest();
}
+
+ public void testMethodCallQualifiedWithSuper() {
+ doTest();
+ }
}
diff --git a/java/jdkAnnotations/java/util/annotations.xml b/java/jdkAnnotations/java/util/annotations.xml
index 5516e3166915..1e3391190d83 100644
--- a/java/jdkAnnotations/java/util/annotations.xml
+++ b/java/jdkAnnotations/java/util/annotations.xml
@@ -1817,6 +1817,9 @@
+ -
+
+
-
diff --git a/java/openapi/src/com/intellij/codeInsight/MetaAnnotationUtil.java b/java/openapi/src/com/intellij/codeInsight/MetaAnnotationUtil.java
index c133d3d79c7a..a7ecd80906d9 100644
--- a/java/openapi/src/com/intellij/codeInsight/MetaAnnotationUtil.java
+++ b/java/openapi/src/com/intellij/codeInsight/MetaAnnotationUtil.java
@@ -39,7 +39,7 @@ import java.util.stream.Stream;
import static com.intellij.openapi.util.Pair.pair;
/**
- * NB: external annotations are not considered.
+ * NB: Supposed to be used for annotations used in libraries and frameworks only, external annotations are not considered.
*
* @since 2016.3
*/
@@ -80,7 +80,8 @@ public class MetaAnnotationUtil {
}
public static Set getChildren(@NotNull PsiClass psiClass, @NotNull GlobalSearchScope scope) {
- if (AnnotationTargetUtil.findAnnotationTarget(psiClass, PsiAnnotation.TargetType.ANNOTATION_TYPE, PsiAnnotation.TargetType.TYPE) == null) {
+ if (AnnotationTargetUtil.findAnnotationTarget(psiClass, PsiAnnotation.TargetType.ANNOTATION_TYPE, PsiAnnotation.TargetType.TYPE) ==
+ null) {
return Collections.emptySet();
}
@@ -128,7 +129,8 @@ public class MetaAnnotationUtil {
return CachedValuesManager.getManager(project).getCachedValue(project, () -> {
GlobalSearchScope scope = GlobalSearchScope.allScope(project);
Set allAnnotationFiles = new HashSet<>();
- for (PsiClass javaLangAnnotation : JavaPsiFacade.getInstance(project).findClasses(CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION, scope)) {
+ for (PsiClass javaLangAnnotation : JavaPsiFacade.getInstance(project)
+ .findClasses(CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION, scope)) {
DirectClassInheritorsSearch.search(javaLangAnnotation, scope, false).forEach(annotationClass -> {
ProgressManager.checkCanceled();
ContainerUtil.addIfNotNull(allAnnotationFiles, PsiUtilCore.getVirtualFile(annotationClass));
@@ -221,7 +223,8 @@ public class MetaAnnotationUtil {
}
@NotNull
- public static Stream findMetaAnnotations(@NotNull PsiModifierListOwner listOwner, @NotNull Collection annotations) {
+ public static Stream findMetaAnnotations(@NotNull PsiModifierListOwner listOwner,
+ @NotNull Collection annotations) {
Stream directAnnotations = Stream.of(AnnotationUtil.findAnnotations(listOwner, annotations));
Stream lazyResolvedAnnotations =
diff --git a/java/testFramework/intellij.java.testFramework.iml b/java/testFramework/intellij.java.testFramework.iml
index d9d52c0e1680..6aad792c5864 100644
--- a/java/testFramework/intellij.java.testFramework.iml
+++ b/java/testFramework/intellij.java.testFramework.iml
@@ -25,6 +25,7 @@
+
diff --git a/java/testFramework/src/com/intellij/testFramework/CompilerTester.java b/java/testFramework/src/com/intellij/testFramework/CompilerTester.java
index 3773b8ae922c..89d55dea89c1 100644
--- a/java/testFramework/src/com/intellij/testFramework/CompilerTester.java
+++ b/java/testFramework/src/com/intellij/testFramework/CompilerTester.java
@@ -3,6 +3,7 @@ package com.intellij.testFramework;
import com.intellij.compiler.CompilerManagerImpl;
import com.intellij.compiler.CompilerTestUtil;
+import com.intellij.compiler.server.BuildManager;
import com.intellij.diagnostic.ThreadDumper;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.PathMacros;
@@ -21,6 +22,7 @@ import com.intellij.openapi.roots.CompilerProjectExtension;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.ModuleRootModificationUtil;
import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
@@ -40,12 +42,12 @@ import com.intellij.util.io.FileTreePrinterKt;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jps.cmdline.LogSetup;
import org.jetbrains.jps.model.serialization.JpsGlobalLoader;
import org.junit.Assert;
import javax.swing.*;
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -221,6 +223,7 @@ public class CompilerTester {
}
}
}
+ enableDebugLogging();
runnable.consume(callback);
});
@@ -232,6 +235,7 @@ public class CompilerTester {
}
}
+ printBuildLog();
callback.throwException();
if (!((CompilerManagerImpl)CompilerManager.getInstance(getProject())).waitForExternalJavacToTerminate(1, TimeUnit.MINUTES)) {
@@ -241,6 +245,45 @@ public class CompilerTester {
return callback.getMessages();
}
+ public static void printBuildLog() {
+ File logDirectory = BuildManager.getBuildLogDirectory();
+ File[] files = logDirectory.listFiles(file -> file.getName().endsWith(".log"));
+ if (files == null || files.length == 0) {
+ LOG.debug("No *.log files in " + logDirectory + " after build");
+ return;
+ }
+
+ Arrays.sort(files, Comparator.comparing(File::getName));
+ for (File file : files) {
+ LOG.debug(file.getName() + ":");
+ try {
+ List lines = FileUtil.loadLines(file);
+ for (String line : lines) {
+ LOG.debug(line);
+ }
+ }
+ catch (IOException e) {
+ LOG.debug("Failed to load contents: " + e.getMessage());
+ }
+ }
+ }
+
+ public static void enableDebugLogging() throws IOException {
+ File logDirectory = BuildManager.getBuildLogDirectory();
+ FileUtil.delete(logDirectory);
+ FileUtil.createDirectory(logDirectory);
+ Properties properties = new Properties();
+ try (InputStream config = LogSetup.readDefaultLogConfig()) {
+ properties.load(config);
+ }
+
+ properties.setProperty("log4j.rootLogger", "debug, file");
+ File logFile = new File(logDirectory, LogSetup.LOG_CONFIG_FILE_NAME);
+ try (OutputStream output = new BufferedOutputStream(new FileOutputStream(logFile))) {
+ properties.store(output, null);
+ }
+ }
+
private static void refreshVfs(String path) {
VirtualFile vFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(path));
if (vFile != null) {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/LogSetup.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/LogSetup.java
index 5aa940f5c48f..dbba1d9832a4 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/LogSetup.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/LogSetup.java
@@ -32,9 +32,8 @@ import java.nio.charset.StandardCharsets;
*/
public class LogSetup {
- private static final String LOG_CONFIG_FILE_NAME = "build-log.properties";
+ public static final String LOG_CONFIG_FILE_NAME = "build-log.properties";
private static final String LOG_FILE_NAME = "build.log";
- private static final String DEFAULT_LOGGER_CONFIG = "defaultLogConfig.properties";
private static final String LOG_FILE_MACRO = "$LOG_FILE_PATH$";
public static void initLoggers() {
@@ -64,7 +63,7 @@ public class LogSetup {
private static void ensureLogConfigExists(final File logConfig) throws IOException {
if (!logConfig.exists()) {
FileUtil.createIfDoesntExist(logConfig);
- try(InputStream in = LogSetup.class.getResourceAsStream("/" + DEFAULT_LOGGER_CONFIG)) {
+ try(InputStream in = readDefaultLogConfig()) {
if (in != null) {
try (FileOutputStream out = new FileOutputStream(logConfig)) {
FileUtil.copy(in, out);
@@ -74,6 +73,10 @@ public class LogSetup {
}
}
+ public static InputStream readDefaultLogConfig() {
+ return LogSetup.class.getResourceAsStream("/defaultLogConfig.properties");
+ }
+
private static class MyLoggerFactory implements Logger.Factory {
@NotNull
@Override
diff --git a/json/src/com/intellij/json/JsonBundle.properties b/json/src/com/intellij/json/JsonBundle.properties
index a235cff493c8..d48fa5992bed 100644
--- a/json/src/com/intellij/json/JsonBundle.properties
+++ b/json/src/com/intellij/json/JsonBundle.properties
@@ -6,6 +6,7 @@ syntax.error.missing.closing.quote=Missing closing quote
syntax.error.illegal.escape.sequence=Illegal escape sequence
syntax.error.illegal.unicode.escape.sequence=Illegal unicode escape sequence
syntax.error.illegal.floating.point.literal=Illegal floating point literal
+syntax.error.control.char.in.string=Control character ''{0}'' is not allowed in string literals
# Inspections
json.inspection.group=JSON and JSON5
diff --git a/json/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java b/json/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java
index 90d60d65d5b6..4ad034d8ece6 100644
--- a/json/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java
+++ b/json/src/com/intellij/json/codeinsight/JsonLiteralAnnotator.java
@@ -63,10 +63,9 @@ public class JsonLiteralAnnotator implements Annotator {
for (Pair fragment: fragments) {
for (JsonLiteralChecker checker: extensions) {
if (!checker.isApplicable(element)) continue;
- String error = checker.getErrorForStringFragment(fragment.getSecond());
+ Pair error = checker.getErrorForStringFragment(fragment, stringLiteral);
if (error != null) {
- final TextRange fragmentRange = fragment.getFirst();
- holder.createErrorAnnotation(fragmentRange.shiftRight(elementOffset), error);
+ holder.createErrorAnnotation(error.getFirst().shiftRight(elementOffset), error.second);
}
}
}
diff --git a/json/src/com/intellij/json/codeinsight/JsonLiteralChecker.java b/json/src/com/intellij/json/codeinsight/JsonLiteralChecker.java
index 73480ad29bf7..6b8fe13061ff 100644
--- a/json/src/com/intellij/json/codeinsight/JsonLiteralChecker.java
+++ b/json/src/com/intellij/json/codeinsight/JsonLiteralChecker.java
@@ -1,7 +1,10 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.json.codeinsight;
+import com.intellij.json.psi.JsonStringLiteral;
import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.Nullable;
@@ -12,7 +15,7 @@ public interface JsonLiteralChecker {
String getErrorForNumericLiteral(String literalText);
@Nullable
- String getErrorForStringFragment(String fragmentText);
+ Pair getErrorForStringFragment(Pair fragmentText, JsonStringLiteral stringLiteral);
boolean isApplicable(PsiElement element);
}
diff --git a/json/src/com/intellij/json/codeinsight/StandardJsonLiteralChecker.java b/json/src/com/intellij/json/codeinsight/StandardJsonLiteralChecker.java
index c67c7cb471b2..06b878168574 100644
--- a/json/src/com/intellij/json/codeinsight/StandardJsonLiteralChecker.java
+++ b/json/src/com/intellij/json/codeinsight/StandardJsonLiteralChecker.java
@@ -3,6 +3,9 @@ package com.intellij.json.codeinsight;
import com.intellij.json.JsonBundle;
import com.intellij.json.JsonDialectUtil;
+import com.intellij.json.psi.JsonStringLiteral;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.Nullable;
@@ -29,8 +32,25 @@ public class StandardJsonLiteralChecker implements JsonLiteralChecker {
@Nullable
@Override
- public String getErrorForStringFragment(String fragmentText) {
- return getStringError(fragmentText);
+ public Pair getErrorForStringFragment(Pair fragment, JsonStringLiteral stringLiteral) {
+ if (fragment.getSecond().chars().anyMatch(c -> c <= '\u001F')) { // fragments are cached, string values - aren't; go inside only if we encountered a potentially 'wrong' char
+ final String text = stringLiteral.getText();
+ if (new TextRange(0, text.length()).contains(fragment.first)) {
+ final int startOffset = fragment.first.getStartOffset();
+ final String part = text.substring(startOffset, fragment.first.getEndOffset());
+ char[] array = part.toCharArray();
+ for (int i = 0; i < array.length; i++) {
+ char c = array[i];
+ if (c <= '\u001F') {
+ return Pair.create(new TextRange(startOffset + i, startOffset + i + 1),
+ JsonBundle
+ .message("syntax.error.control.char.in.string", "\\u" + Integer.toHexString(c | 0x10000).substring(1)));
+ }
+ }
+ }
+ }
+ final String error = getStringError(fragment.second);
+ return error == null ? null : Pair.create(fragment.first, error);
}
@Nullable
diff --git a/json/src/com/intellij/json/editor/JsonEditorOptions.java b/json/src/com/intellij/json/editor/JsonEditorOptions.java
index cf4f311125dd..82dfdd6273db 100644
--- a/json/src/com/intellij/json/editor/JsonEditorOptions.java
+++ b/json/src/com/intellij/json/editor/JsonEditorOptions.java
@@ -17,6 +17,7 @@ public class JsonEditorOptions implements PersistentStateComponent settings.AUTO_QUOTE_PROP_NAME,
v -> settings.AUTO_QUOTE_PROP_NAME = v);
+ checkBox("Automatically add whitespace when typing ':' after property namess",
+ () -> settings.AUTO_WHITESPACE_AFTER_COLON,
+ v -> settings.AUTO_WHITESPACE_AFTER_COLON = v);
}
@Override
diff --git a/json/src/com/intellij/json/editor/JsonTypedHandler.java b/json/src/com/intellij/json/editor/JsonTypedHandler.java
index 0c4ca7cc6cec..075bf2443be7 100644
--- a/json/src/com/intellij/json/editor/JsonTypedHandler.java
+++ b/json/src/com/intellij/json/editor/JsonTypedHandler.java
@@ -4,14 +4,18 @@ package com.intellij.json.editor;
import com.intellij.codeInsight.editorActions.TypedHandlerDelegate;
import com.intellij.codeInsight.editorActions.smartEnter.SmartEnterProcessor;
import com.intellij.json.JsonDialectUtil;
+import com.intellij.json.JsonElementTypes;
import com.intellij.json.psi.*;
+import com.intellij.lang.ASTNode;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiErrorElement;
import com.intellij.psi.PsiFile;
+import com.intellij.psi.tree.TokenSet;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
@@ -21,6 +25,7 @@ public class JsonTypedHandler extends TypedHandlerDelegate {
public Result charTyped(char c, @NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) {
if (file instanceof JsonFile) {
processPairedBracesComma(c, editor, file);
+ addWhiteSpaceAfterColonIfNeeded(c, editor, file);
}
return Result.CONTINUE;
}
@@ -38,6 +43,26 @@ public class JsonTypedHandler extends TypedHandlerDelegate {
return Result.CONTINUE;
}
+ private static void addWhiteSpaceAfterColonIfNeeded(char c,
+ @NotNull Editor editor,
+ @NotNull PsiFile file) {
+ if (c != ':' || !JsonEditorOptions.getInstance().AUTO_WHITESPACE_AFTER_COLON) return;
+ int offset = editor.getCaretModel().getOffset();
+ PsiDocumentManager.getInstance(file.getProject()).commitDocument(editor.getDocument());
+ PsiElement element = PsiTreeUtil.skipWhitespacesBackward(file.findElementAt(offset));
+ if (!(element instanceof JsonProperty)) return;
+ final ASTNode[] children = element.getNode().getChildren(TokenSet.create(JsonElementTypes.COLON));
+ if (children.length == 0) return;
+ final ASTNode colon = children[0];
+ final ASTNode next = colon.getTreeNext();
+ final String text = next.getText();
+ if (text.length() == 0 || !StringUtil.isEmptyOrSpaces(text)) {
+ final int insOffset = colon.getStartOffset() + 1;
+ editor.getDocument().insertString(insOffset, " ");
+ editor.getCaretModel().moveToOffset(insOffset + 1);
+ }
+ }
+
private static void addPropertyNameQuotesIfNeeded(char c,
@NotNull Editor editor,
@NotNull PsiFile file) {
diff --git a/json/src/com/intellij/json/json5/codeinsight/Json5JsonLiteralChecker.java b/json/src/com/intellij/json/json5/codeinsight/Json5JsonLiteralChecker.java
index 8fbdfa26082e..1ed1f273dd16 100644
--- a/json/src/com/intellij/json/json5/codeinsight/Json5JsonLiteralChecker.java
+++ b/json/src/com/intellij/json/json5/codeinsight/Json5JsonLiteralChecker.java
@@ -5,6 +5,9 @@ import com.intellij.json.JsonDialectUtil;
import com.intellij.json.codeinsight.JsonLiteralChecker;
import com.intellij.json.codeinsight.StandardJsonLiteralChecker;
import com.intellij.json.json5.Json5Language;
+import com.intellij.json.psi.JsonStringLiteral;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.Nullable;
@@ -22,7 +25,8 @@ public class Json5JsonLiteralChecker implements JsonLiteralChecker {
@Nullable
@Override
- public String getErrorForStringFragment(String fragmentText) {
+ public Pair getErrorForStringFragment(Pair fragment, JsonStringLiteral stringLiteral) {
+ String fragmentText = fragment.second;
if (fragmentText.startsWith("\\") && fragmentText.length() > 1 && fragmentText.endsWith("\n")) {
if (StringUtil.isEmptyOrSpaces(fragmentText.substring(1, fragmentText.length() - 1))) {
return null;
@@ -37,7 +41,8 @@ public class Json5JsonLiteralChecker implements JsonLiteralChecker {
return null;
}
- return StandardJsonLiteralChecker.getStringError(fragmentText);
+ final String error = StandardJsonLiteralChecker.getStringError(fragmentText);
+ return error == null ? null : Pair.create(fragment.first, error);
}
@Override
diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.java
index cc9b3dc8f70f..be3d5177a49b 100644
--- a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.java
+++ b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.java
@@ -639,7 +639,7 @@ public class JsonSchemaCompletionContributor extends CompletionContributor {
editor.getCaretModel().moveToOffset(newOffset);
}
- if (!walker.invokeEnterBeforeObjectAndArray()) {
+ if (!walker.invokeEnterBeforeObjectAndArray() && !stringToInsert.equals(": ")) {
formatInsertedString(context, stringToInsert.length());
}
diff --git a/json/tests/test/com/intellij/json/JsonHighlightingTest.java b/json/tests/test/com/intellij/json/JsonHighlightingTest.java
index eed398682b71..ab7d42fa4346 100644
--- a/json/tests/test/com/intellij/json/JsonHighlightingTest.java
+++ b/json/tests/test/com/intellij/json/JsonHighlightingTest.java
@@ -62,6 +62,11 @@ public class JsonHighlightingTest extends JsonHighlightingTestBase {
doTestHighlighting(false, true, true);
}
+ public void testTabInString() {
+ enableStandardComplianceInspection(true, true);
+ doTestHighlighting(false, true, true);
+ }
+
public void testSemanticHighlighting() {
// WEB-11239
doTest();
diff --git a/json/tests/test/com/intellij/json/JsonTypingHandlingTest.java b/json/tests/test/com/intellij/json/JsonTypingHandlingTest.java
index d890a564409b..11f6a4ecb3d5 100644
--- a/json/tests/test/com/intellij/json/JsonTypingHandlingTest.java
+++ b/json/tests/test/com/intellij/json/JsonTypingHandlingTest.java
@@ -68,11 +68,11 @@ public class JsonTypingHandlingTest extends JsonTestCase {
}
public void testAutoQuotesForPropName() {
doTestColon( "{ x}", "{\n" +
- " \"x\":\n" +
+ " \"x\": \n" +
"}");
}
public void testAutoQuotesForPropNameFalse1() {
- doTestColon( "{ \"x\"}", "{ \"x\":}");
+ doTestColon( "{ \"x\"}", "{ \"x\": }");
}
public void testAutoQuotesForPropNameFalse2() {
doTestColon( "{ \"x\"}", "{ \"x:\"}");
diff --git a/json/tests/test/com/jetbrains/jsonSchema/impl/JsonBySchemaHeavyCompletionTest.java b/json/tests/test/com/jetbrains/jsonSchema/impl/JsonBySchemaHeavyCompletionTest.java
index f65b9103f6af..d748e64fa298 100644
--- a/json/tests/test/com/jetbrains/jsonSchema/impl/JsonBySchemaHeavyCompletionTest.java
+++ b/json/tests/test/com/jetbrains/jsonSchema/impl/JsonBySchemaHeavyCompletionTest.java
@@ -93,6 +93,10 @@ public class JsonBySchemaHeavyCompletionTest extends JsonBySchemaHeavyCompletion
baseInsertTest("insertPropertyName", "testNameWithDefaultStringValueComma");
}
+ public void testWhitespaceAfterColon() throws Exception {
+ baseInsertTest("addWhitespaceAfterColon", "colon");
+ }
+
public void testArrayLiteral() throws Exception {
baseInsertTest("insertArrayOrObjectLiteral", "arrayLiteral");
complete();
diff --git a/json/tests/testData/highlighting/TabInString.json b/json/tests/testData/highlighting/TabInString.json
new file mode 100644
index 000000000000..ca965ad60d33
--- /dev/null
+++ b/json/tests/testData/highlighting/TabInString.json
@@ -0,0 +1,4 @@
+{
+ "mode": "ftp ",
+ "name": "test\t"
+}
\ No newline at end of file
diff --git a/json/tests/testData/jsonSchema/completion/addWhitespaceAfterColon/Schema.json b/json/tests/testData/jsonSchema/completion/addWhitespaceAfterColon/Schema.json
new file mode 100644
index 000000000000..9f219dffbbac
--- /dev/null
+++ b/json/tests/testData/jsonSchema/completion/addWhitespaceAfterColon/Schema.json
@@ -0,0 +1,7 @@
+{
+ "properties": {
+ "test": {
+ "type": "integer"
+ }
+ }
+}
diff --git a/json/tests/testData/jsonSchema/completion/addWhitespaceAfterColon/colon.json b/json/tests/testData/jsonSchema/completion/addWhitespaceAfterColon/colon.json
new file mode 100644
index 000000000000..99c58e8994b1
--- /dev/null
+++ b/json/tests/testData/jsonSchema/completion/addWhitespaceAfterColon/colon.json
@@ -0,0 +1,3 @@
+{
+ tes
+}
diff --git a/json/tests/testData/jsonSchema/completion/addWhitespaceAfterColon/colon_after.json b/json/tests/testData/jsonSchema/completion/addWhitespaceAfterColon/colon_after.json
new file mode 100644
index 000000000000..3f0950eb9abf
--- /dev/null
+++ b/json/tests/testData/jsonSchema/completion/addWhitespaceAfterColon/colon_after.json
@@ -0,0 +1,3 @@
+{
+ "test":
+}
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
index 930243222b75..efd7a30e1449 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
@@ -47,6 +47,7 @@ import com.intellij.xml.util.XmlStringUtil;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -424,12 +425,21 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP
private static final int POST_UPDATE_ALL = 5;
+ private static final AtomicInteger RESTART_REQUESTS = new AtomicInteger();
+
+ @TestOnly
+ static boolean isRestartPending() {
+ return RESTART_REQUESTS.get() > 0;
+ }
+
private static void cancelAndRestartDaemonLater(@NotNull ProgressIndicator progress,
@NotNull final Project project) throws ProcessCanceledException {
+ RESTART_REQUESTS.incrementAndGet();
progress.cancel();
Application application = ApplicationManager.getApplication();
int delay = application.isUnitTestMode() ? 0 : RESTART_DAEMON_RANDOM.nextInt(100);
EdtExecutorService.getScheduledExecutorInstance().schedule(() -> {
+ RESTART_REQUESTS.decrementAndGet();
if (!project.isDisposed()) {
DaemonCodeAnalyzer.getInstance(project).restart();
}
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/ApplicationInfoProperties.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/ApplicationInfoProperties.groovy
index 86df918e6b66..6153c7d4e6ac 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/ApplicationInfoProperties.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/ApplicationInfoProperties.groovy
@@ -58,7 +58,8 @@ class ApplicationInfoProperties {
minorVersionMainPart = minorVersion.takeWhile { it != '.' }
isEAP = Boolean.parseBoolean(root.version.first().@eap)
shortCompanyName = root.company.first().@shortName ?: shortenCompanyName(companyName)
- svgRelativePath = root.icon.first().@svg
+ def svgPath = root.icon.first().@svg
+ svgRelativePath = isEAP && root."icon-eap" != null ? (root."icon-eap".first().@svg ?: svgPath) : svgPath
}
String getUpperCaseProductName() { shortProductName.toUpperCase() }
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index a205c6b315ca..7684cf76d4cf 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -376,7 +376,7 @@ class CommunityLibraryLicenses {
licenseUrl: "https://github.com/MarkusBernhardt/proxy-vole/blob/master/LICENSE.md"),
new LibraryLicense(name: "pty4j", libraryName: "pty4j", version: "0.8.4", license: "Eclipse Public License v1.0",
url: "https://github.com/JetBrains/pty4j"),
- new LibraryLicense(name: "PureJavaComm", libraryName: "purejavacomm", version: "0.0.11.1", license: "BSD",
+ new LibraryLicense(name: "PureJavaComm", libraryName: "pty4j", version: "0.0.11.1", license: "BSD",
url: "https://github.com/nyholku/purejavacomm"),
new LibraryLicense(name: "pycodestyle.py", attachedTo: "intellij.python.helpers", version: "2.3.1", license: "MIT",
url: "http://pycodestyle.readthedocs.io/"),
@@ -387,7 +387,7 @@ class CommunityLibraryLicenses {
licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),
new LibraryLicense(name: "Roboto", attachedTo: "intellij.platform.resources", version: "1.100141", license: "Apache 2.0",
url: "https://github.com/google/roboto/blob/master/LICENSE"),
- new LibraryLicense(name: "sa-jdwp", version: "1.0.4", license: "GPL 2.0 + Classpath", url: "https://github.com/JetBrains/jdk-sa-jdwp",
+ new LibraryLicense(name: "sa-jdwp", version: "1.0.5", license: "GPL 2.0 + Classpath", url: "https://github.com/JetBrains/jdk-sa-jdwp",
licenseUrl: "https://raw.githubusercontent.com/JetBrains/jdk-sa-jdwp/master/LICENSE.txt"),
new LibraryLicense(name: "Saxon-6.5.5", version: "6.5.5", license: "Mozilla Public License", url: "http://saxon.sourceforge.net/",
licenseUrl: "http://www.mozilla.org/MPL/"),
diff --git a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/gitUtils.kt b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/gitUtils.kt
index e8babf275724..27e09c81f06f 100644
--- a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/gitUtils.kt
+++ b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/gitUtils.kt
@@ -33,12 +33,14 @@ private fun listGitTree(
File(it).relativeTo(repo).path
} ?: ""
log("Inspecting $repo")
- try {
+ if (BUILD_SERVER == null) try {
listOf(GIT, "pull", "--rebase").execute(repo)
}
catch (e: Exception) {
- listOf(GIT, "rebase", "--abort").execute(repo)
- throw e
+ callSafely {
+ listOf(GIT, "rebase", "--abort").execute(repo)
+ }
+ log("Unable to pull changes for $repo")
}
return listOf(GIT, "ls-tree", "HEAD", "-r", relativeDirToList)
.execute(repo).trim().lineSequence()
diff --git a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/reportUtils.kt b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/reportUtils.kt
index deb4c8339de5..b745567d1a4f 100644
--- a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/reportUtils.kt
+++ b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/reportUtils.kt
@@ -52,7 +52,7 @@ private fun sendNotification(isSuccess: Boolean) {
}
}
-private val BUILD_SERVER = System.getProperty("teamcity.serverUrl")
+internal val BUILD_SERVER = System.getProperty("teamcity.serverUrl")
private val BUILD_CONF = System.getProperty("teamcity.buildType.id")
private val DATE_FORMAT = SimpleDateFormat("yyyyMMdd'T'HHmmsszzz")
diff --git a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/utils.kt b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/utils.kt
index 8994d9966d90..912f06e3f793 100644
--- a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/utils.kt
+++ b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/utils.kt
@@ -2,6 +2,7 @@
package org.jetbrains.intellij.build.images.sync
import java.io.File
+import java.util.concurrent.TimeUnit
import java.util.function.Consumer
internal lateinit var logger: Consumer
@@ -23,7 +24,7 @@ internal fun List.execute(workingDir: File?, silent: Boolean = false): S
.start()
val output = process.inputStream.bufferedReader().use { it.readText() }
val error = process.errorStream.bufferedReader().use { it.readText() }
- process.waitFor()
+ process.waitFor(1, TimeUnit.MINUTES)
if (process.exitValue() != 0) {
error("Command ${this} failed with ${process.exitValue()} : $error")
}
diff --git a/platform/core-api/src/com/intellij/openapi/application/WriteAction.java b/platform/core-api/src/com/intellij/openapi/application/WriteAction.java
index b458841be3c4..941556378a8c 100644
--- a/platform/core-api/src/com/intellij/openapi/application/WriteAction.java
+++ b/platform/core-api/src/com/intellij/openapi/application/WriteAction.java
@@ -81,12 +81,7 @@ public abstract class WriteAction extends BaseActionRunnable {
@NotNull
public static AccessToken start() {
// get useful information about the write action
- return start(4);
- }
-
- @NotNull
- private static AccessToken start(int stackDepthToMeaningfulFrame) {
- Class callerClass = ObjectUtils.notNull(ReflectionUtil.getCallerClass(stackDepthToMeaningfulFrame), WriteAction.class);
+ Class callerClass = ObjectUtils.notNull(ReflectionUtil.getCallerClass(3), WriteAction.class);
return start(callerClass);
}
@@ -106,7 +101,7 @@ public abstract class WriteAction extends BaseActionRunnable {
* Must be called from the EDT.
*/
public static void run(@NotNull ThrowableRunnable action) throws E {
- AccessToken token = start(4);
+ AccessToken token = start(action.getClass());
try {
action.run();
}
@@ -120,13 +115,7 @@ public abstract class WriteAction extends BaseActionRunnable {
* Must be called from the EDT.
*/
public static T compute(@NotNull ThrowableComputable action) throws E {
- AccessToken token = start(4);
- try {
- return action.compute();
- }
- finally {
- token.finish();
- }
+ return ApplicationManager.getApplication().runWriteAction(action);
}
/**
@@ -159,13 +148,7 @@ public abstract class WriteAction extends BaseActionRunnable {
public static T computeAndWait(@NotNull ThrowableComputable action) throws E {
Application application = ApplicationManager.getApplication();
if (application.isDispatchThread()) {
- AccessToken token = start(action.getClass());
- try {
- return action.compute();
- }
- finally {
- token.finish();
- }
+ return ApplicationManager.getApplication().runWriteAction(action);
}
if (application.isReadAccessAllowed()) {
@@ -174,16 +157,12 @@ public abstract class WriteAction extends BaseActionRunnable {
final AtomicReference result = new AtomicReference<>();
final AtomicReference exception = new AtomicReference<>();
TransactionGuard.getInstance().submitTransactionAndWait(() -> {
- AccessToken token = start(action.getClass());
try {
- result.set(action.compute());
+ result.set(compute(action));
}
catch (Throwable e) {
exception.set(e);
}
- finally {
- token.finish();
- }
});
Throwable t = exception.get();
diff --git a/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java b/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
index 6777ffe44588..3358b60384db 100644
--- a/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
+++ b/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
@@ -377,6 +377,7 @@ public abstract class WriteCommandAction extends BaseActionRunnable {
/**
* @deprecated use {@link FileModificationService#preparePsiElementsForWrite(Collection)} (to be removed in IDEA 2018)
*/
+ @Deprecated
public static boolean ensureFilesWritable(@NotNull Project project, @NotNull Collection psiFiles) {
return FileModificationService.getInstance().preparePsiElementsForWrite(psiFiles);
}
diff --git a/platform/core-api/src/com/intellij/openapi/components/ApplicationComponent.java b/platform/core-api/src/com/intellij/openapi/components/ApplicationComponent.java
index 83d7c30b7828..d36a671db321 100644
--- a/platform/core-api/src/com/intellij/openapi/components/ApplicationComponent.java
+++ b/platform/core-api/src/com/intellij/openapi/components/ApplicationComponent.java
@@ -4,6 +4,7 @@ package com.intellij.openapi.components;
/**
* @deprecated Not used anymore.
*/
+@Deprecated
public interface ApplicationComponent extends BaseComponent {
/**
* @deprecated Not used anymore.
diff --git a/platform/core-api/src/com/intellij/openapi/editor/event/DocumentListener.java b/platform/core-api/src/com/intellij/openapi/editor/event/DocumentListener.java
index bc9c371dbc07..afb3833b5acc 100644
--- a/platform/core-api/src/com/intellij/openapi/editor/event/DocumentListener.java
+++ b/platform/core-api/src/com/intellij/openapi/editor/event/DocumentListener.java
@@ -13,7 +13,6 @@ import java.util.EventListener;
* @see com.intellij.openapi.editor.Document#addDocumentListener(DocumentListener)
* @see EditorEventMulticaster#addDocumentListener(DocumentListener)
*/
-@SuppressWarnings("JavadocReference")
public interface DocumentListener extends EventListener{
DocumentListener[] EMPTY_ARRAY = new DocumentListener[0];
ArrayFactory ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new DocumentListener[count];
diff --git a/platform/core-api/src/com/intellij/openapi/project/DumbAware.java b/platform/core-api/src/com/intellij/openapi/project/DumbAware.java
index c9cb054463f4..02e73d831377 100644
--- a/platform/core-api/src/com/intellij/openapi/project/DumbAware.java
+++ b/platform/core-api/src/com/intellij/openapi/project/DumbAware.java
@@ -35,10 +35,9 @@ package com.intellij.openapi.project;
* {@link com.intellij.lang.injection.MultiHostInjector}s
*
* @author peter
- * @see com.intellij.openapi.project.DumbService
- * @see com.intellij.openapi.project.DumbAwareRunnable
+ * @see DumbService
+ * @see DumbAwareRunnable
* @see PossiblyDumbAware
*/
-@SuppressWarnings("JavadocReference")
public interface DumbAware {
}
diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
index 608146c9ed3f..3e0d183627eb 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
@@ -131,7 +131,6 @@ public abstract class VirtualFile extends UserDataHolderBase implements Modifica
*
* @return the path
*/
- @SuppressWarnings("JavadocReference")
@NotNull
public abstract String getPath();
@@ -327,7 +326,6 @@ public abstract class VirtualFile extends UserDataHolderBase implements Modifica
* When IDEA has no idea what the file type is (i.e. file type is not registered via {@link FileTypeRegistry}),
* it returns {@link com.intellij.openapi.fileTypes.FileTypes#UNKNOWN}
*/
- @SuppressWarnings("JavadocReference")
@NotNull
public FileType getFileType() {
return FileTypeRegistry.getInstance().getFileTypeByFile(this);
diff --git a/platform/core-api/src/com/intellij/psi/PsiReference.java b/platform/core-api/src/com/intellij/psi/PsiReference.java
index 08f484afe8dc..c08b0a4cf286 100644
--- a/platform/core-api/src/com/intellij/psi/PsiReference.java
+++ b/platform/core-api/src/com/intellij/psi/PsiReference.java
@@ -106,7 +106,7 @@ public interface PsiReference {
boolean isReferenceTo(@NotNull PsiElement element);
/**
- * Returns the array of String, {@link PsiElement} and/or {@link LookupElement}
+ * Returns the array of String, {@link PsiElement} and/or {@link com.intellij.codeInsight.lookup.LookupElement}
* instances representing all identifiers that are visible at the location of the reference. The contents
* of the returned array is used to build the lookup list for basic code completion. (The list
* of visible identifiers may not be filtered by the completion prefix string - the
@@ -116,7 +116,6 @@ public interface PsiReference {
*
* @return the array of available identifiers.
*/
- @SuppressWarnings("JavadocReference")
@NotNull
default Object[] getVariants() {
return ArrayUtil.EMPTY_OBJECT_ARRAY;
diff --git a/platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java b/platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
index 10740fef2f9a..bbfa11fcc588 100644
--- a/platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
+++ b/platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
@@ -3,6 +3,7 @@ package com.intellij.psi.util;
import com.intellij.lang.ASTNode;
import com.intellij.lang.Language;
+import com.intellij.lang.injection.InjectedLanguageManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.Key;
@@ -18,10 +19,7 @@ import com.intellij.psi.stubs.StubBase;
import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.templateLanguages.OuterLanguageElement;
import com.intellij.psi.tree.IElementType;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.Consumer;
-import com.intellij.util.PairProcessor;
-import com.intellij.util.SmartList;
+import com.intellij.util.*;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
@@ -123,8 +121,17 @@ public class PsiTreeUtil {
public static PsiElement findCommonParent(@NotNull PsiElement element1, @NotNull PsiElement element2) {
// optimization
if (element1 == element2) return element1;
- final PsiFile containingFile = element1.getContainingFile();
- final PsiElement topLevel = containingFile == element2.getContainingFile() ? containingFile : null;
+ PsiFile file1 = element1.getContainingFile();
+ PsiFile file2 = element2.getContainingFile();
+ if (file1 != null && file2 != null) {
+ InjectedLanguageManager ilm = InjectedLanguageManager.getInstance(file1.getProject());
+ if (ilm.isInjectedFragment(file1) != ilm.isInjectedFragment(file2)) {
+ // injected and non-injected files have no common ancestor
+ return null;
+ }
+ }
+
+ PsiElement topLevel = file1 == file2 ? file1 : null;
int depth1 = getDepth(element1, topLevel);
int depth2 = getDepth(element2, topLevel);
diff --git a/platform/core-api/src/com/intellij/util/graph/GraphAlgorithms.java b/platform/core-api/src/com/intellij/util/graph/GraphAlgorithms.java
index 7d03bd84d6cd..0b18b44aca13 100644
--- a/platform/core-api/src/com/intellij/util/graph/GraphAlgorithms.java
+++ b/platform/core-api/src/com/intellij/util/graph/GraphAlgorithms.java
@@ -22,6 +22,7 @@ public abstract class GraphAlgorithms {
/**
* @deprecated use more generic {@link #findShortestPath(InboundSemiGraph, Object, Object)} instead
*/
+ @Deprecated
@Nullable
public abstract List findShortestPath(@NotNull Graph graph, @NotNull Node start, @NotNull Node finish);
diff --git a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java
index 037859c8a586..bc813e9824f2 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java
@@ -45,7 +45,8 @@ public abstract class ApplicationInfoEx extends ApplicationInfo {
public abstract String getSmallIconUrl();
- public abstract String getBigIconUrl();
+ @Nullable
+ public abstract String getApplicationSvgIconUrl();
@Nullable
public abstract File getSvgIconFile();
diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
index c359cf751d4e..bd172000f3f9 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
@@ -61,8 +61,8 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
@SuppressWarnings("UseJBColor") private Color mySplashTextColor = new Color(0, 35, 135); // idea blue
private String myIconUrl = "/icon.png";
private String mySmallIconUrl = "/icon_small.png";
- private String myBigIconUrl;
private String mySvgIconUrl;
+ private String mySvgEapIconUrl;
private String myToolWindowIconUrl = "/toolwindows/toolWindowProject.png";
private String myWelcomeScreenLogoUrl;
@@ -385,8 +385,8 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
@Override
@Nullable
- public String getBigIconUrl() {
- return myBigIconUrl;
+ public String getApplicationSvgIconUrl() {
+ return isEAP() && mySvgEapIconUrl != null ? mySvgEapIconUrl : mySvgIconUrl;
}
@Nullable
@@ -746,13 +746,16 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
if (iconElement != null) {
myIconUrl = iconElement.getAttributeValue(ATTRIBUTE_SIZE32);
mySmallIconUrl = iconElement.getAttributeValue(ATTRIBUTE_SIZE16);
- myBigIconUrl = iconElement.getAttributeValue(ATTRIBUTE_SIZE128, (String)null);
final String toolWindowIcon = iconElement.getAttributeValue(ATTRIBUTE_SIZE12);
if (toolWindowIcon != null) {
myToolWindowIconUrl = toolWindowIcon;
}
mySvgIconUrl = iconElement.getAttributeValue("svg");
}
+ Element iconEap = getChild(parentNode, "icon-eap");
+ if (iconEap != null) {
+ mySvgEapIconUrl = iconEap.getAttributeValue("svg");
+ }
Element packageElement = getChild(parentNode, ELEMENT_PACKAGE);
if (packageElement != null) {
diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/EditorCustomElementRenderer.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/EditorCustomElementRenderer.java
index 1c115de9ccb2..0002ecec19e2 100644
--- a/platform/editor-ui-api/src/com/intellij/openapi/editor/EditorCustomElementRenderer.java
+++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/EditorCustomElementRenderer.java
@@ -46,6 +46,7 @@ public interface EditorCustomElementRenderer {
/**
* @deprecated Override/use {@link #calcWidthInPixels(Inlay)} instead. This method will be removed.
*/
+ @Deprecated
default int calcWidthInPixels(@NotNull Editor editor) {
throw new RuntimeException("Method not implemented");
}
@@ -79,6 +80,7 @@ public interface EditorCustomElementRenderer {
/**
* @deprecated Override/use {@link #paint(Inlay, Graphics, Rectangle, TextAttributes)} instead. This method will be removed.
*/
+ @Deprecated
default void paint(@NotNull Editor editor, @NotNull Graphics g, @NotNull Rectangle targetRegion, @NotNull TextAttributes textAttributes) {
throw new RuntimeException("Method not implemented");
}
@@ -98,6 +100,7 @@ public interface EditorCustomElementRenderer {
/**
* @deprecated Override/use {@link #getContextMenuGroupId(Inlay)} instead. This method will be removed.
*/
+ @Deprecated
default String getContextMenuGroupId() {
return null;
}
diff --git a/platform/icons/src/javaee/JavaeeAppModule.png b/platform/icons/compatibilityResources/javaee/JavaeeAppModule.png
similarity index 100%
rename from platform/icons/src/javaee/JavaeeAppModule.png
rename to platform/icons/compatibilityResources/javaee/JavaeeAppModule.png
diff --git a/platform/icons/src/javaee/JavaeeAppModule@2x.png b/platform/icons/compatibilityResources/javaee/JavaeeAppModule@2x.png
similarity index 100%
rename from platform/icons/src/javaee/JavaeeAppModule@2x.png
rename to platform/icons/compatibilityResources/javaee/JavaeeAppModule@2x.png
diff --git a/platform/icons/src/javaee/JavaeeAppModule@2x_dark.png b/platform/icons/compatibilityResources/javaee/JavaeeAppModule@2x_dark.png
similarity index 100%
rename from platform/icons/src/javaee/JavaeeAppModule@2x_dark.png
rename to platform/icons/compatibilityResources/javaee/JavaeeAppModule@2x_dark.png
diff --git a/platform/icons/src/javaee/JavaeeAppModule_dark.png b/platform/icons/compatibilityResources/javaee/JavaeeAppModule_dark.png
similarity index 100%
rename from platform/icons/src/javaee/JavaeeAppModule_dark.png
rename to platform/icons/compatibilityResources/javaee/JavaeeAppModule_dark.png
diff --git a/platform/icons/src/javaee/WebService.png b/platform/icons/compatibilityResources/javaee/WebService.png
similarity index 100%
rename from platform/icons/src/javaee/WebService.png
rename to platform/icons/compatibilityResources/javaee/WebService.png
diff --git a/platform/icons/src/javaee/WebService@2x.png b/platform/icons/compatibilityResources/javaee/WebService@2x.png
similarity index 100%
rename from platform/icons/src/javaee/WebService@2x.png
rename to platform/icons/compatibilityResources/javaee/WebService@2x.png
diff --git a/platform/icons/src/javaee/WebService@2x_dark.png b/platform/icons/compatibilityResources/javaee/WebService@2x_dark.png
similarity index 100%
rename from platform/icons/src/javaee/WebService@2x_dark.png
rename to platform/icons/compatibilityResources/javaee/WebService@2x_dark.png
diff --git a/platform/icons/src/javaee/WebServiceClient.png b/platform/icons/compatibilityResources/javaee/WebServiceClient.png
similarity index 100%
rename from platform/icons/src/javaee/WebServiceClient.png
rename to platform/icons/compatibilityResources/javaee/WebServiceClient.png
diff --git a/platform/icons/src/javaee/WebServiceClient@2x.png b/platform/icons/compatibilityResources/javaee/WebServiceClient@2x.png
similarity index 100%
rename from platform/icons/src/javaee/WebServiceClient@2x.png
rename to platform/icons/compatibilityResources/javaee/WebServiceClient@2x.png
diff --git a/platform/icons/src/javaee/WebService_dark.png b/platform/icons/compatibilityResources/javaee/WebService_dark.png
similarity index 100%
rename from platform/icons/src/javaee/WebService_dark.png
rename to platform/icons/compatibilityResources/javaee/WebService_dark.png
diff --git a/platform/icons/src/javaee/application_xml.png b/platform/icons/compatibilityResources/javaee/application_xml.png
similarity index 100%
rename from platform/icons/src/javaee/application_xml.png
rename to platform/icons/compatibilityResources/javaee/application_xml.png
diff --git a/platform/icons/src/javaee/application_xml@2x.png b/platform/icons/compatibilityResources/javaee/application_xml@2x.png
similarity index 100%
rename from platform/icons/src/javaee/application_xml@2x.png
rename to platform/icons/compatibilityResources/javaee/application_xml@2x.png
diff --git a/platform/icons/src/javaee/buildOnFrameDeactivation.png b/platform/icons/compatibilityResources/javaee/buildOnFrameDeactivation.png
similarity index 100%
rename from platform/icons/src/javaee/buildOnFrameDeactivation.png
rename to platform/icons/compatibilityResources/javaee/buildOnFrameDeactivation.png
diff --git a/platform/icons/src/javaee/buildOnFrameDeactivation@2x.png b/platform/icons/compatibilityResources/javaee/buildOnFrameDeactivation@2x.png
similarity index 100%
rename from platform/icons/src/javaee/buildOnFrameDeactivation@2x.png
rename to platform/icons/compatibilityResources/javaee/buildOnFrameDeactivation@2x.png
diff --git a/platform/icons/src/javaee/ejb-jar_xml.png b/platform/icons/compatibilityResources/javaee/ejb-jar_xml.png
similarity index 100%
rename from platform/icons/src/javaee/ejb-jar_xml.png
rename to platform/icons/compatibilityResources/javaee/ejb-jar_xml.png
diff --git a/platform/icons/src/javaee/ejb-jar_xml@2x.png b/platform/icons/compatibilityResources/javaee/ejb-jar_xml@2x.png
similarity index 100%
rename from platform/icons/src/javaee/ejb-jar_xml@2x.png
rename to platform/icons/compatibilityResources/javaee/ejb-jar_xml@2x.png
diff --git a/platform/icons/src/javaee/ejbClass.png b/platform/icons/compatibilityResources/javaee/ejbClass.png
similarity index 100%
rename from platform/icons/src/javaee/ejbClass.png
rename to platform/icons/compatibilityResources/javaee/ejbClass.png
diff --git a/platform/icons/src/javaee/ejbClass@2x.png b/platform/icons/compatibilityResources/javaee/ejbClass@2x.png
similarity index 100%
rename from platform/icons/src/javaee/ejbClass@2x.png
rename to platform/icons/compatibilityResources/javaee/ejbClass@2x.png
diff --git a/platform/icons/src/javaee/ejbModule.png b/platform/icons/compatibilityResources/javaee/ejbModule.png
similarity index 100%
rename from platform/icons/src/javaee/ejbModule.png
rename to platform/icons/compatibilityResources/javaee/ejbModule.png
diff --git a/platform/icons/src/javaee/ejbModule@2x.png b/platform/icons/compatibilityResources/javaee/ejbModule@2x.png
similarity index 100%
rename from platform/icons/src/javaee/ejbModule@2x.png
rename to platform/icons/compatibilityResources/javaee/ejbModule@2x.png
diff --git a/platform/icons/src/javaee/embeddedAttributeOverlay.png b/platform/icons/compatibilityResources/javaee/embeddedAttributeOverlay.png
similarity index 100%
rename from platform/icons/src/javaee/embeddedAttributeOverlay.png
rename to platform/icons/compatibilityResources/javaee/embeddedAttributeOverlay.png
diff --git a/platform/icons/src/javaee/embeddedAttributeOverlay@2x.png b/platform/icons/compatibilityResources/javaee/embeddedAttributeOverlay@2x.png
similarity index 100%
rename from platform/icons/src/javaee/embeddedAttributeOverlay@2x.png
rename to platform/icons/compatibilityResources/javaee/embeddedAttributeOverlay@2x.png
diff --git a/platform/icons/src/javaee/embeddedAttributeOverlay@2x_dark.png b/platform/icons/compatibilityResources/javaee/embeddedAttributeOverlay@2x_dark.png
similarity index 100%
rename from platform/icons/src/javaee/embeddedAttributeOverlay@2x_dark.png
rename to platform/icons/compatibilityResources/javaee/embeddedAttributeOverlay@2x_dark.png
diff --git a/platform/icons/src/javaee/embeddedAttributeOverlay_dark.png b/platform/icons/compatibilityResources/javaee/embeddedAttributeOverlay_dark.png
similarity index 100%
rename from platform/icons/src/javaee/embeddedAttributeOverlay_dark.png
rename to platform/icons/compatibilityResources/javaee/embeddedAttributeOverlay_dark.png
diff --git a/platform/icons/src/javaee/entityBean.png b/platform/icons/compatibilityResources/javaee/entityBean.png
similarity index 100%
rename from platform/icons/src/javaee/entityBean.png
rename to platform/icons/compatibilityResources/javaee/entityBean.png
diff --git a/platform/icons/src/javaee/entityBean@2x.png b/platform/icons/compatibilityResources/javaee/entityBean@2x.png
similarity index 100%
rename from platform/icons/src/javaee/entityBean@2x.png
rename to platform/icons/compatibilityResources/javaee/entityBean@2x.png
diff --git a/platform/icons/src/javaee/entityBean@2x_dark.png b/platform/icons/compatibilityResources/javaee/entityBean@2x_dark.png
similarity index 100%
rename from platform/icons/src/javaee/entityBean@2x_dark.png
rename to platform/icons/compatibilityResources/javaee/entityBean@2x_dark.png
diff --git a/platform/icons/src/javaee/entityBean_dark.png b/platform/icons/compatibilityResources/javaee/entityBean_dark.png
similarity index 100%
rename from platform/icons/src/javaee/entityBean_dark.png
rename to platform/icons/compatibilityResources/javaee/entityBean_dark.png
diff --git a/platform/icons/src/javaee/home.png b/platform/icons/compatibilityResources/javaee/home.png
similarity index 100%
rename from platform/icons/src/javaee/home.png
rename to platform/icons/compatibilityResources/javaee/home.png
diff --git a/platform/icons/src/javaee/home@2x.png b/platform/icons/compatibilityResources/javaee/home@2x.png
similarity index 100%
rename from platform/icons/src/javaee/home@2x.png
rename to platform/icons/compatibilityResources/javaee/home@2x.png
diff --git a/platform/icons/src/javaee/inheritedAttributeOverlay.png b/platform/icons/compatibilityResources/javaee/inheritedAttributeOverlay.png
similarity index 100%
rename from platform/icons/src/javaee/inheritedAttributeOverlay.png
rename to platform/icons/compatibilityResources/javaee/inheritedAttributeOverlay.png
diff --git a/platform/icons/src/javaee/inheritedAttributeOverlay@2x.png b/platform/icons/compatibilityResources/javaee/inheritedAttributeOverlay@2x.png
similarity index 100%
rename from platform/icons/src/javaee/inheritedAttributeOverlay@2x.png
rename to platform/icons/compatibilityResources/javaee/inheritedAttributeOverlay@2x.png
diff --git a/platform/icons/src/javaee/inheritedAttributeOverlay@2x_dark.png b/platform/icons/compatibilityResources/javaee/inheritedAttributeOverlay@2x_dark.png
similarity index 100%
rename from platform/icons/src/javaee/inheritedAttributeOverlay@2x_dark.png
rename to platform/icons/compatibilityResources/javaee/inheritedAttributeOverlay@2x_dark.png
diff --git a/platform/icons/src/javaee/inheritedAttributeOverlay_dark.png b/platform/icons/compatibilityResources/javaee/inheritedAttributeOverlay_dark.png
similarity index 100%
rename from platform/icons/src/javaee/inheritedAttributeOverlay_dark.png
rename to platform/icons/compatibilityResources/javaee/inheritedAttributeOverlay_dark.png
diff --git a/platform/icons/src/javaee/interceptorClass.png b/platform/icons/compatibilityResources/javaee/interceptorClass.png
similarity index 100%
rename from platform/icons/src/javaee/interceptorClass.png
rename to platform/icons/compatibilityResources/javaee/interceptorClass.png
diff --git a/platform/icons/src/javaee/interceptorClass@2x.png b/platform/icons/compatibilityResources/javaee/interceptorClass@2x.png
similarity index 100%
rename from platform/icons/src/javaee/interceptorClass@2x.png
rename to platform/icons/compatibilityResources/javaee/interceptorClass@2x.png
diff --git a/platform/icons/src/javaee/interceptorMethod.png b/platform/icons/compatibilityResources/javaee/interceptorMethod.png
similarity index 100%
rename from platform/icons/src/javaee/interceptorMethod.png
rename to platform/icons/compatibilityResources/javaee/interceptorMethod.png
diff --git a/platform/icons/src/javaee/interceptorMethod@2x.png b/platform/icons/compatibilityResources/javaee/interceptorMethod@2x.png
similarity index 100%
rename from platform/icons/src/javaee/interceptorMethod@2x.png
rename to platform/icons/compatibilityResources/javaee/interceptorMethod@2x.png
diff --git a/platform/icons/src/javaee/jpaFacet.png b/platform/icons/compatibilityResources/javaee/jpaFacet.png
similarity index 100%
rename from platform/icons/src/javaee/jpaFacet.png
rename to platform/icons/compatibilityResources/javaee/jpaFacet.png
diff --git a/platform/icons/src/javaee/jpaFacet@2x.png b/platform/icons/compatibilityResources/javaee/jpaFacet@2x.png
similarity index 100%
rename from platform/icons/src/javaee/jpaFacet@2x.png
rename to platform/icons/compatibilityResources/javaee/jpaFacet@2x.png
diff --git a/platform/icons/src/javaee/messageBean.png b/platform/icons/compatibilityResources/javaee/messageBean.png
similarity index 100%
rename from platform/icons/src/javaee/messageBean.png
rename to platform/icons/compatibilityResources/javaee/messageBean.png
diff --git a/platform/icons/src/javaee/messageBean@2x.png b/platform/icons/compatibilityResources/javaee/messageBean@2x.png
similarity index 100%
rename from platform/icons/src/javaee/messageBean@2x.png
rename to platform/icons/compatibilityResources/javaee/messageBean@2x.png
diff --git a/platform/icons/src/javaee/persistenceAttribute.png b/platform/icons/compatibilityResources/javaee/persistenceAttribute.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceAttribute.png
rename to platform/icons/compatibilityResources/javaee/persistenceAttribute.png
diff --git a/platform/icons/src/javaee/persistenceAttribute@2x.png b/platform/icons/compatibilityResources/javaee/persistenceAttribute@2x.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceAttribute@2x.png
rename to platform/icons/compatibilityResources/javaee/persistenceAttribute@2x.png
diff --git a/platform/icons/src/javaee/persistenceEmbeddable.png b/platform/icons/compatibilityResources/javaee/persistenceEmbeddable.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceEmbeddable.png
rename to platform/icons/compatibilityResources/javaee/persistenceEmbeddable.png
diff --git a/platform/icons/src/javaee/persistenceEmbeddable@2x.png b/platform/icons/compatibilityResources/javaee/persistenceEmbeddable@2x.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceEmbeddable@2x.png
rename to platform/icons/compatibilityResources/javaee/persistenceEmbeddable@2x.png
diff --git a/platform/icons/src/javaee/persistenceEmbeddable@2x_dark.png b/platform/icons/compatibilityResources/javaee/persistenceEmbeddable@2x_dark.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceEmbeddable@2x_dark.png
rename to platform/icons/compatibilityResources/javaee/persistenceEmbeddable@2x_dark.png
diff --git a/platform/icons/src/javaee/persistenceEmbeddable_dark.png b/platform/icons/compatibilityResources/javaee/persistenceEmbeddable_dark.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceEmbeddable_dark.png
rename to platform/icons/compatibilityResources/javaee/persistenceEmbeddable_dark.png
diff --git a/platform/icons/src/javaee/persistenceEntity.png b/platform/icons/compatibilityResources/javaee/persistenceEntity.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceEntity.png
rename to platform/icons/compatibilityResources/javaee/persistenceEntity.png
diff --git a/platform/icons/src/javaee/persistenceEntity@2x.png b/platform/icons/compatibilityResources/javaee/persistenceEntity@2x.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceEntity@2x.png
rename to platform/icons/compatibilityResources/javaee/persistenceEntity@2x.png
diff --git a/platform/icons/src/javaee/persistenceEntity@2x_dark.png b/platform/icons/compatibilityResources/javaee/persistenceEntity@2x_dark.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceEntity@2x_dark.png
rename to platform/icons/compatibilityResources/javaee/persistenceEntity@2x_dark.png
diff --git a/platform/icons/src/javaee/persistenceEntityListener.png b/platform/icons/compatibilityResources/javaee/persistenceEntityListener.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceEntityListener.png
rename to platform/icons/compatibilityResources/javaee/persistenceEntityListener.png
diff --git a/platform/icons/src/javaee/persistenceEntityListener@2x.png b/platform/icons/compatibilityResources/javaee/persistenceEntityListener@2x.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceEntityListener@2x.png
rename to platform/icons/compatibilityResources/javaee/persistenceEntityListener@2x.png
diff --git a/platform/icons/src/javaee/persistenceEntity_dark.png b/platform/icons/compatibilityResources/javaee/persistenceEntity_dark.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceEntity_dark.png
rename to platform/icons/compatibilityResources/javaee/persistenceEntity_dark.png
diff --git a/platform/icons/src/javaee/persistenceId.png b/platform/icons/compatibilityResources/javaee/persistenceId.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceId.png
rename to platform/icons/compatibilityResources/javaee/persistenceId.png
diff --git a/platform/icons/src/javaee/persistenceId@2x.png b/platform/icons/compatibilityResources/javaee/persistenceId@2x.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceId@2x.png
rename to platform/icons/compatibilityResources/javaee/persistenceId@2x.png
diff --git a/platform/icons/src/javaee/persistenceId@2x_dark.png b/platform/icons/compatibilityResources/javaee/persistenceId@2x_dark.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceId@2x_dark.png
rename to platform/icons/compatibilityResources/javaee/persistenceId@2x_dark.png
diff --git a/platform/icons/src/javaee/persistenceIdRelationship.png b/platform/icons/compatibilityResources/javaee/persistenceIdRelationship.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceIdRelationship.png
rename to platform/icons/compatibilityResources/javaee/persistenceIdRelationship.png
diff --git a/platform/icons/src/javaee/persistenceIdRelationship@2x.png b/platform/icons/compatibilityResources/javaee/persistenceIdRelationship@2x.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceIdRelationship@2x.png
rename to platform/icons/compatibilityResources/javaee/persistenceIdRelationship@2x.png
diff --git a/platform/icons/src/javaee/persistenceIdRelationship@2x_dark.png b/platform/icons/compatibilityResources/javaee/persistenceIdRelationship@2x_dark.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceIdRelationship@2x_dark.png
rename to platform/icons/compatibilityResources/javaee/persistenceIdRelationship@2x_dark.png
diff --git a/platform/icons/src/javaee/persistenceIdRelationship_dark.png b/platform/icons/compatibilityResources/javaee/persistenceIdRelationship_dark.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceIdRelationship_dark.png
rename to platform/icons/compatibilityResources/javaee/persistenceIdRelationship_dark.png
diff --git a/platform/icons/src/javaee/persistenceId_dark.png b/platform/icons/compatibilityResources/javaee/persistenceId_dark.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceId_dark.png
rename to platform/icons/compatibilityResources/javaee/persistenceId_dark.png
diff --git a/platform/icons/src/javaee/persistenceMappedSuperclass.png b/platform/icons/compatibilityResources/javaee/persistenceMappedSuperclass.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceMappedSuperclass.png
rename to platform/icons/compatibilityResources/javaee/persistenceMappedSuperclass.png
diff --git a/platform/icons/src/javaee/persistenceMappedSuperclass@2x.png b/platform/icons/compatibilityResources/javaee/persistenceMappedSuperclass@2x.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceMappedSuperclass@2x.png
rename to platform/icons/compatibilityResources/javaee/persistenceMappedSuperclass@2x.png
diff --git a/platform/icons/src/javaee/persistenceMappedSuperclass@2x_dark.png b/platform/icons/compatibilityResources/javaee/persistenceMappedSuperclass@2x_dark.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceMappedSuperclass@2x_dark.png
rename to platform/icons/compatibilityResources/javaee/persistenceMappedSuperclass@2x_dark.png
diff --git a/platform/icons/src/javaee/persistenceMappedSuperclass_dark.png b/platform/icons/compatibilityResources/javaee/persistenceMappedSuperclass_dark.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceMappedSuperclass_dark.png
rename to platform/icons/compatibilityResources/javaee/persistenceMappedSuperclass_dark.png
diff --git a/platform/icons/src/javaee/persistenceRelationship.png b/platform/icons/compatibilityResources/javaee/persistenceRelationship.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceRelationship.png
rename to platform/icons/compatibilityResources/javaee/persistenceRelationship.png
diff --git a/platform/icons/src/javaee/persistenceRelationship@2x.png b/platform/icons/compatibilityResources/javaee/persistenceRelationship@2x.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceRelationship@2x.png
rename to platform/icons/compatibilityResources/javaee/persistenceRelationship@2x.png
diff --git a/platform/icons/src/javaee/persistenceUnit.png b/platform/icons/compatibilityResources/javaee/persistenceUnit.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceUnit.png
rename to platform/icons/compatibilityResources/javaee/persistenceUnit.png
diff --git a/platform/icons/src/javaee/persistenceUnit@2x.png b/platform/icons/compatibilityResources/javaee/persistenceUnit@2x.png
similarity index 100%
rename from platform/icons/src/javaee/persistenceUnit@2x.png
rename to platform/icons/compatibilityResources/javaee/persistenceUnit@2x.png
diff --git a/platform/icons/src/javaee/remote.png b/platform/icons/compatibilityResources/javaee/remote.png
similarity index 100%
rename from platform/icons/src/javaee/remote.png
rename to platform/icons/compatibilityResources/javaee/remote.png
diff --git a/platform/icons/src/javaee/remote@2x.png b/platform/icons/compatibilityResources/javaee/remote@2x.png
similarity index 100%
rename from platform/icons/src/javaee/remote@2x.png
rename to platform/icons/compatibilityResources/javaee/remote@2x.png
diff --git a/platform/icons/src/javaee/remote@2x_dark.png b/platform/icons/compatibilityResources/javaee/remote@2x_dark.png
similarity index 100%
rename from platform/icons/src/javaee/remote@2x_dark.png
rename to platform/icons/compatibilityResources/javaee/remote@2x_dark.png
diff --git a/platform/icons/src/javaee/remote_dark.png b/platform/icons/compatibilityResources/javaee/remote_dark.png
similarity index 100%
rename from platform/icons/src/javaee/remote_dark.png
rename to platform/icons/compatibilityResources/javaee/remote_dark.png
diff --git a/platform/icons/src/javaee/sessionBean.png b/platform/icons/compatibilityResources/javaee/sessionBean.png
similarity index 100%
rename from platform/icons/src/javaee/sessionBean.png
rename to platform/icons/compatibilityResources/javaee/sessionBean.png
diff --git a/platform/icons/src/javaee/sessionBean@2x.png b/platform/icons/compatibilityResources/javaee/sessionBean@2x.png
similarity index 100%
rename from platform/icons/src/javaee/sessionBean@2x.png
rename to platform/icons/compatibilityResources/javaee/sessionBean@2x.png
diff --git a/platform/icons/src/javaee/webModule.png b/platform/icons/compatibilityResources/javaee/webModule.png
similarity index 100%
rename from platform/icons/src/javaee/webModule.png
rename to platform/icons/compatibilityResources/javaee/webModule.png
diff --git a/platform/icons/src/javaee/webModule@2x.png b/platform/icons/compatibilityResources/javaee/webModule@2x.png
similarity index 100%
rename from platform/icons/src/javaee/webModule@2x.png
rename to platform/icons/compatibilityResources/javaee/webModule@2x.png
diff --git a/platform/icons/src/javaee/webModuleGroup.png b/platform/icons/compatibilityResources/javaee/webModuleGroup.png
similarity index 100%
rename from platform/icons/src/javaee/webModuleGroup.png
rename to platform/icons/compatibilityResources/javaee/webModuleGroup.png
diff --git a/platform/icons/src/javaee/webModuleGroup@2x.png b/platform/icons/compatibilityResources/javaee/webModuleGroup@2x.png
similarity index 100%
rename from platform/icons/src/javaee/webModuleGroup@2x.png
rename to platform/icons/compatibilityResources/javaee/webModuleGroup@2x.png
diff --git a/platform/icons/src/javaee/web_xml.png b/platform/icons/compatibilityResources/javaee/web_xml.png
similarity index 100%
rename from platform/icons/src/javaee/web_xml.png
rename to platform/icons/compatibilityResources/javaee/web_xml.png
diff --git a/platform/icons/src/javaee/web_xml@2x.png b/platform/icons/compatibilityResources/javaee/web_xml@2x.png
similarity index 100%
rename from platform/icons/src/javaee/web_xml@2x.png
rename to platform/icons/compatibilityResources/javaee/web_xml@2x.png
diff --git a/platform/icons/src/javaee/JavaeeAppModule.svg b/platform/icons/src/javaee/JavaeeAppModule.svg
new file mode 100644
index 000000000000..0c9cd52b3892
--- /dev/null
+++ b/platform/icons/src/javaee/JavaeeAppModule.svg
@@ -0,0 +1,6 @@
+
diff --git a/platform/icons/src/javaee/WebService.svg b/platform/icons/src/javaee/WebService.svg
new file mode 100644
index 000000000000..8204b9ef4334
--- /dev/null
+++ b/platform/icons/src/javaee/WebService.svg
@@ -0,0 +1,3 @@
+
diff --git a/platform/icons/src/javaee/WebServiceClient.svg b/platform/icons/src/javaee/WebServiceClient.svg
new file mode 100644
index 000000000000..f0ea3b840d79
--- /dev/null
+++ b/platform/icons/src/javaee/WebServiceClient.svg
@@ -0,0 +1,8 @@
+
diff --git a/platform/icons/src/javaee/application_xml.svg b/platform/icons/src/javaee/application_xml.svg
new file mode 100644
index 000000000000..b9ea5d4b0e40
--- /dev/null
+++ b/platform/icons/src/javaee/application_xml.svg
@@ -0,0 +1,13 @@
+
diff --git a/platform/icons/src/javaee/buildOnFrameDeactivation.svg b/platform/icons/src/javaee/buildOnFrameDeactivation.svg
new file mode 100644
index 000000000000..f10b240db628
--- /dev/null
+++ b/platform/icons/src/javaee/buildOnFrameDeactivation.svg
@@ -0,0 +1,6 @@
+
diff --git a/platform/icons/src/javaee/buildOnFrameDeactivation_dark.svg b/platform/icons/src/javaee/buildOnFrameDeactivation_dark.svg
new file mode 100644
index 000000000000..6be4c67bee3e
--- /dev/null
+++ b/platform/icons/src/javaee/buildOnFrameDeactivation_dark.svg
@@ -0,0 +1,6 @@
+
diff --git a/platform/icons/src/javaee/ejb-jar_xml.svg b/platform/icons/src/javaee/ejb-jar_xml.svg
new file mode 100644
index 000000000000..2c33507a4c46
--- /dev/null
+++ b/platform/icons/src/javaee/ejb-jar_xml.svg
@@ -0,0 +1,9 @@
+
diff --git a/platform/icons/src/javaee/ejbClass.svg b/platform/icons/src/javaee/ejbClass.svg
new file mode 100644
index 000000000000..85211408c185
--- /dev/null
+++ b/platform/icons/src/javaee/ejbClass.svg
@@ -0,0 +1,7 @@
+
diff --git a/platform/icons/src/javaee/ejbModule.svg b/platform/icons/src/javaee/ejbModule.svg
new file mode 100644
index 000000000000..c2b349befda3
--- /dev/null
+++ b/platform/icons/src/javaee/ejbModule.svg
@@ -0,0 +1,6 @@
+
diff --git a/platform/icons/src/javaee/embeddedAttributeOverlay.svg b/platform/icons/src/javaee/embeddedAttributeOverlay.svg
new file mode 100644
index 000000000000..a940f4571db4
--- /dev/null
+++ b/platform/icons/src/javaee/embeddedAttributeOverlay.svg
@@ -0,0 +1,6 @@
+
diff --git a/platform/icons/src/javaee/entityBean.svg b/platform/icons/src/javaee/entityBean.svg
new file mode 100644
index 000000000000..4646e36a6088
--- /dev/null
+++ b/platform/icons/src/javaee/entityBean.svg
@@ -0,0 +1,7 @@
+
diff --git a/platform/icons/src/javaee/home.svg b/platform/icons/src/javaee/home.svg
new file mode 100644
index 000000000000..effa7d0b2f77
--- /dev/null
+++ b/platform/icons/src/javaee/home.svg
@@ -0,0 +1,10 @@
+
diff --git a/platform/icons/src/javaee/home@2x.svg b/platform/icons/src/javaee/home@2x.svg
new file mode 100644
index 000000000000..880d09d243de
--- /dev/null
+++ b/platform/icons/src/javaee/home@2x.svg
@@ -0,0 +1,10 @@
+
diff --git a/platform/icons/src/javaee/inheritedAttributeOverlay.svg b/platform/icons/src/javaee/inheritedAttributeOverlay.svg
new file mode 100644
index 000000000000..3fb3c23c3dfd
--- /dev/null
+++ b/platform/icons/src/javaee/inheritedAttributeOverlay.svg
@@ -0,0 +1,3 @@
+
diff --git a/platform/icons/src/javaee/interceptorClass.svg b/platform/icons/src/javaee/interceptorClass.svg
new file mode 100644
index 000000000000..939d9d87e0b1
--- /dev/null
+++ b/platform/icons/src/javaee/interceptorClass.svg
@@ -0,0 +1,7 @@
+
diff --git a/platform/icons/src/javaee/interceptorMethod.svg b/platform/icons/src/javaee/interceptorMethod.svg
new file mode 100644
index 000000000000..e31d41e39cf1
--- /dev/null
+++ b/platform/icons/src/javaee/interceptorMethod.svg
@@ -0,0 +1,7 @@
+
diff --git a/platform/icons/src/javaee/interceptorMethod@2x.svg b/platform/icons/src/javaee/interceptorMethod@2x.svg
new file mode 100644
index 000000000000..61d220535121
--- /dev/null
+++ b/platform/icons/src/javaee/interceptorMethod@2x.svg
@@ -0,0 +1,7 @@
+
diff --git a/platform/icons/src/javaee/jpaFacet.svg b/platform/icons/src/javaee/jpaFacet.svg
new file mode 100644
index 000000000000..1879c3f082b6
--- /dev/null
+++ b/platform/icons/src/javaee/jpaFacet.svg
@@ -0,0 +1,9 @@
+
diff --git a/platform/icons/src/javaee/messageBean.svg b/platform/icons/src/javaee/messageBean.svg
new file mode 100644
index 000000000000..516223bf4ea9
--- /dev/null
+++ b/platform/icons/src/javaee/messageBean.svg
@@ -0,0 +1,6 @@
+
diff --git a/platform/icons/src/javaee/persistenceAttribute.svg b/platform/icons/src/javaee/persistenceAttribute.svg
new file mode 100644
index 000000000000..76b910b55b3d
--- /dev/null
+++ b/platform/icons/src/javaee/persistenceAttribute.svg
@@ -0,0 +1,6 @@
+
diff --git a/platform/icons/src/javaee/persistenceEmbeddable.svg b/platform/icons/src/javaee/persistenceEmbeddable.svg
new file mode 100644
index 000000000000..5ad0261e6cdb
--- /dev/null
+++ b/platform/icons/src/javaee/persistenceEmbeddable.svg
@@ -0,0 +1,7 @@
+
diff --git a/platform/icons/src/javaee/persistenceEntity.svg b/platform/icons/src/javaee/persistenceEntity.svg
new file mode 100644
index 000000000000..cb3ba0d70801
--- /dev/null
+++ b/platform/icons/src/javaee/persistenceEntity.svg
@@ -0,0 +1,7 @@
+
diff --git a/platform/icons/src/javaee/persistenceEntityListener.svg b/platform/icons/src/javaee/persistenceEntityListener.svg
new file mode 100644
index 000000000000..ac8814fd276c
--- /dev/null
+++ b/platform/icons/src/javaee/persistenceEntityListener.svg
@@ -0,0 +1,10 @@
+
diff --git a/platform/icons/src/javaee/persistenceId.svg b/platform/icons/src/javaee/persistenceId.svg
new file mode 100644
index 000000000000..2a082d0fb245
--- /dev/null
+++ b/platform/icons/src/javaee/persistenceId.svg
@@ -0,0 +1,7 @@
+
diff --git a/platform/icons/src/javaee/persistenceIdRelationship.svg b/platform/icons/src/javaee/persistenceIdRelationship.svg
new file mode 100644
index 000000000000..18b17cb38e39
--- /dev/null
+++ b/platform/icons/src/javaee/persistenceIdRelationship.svg
@@ -0,0 +1,8 @@
+
diff --git a/platform/icons/src/javaee/persistenceMappedSuperclass.svg b/platform/icons/src/javaee/persistenceMappedSuperclass.svg
new file mode 100644
index 000000000000..79bc8866b2b3
--- /dev/null
+++ b/platform/icons/src/javaee/persistenceMappedSuperclass.svg
@@ -0,0 +1,6 @@
+
diff --git a/platform/icons/src/javaee/persistenceRelationship.svg b/platform/icons/src/javaee/persistenceRelationship.svg
new file mode 100644
index 000000000000..171b708f776d
--- /dev/null
+++ b/platform/icons/src/javaee/persistenceRelationship.svg
@@ -0,0 +1,7 @@
+
diff --git a/platform/icons/src/javaee/persistenceUnit.svg b/platform/icons/src/javaee/persistenceUnit.svg
new file mode 100644
index 000000000000..837a2b46dd53
--- /dev/null
+++ b/platform/icons/src/javaee/persistenceUnit.svg
@@ -0,0 +1,9 @@
+
diff --git a/platform/icons/src/javaee/remote.svg b/platform/icons/src/javaee/remote.svg
new file mode 100644
index 000000000000..626079be70ec
--- /dev/null
+++ b/platform/icons/src/javaee/remote.svg
@@ -0,0 +1,7 @@
+
diff --git a/platform/icons/src/javaee/remote@2x.svg b/platform/icons/src/javaee/remote@2x.svg
new file mode 100644
index 000000000000..cbfea1545f92
--- /dev/null
+++ b/platform/icons/src/javaee/remote@2x.svg
@@ -0,0 +1,7 @@
+
diff --git a/platform/icons/src/javaee/sessionBean.svg b/platform/icons/src/javaee/sessionBean.svg
new file mode 100644
index 000000000000..1fe3e79ed00e
--- /dev/null
+++ b/platform/icons/src/javaee/sessionBean.svg
@@ -0,0 +1,6 @@
+
diff --git a/platform/icons/src/javaee/webModule.svg b/platform/icons/src/javaee/webModule.svg
new file mode 100644
index 000000000000..f95780558d9b
--- /dev/null
+++ b/platform/icons/src/javaee/webModule.svg
@@ -0,0 +1,6 @@
+
diff --git a/platform/icons/src/javaee/webModuleGroup.svg b/platform/icons/src/javaee/webModuleGroup.svg
new file mode 100644
index 000000000000..1827c34607dd
--- /dev/null
+++ b/platform/icons/src/javaee/webModuleGroup.svg
@@ -0,0 +1,8 @@
+
diff --git a/platform/icons/src/javaee/web_xml.svg b/platform/icons/src/javaee/web_xml.svg
new file mode 100644
index 000000000000..2fa8163c75eb
--- /dev/null
+++ b/platform/icons/src/javaee/web_xml.svg
@@ -0,0 +1,9 @@
+
diff --git a/platform/icons/src/nodes/ejbCmpField.svg b/platform/icons/src/nodes/ejbCmpField.svg
index 0e15560428c9..dc55e6a2ff13 100644
--- a/platform/icons/src/nodes/ejbCmpField.svg
+++ b/platform/icons/src/nodes/ejbCmpField.svg
@@ -1,9 +1,9 @@
diff --git a/platform/icons/src/nodes/jsf/component.svg b/platform/icons/src/nodes/jsf/component.svg
index f0a71b0010ed..8b133ca10d4c 100644
--- a/platform/icons/src/nodes/jsf/component.svg
+++ b/platform/icons/src/nodes/jsf/component.svg
@@ -1,3 +1,3 @@
diff --git a/platform/icons/src/nodes/jsf/converter.svg b/platform/icons/src/nodes/jsf/converter.svg
index b0cf98fbab3b..ad0b0d7b9930 100644
--- a/platform/icons/src/nodes/jsf/converter.svg
+++ b/platform/icons/src/nodes/jsf/converter.svg
@@ -4,7 +4,7 @@
-
-
+
+
diff --git a/platform/icons/src/nodes/jsf/managedBean.svg b/platform/icons/src/nodes/jsf/managedBean.svg
index 437d52394a83..457de70a666d 100644
--- a/platform/icons/src/nodes/jsf/managedBean.svg
+++ b/platform/icons/src/nodes/jsf/managedBean.svg
@@ -1,5 +1,3 @@
diff --git a/platform/icons/src/nodes/jsf/navigationRule.svg b/platform/icons/src/nodes/jsf/navigationRule.svg
index 9cb26053e4b8..058f0f7ec7cc 100644
--- a/platform/icons/src/nodes/jsf/navigationRule.svg
+++ b/platform/icons/src/nodes/jsf/navigationRule.svg
@@ -1,10 +1,6 @@
diff --git a/platform/icons/src/nodes/jsf/renderKit.svg b/platform/icons/src/nodes/jsf/renderKit.svg
index 3725746703ed..9aed7de0ebb7 100644
--- a/platform/icons/src/nodes/jsf/renderKit.svg
+++ b/platform/icons/src/nodes/jsf/renderKit.svg
@@ -1,8 +1,8 @@