diff --git a/java/typeMigration/testData/refactoring/typeMigration/multiVarDeclaration2/after/test.java b/java/typeMigration/testData/refactoring/typeMigration/multiVarDeclaration2/after/test.java index 480d7191ce82..3d73003819d8 100644 --- a/java/typeMigration/testData/refactoring/typeMigration/multiVarDeclaration2/after/test.java +++ b/java/typeMigration/testData/refactoring/typeMigration/multiVarDeclaration2/after/test.java @@ -2,7 +2,8 @@ public class Test { Object a = "a", b = ""; void mm() { - Object c = a;Object d = b; + Object c = a; + Object d = b; String ololo = "intellij-idea"; } } \ No newline at end of file diff --git a/java/typeMigration/testData/refactoring/typeMigration/t143/after/test.java b/java/typeMigration/testData/refactoring/typeMigration/t143/after/test.java index 28ce4a8e46b6..a72f05c480f8 100644 --- a/java/typeMigration/testData/refactoring/typeMigration/t143/after/test.java +++ b/java/typeMigration/testData/refactoring/typeMigration/t143/after/test.java @@ -1,6 +1,6 @@ class Test { public static void test() { - String n = new AnInterface() { + String n = new AnInterface() { @Override public String invoke(Void v) { return null; diff --git a/java/typeMigration/testData/refactoring/typeMigration/t144/after/test.java b/java/typeMigration/testData/refactoring/typeMigration/t144/after/test.java index 788b40bb6293..4c6069c0d808 100644 --- a/java/typeMigration/testData/refactoring/typeMigration/t144/after/test.java +++ b/java/typeMigration/testData/refactoring/typeMigration/t144/after/test.java @@ -1,6 +1,6 @@ class Test { public static void test() { - String n = new AnInterface2() { + String n = new AnInterface2() { @Override public String invoke(Void v) { return null; diff --git a/java/typeMigration/testData/refactoring/typeMigrationByAtomic/directIntArray/after/Test.java b/java/typeMigration/testData/refactoring/typeMigrationByAtomic/directIntArray/after/Test.java index 8dbba12048fe..fba1ac7d3d16 100644 --- a/java/typeMigration/testData/refactoring/typeMigrationByAtomic/directIntArray/after/Test.java +++ b/java/typeMigration/testData/refactoring/typeMigrationByAtomic/directIntArray/after/Test.java @@ -9,7 +9,7 @@ class Test { System.out.println(a.incrementAndGet(0)); a.getAndDecrement(0); if (a.decrementAndGet(0) == 0) { - a.getAndAdd(0, ((2))); + a.getAndAdd(0, (2)); a.set(0, a.get(0) * 2); if (a.get(0) == 0) { System.out.println(a.get(0) + 7); diff --git a/java/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIntArray/after/Test.java b/java/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIntArray/after/Test.java index 401714230d3c..0b5bb1455e2a 100644 --- a/java/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIntArray/after/Test.java +++ b/java/typeMigration/testData/refactoring/typeMigrationByAtomic/reverseIntArray/after/Test.java @@ -9,7 +9,7 @@ class Test { System.out.println(++a[0]); a[0]--; if (--a[0] == 0) { - a[0] += ((2)); + a[0] += 2; a[0] = a[0] * 2; if (a[0] == 0) { System.out.println(a[0] + 7); diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/MatchOptions.java b/platform/structuralsearch/source/com/intellij/structuralsearch/MatchOptions.java index 3b39d3be40b2..953789714e8a 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/MatchOptions.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/MatchOptions.java @@ -42,6 +42,7 @@ public class MatchOptions implements JDOMExternalizable { public MatchOptions() { variableConstraints = new LinkedHashMap<>(); + looseMatching = true; resultIsContextMatch = false; myFileType = null; myDialect = null; diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java b/platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java index 197ca135f807..ce33bcab37a3 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java @@ -86,7 +86,6 @@ public class Matcher { if (StringUtil.isQuotedString(constraint)) { // keep old configurations working, also useful for testing final MatchOptions myMatchOptions = new MatchOptions(); - myMatchOptions.setLooseMatching(true); myMatchOptions.setFileType(fileType); myMatchOptions.fillSearchCriteria(StringUtil.unquoteString(constraint)); return new Matcher(project, myMatchOptions); diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java index e73828889538..1ca2dcccc0da 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java @@ -751,7 +751,6 @@ public class SearchDialog extends DialogWrapper { options.setScope( searchWithinHierarchy && !myDoingOkAction ? GlobalSearchScope.projectScope(getProject()) : myScopeChooserCombo.getSelectedScope()); } - options.setLooseMatching(true); options.setRecursiveSearch(isRecursiveSearchEnabled() && recursiveMatching.isSelected()); ourFtSearchVariant = (FileType)fileTypes.getSelectedItem(); diff --git a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java index e86bd5ce515a..656d7f6710fd 100644 --- a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java +++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java @@ -34,7 +34,6 @@ public class StructuralReplaceTest extends StructuralReplaceTestCase { super.setUp(); final MatchOptions matchOptions = this.options.getMatchOptions(); matchOptions.setFileType(StdFileTypes.JAVA); - matchOptions.setLooseMatching(true); } public void testReplaceInLiterals() { diff --git a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTestCase.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTestCase.java index 2231c0f2b63e..6325b5d463da 100644 --- a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTestCase.java +++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTestCase.java @@ -38,7 +38,6 @@ abstract class StructuralSearchTestCase extends LightQuickFixTestCase { testMatcher = new Matcher(getProject()); options = new MatchOptions(); - options.setLooseMatching(true); options.setRecursiveSearch(true); LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_5); }