From fe28f4be1d8ef06acdc5b9b4a5d805d3b19a5e5e Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Tue, 10 Jul 2018 14:08:00 +0700 Subject: [PATCH] JavaIntentionPolicy: remove exceptions for IDEA-195234, IDEA-195015 --- .../com/intellij/java/propertyBased/JavaIntentionPolicy.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaIntentionPolicy.java b/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaIntentionPolicy.java index ce537ef6c17e..161e23696cc9 100644 --- a/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaIntentionPolicy.java +++ b/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaIntentionPolicy.java @@ -64,8 +64,7 @@ class JavaIntentionPolicy extends IntentionPolicy { actionText.equals("Make 'static'") || // from Non-'static' initializer inspection; it does not care if initializer refers instance members, see IDEA-195165 actionText.startsWith("Add 'catch' clause for '") || // if existing catch contains "return value", new error "Missing return statement" may appear actionText.equals("Split into declaration and initialization") || // TODO: remove when IDEA-179081 is fixed - actionText.equals("Replace with 'while'") || // TODO: remove when IDEA-195157 is fixed - actionText.equals("Randomly change 'serialVersionUID' initializer"); // TODO: remove when IDEA-195234 is fixed + actionText.equals("Replace with 'while'"); // TODO: remove when IDEA-195157 is fixed } } @@ -130,8 +129,6 @@ class JavaParenthesesPolicy extends JavaIntentionPolicy { actionText.equals("Remove unnecessary parentheses") || // TODO: fix and remove exception after merging dfa_refactoring branch actionText.matches("Replace with '(true|false|null)'") || - // TODO: Remove when IDEA-195015 is fixed - actionText.equals("Sort content") || actionText.matches("Simplify '\\(+(true|false)\\)+' to \\1") || // Parenthesizing sub-expression causes cutting the action name at different position, so name changes significantly actionText.matches("Compute constant value of '.+'") ||