From b0f77cfdb5df9fa4e4f2d6559c9207d647ea0165 Mon Sep 17 00:00:00 2001 From: anna Date: Sat, 14 Apr 2012 14:22:45 +0200 Subject: [PATCH] normalize declaration fix: enable for fields (IDEA-84563) --- .../ig/fixes/NormalizeDeclarationFix.java | 4 +++ .../multiple_declaration/Field.after.java | 6 ++++ .../style/multiple_declaration/Field.java | 5 +++ .../LocalVariable.after.java | 8 +++++ .../multiple_declaration/LocalVariable.java | 7 ++++ .../style/MultipleDeclarationFixTest.java | 35 +++++++++++++++++++ 6 files changed, 65 insertions(+) create mode 100644 plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/Field.after.java create mode 100644 plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/Field.java create mode 100644 plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/LocalVariable.after.java create mode 100644 plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/LocalVariable.java create mode 100644 plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/style/MultipleDeclarationFixTest.java diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java index a3e2eedb7fca..cbe89813cf44 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java @@ -39,6 +39,10 @@ public class NormalizeDeclarationFix extends InspectionGadgetsFix { if (parent == null) { return; } + if (parent instanceof PsiField) { + parent.normalizeDeclaration(); + return; + } final PsiElement grandParent = parent.getParent(); if (!(grandParent instanceof PsiDeclarationStatement)) { return; diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/Field.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/Field.after.java new file mode 100644 index 000000000000..f617fc411f81 --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/Field.after.java @@ -0,0 +1,6 @@ +package com.siyeh.igfixes.style.multiple_declaration; + +public class SimpleStringBuffer { + int i = 0; + int j = 0; +} diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/Field.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/Field.java new file mode 100644 index 000000000000..169a85da2c0d --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/Field.java @@ -0,0 +1,5 @@ +package com.siyeh.igfixes.style.multiple_declaration; + +public class SimpleStringBuffer { + int i = 0, j = 0; +} diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/LocalVariable.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/LocalVariable.after.java new file mode 100644 index 000000000000..395f693ca6a6 --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/LocalVariable.after.java @@ -0,0 +1,8 @@ +package com.siyeh.igfixes.style.multiple_declaration; + +public class SimpleStringBuffer { + String foo() { + int i = 0; + int j = 0; + } +} diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/LocalVariable.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/LocalVariable.java new file mode 100644 index 000000000000..e6393e0d65c5 --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/multiple_declaration/LocalVariable.java @@ -0,0 +1,7 @@ +package com.siyeh.igfixes.style.multiple_declaration; + +public class SimpleStringBuffer { + String foo() { + int i = 0, j = 0; + } +} diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/style/MultipleDeclarationFixTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/style/MultipleDeclarationFixTest.java new file mode 100644 index 000000000000..3664f2b14c7a --- /dev/null +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/style/MultipleDeclarationFixTest.java @@ -0,0 +1,35 @@ +/* + * Copyright 2012 Bas Leijdekkers + * + * 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.siyeh.ig.fixes.style; + +import com.siyeh.InspectionGadgetsBundle; +import com.siyeh.ig.IGQuickFixesTestCase; +import com.siyeh.ig.style.MultipleDeclarationInspection; + +public class MultipleDeclarationFixTest extends IGQuickFixesTestCase { + + @Override + public void setUp() throws Exception { + super.setUp(); + myFixture.enableInspections(new MultipleDeclarationInspection()); + myRelativePath = "style/multiple_declaration"; + myDefaultHint = InspectionGadgetsBundle.message("normalize.declaration.quickfix"); + } + + public void testLocalVariable() { doTest(); } + public void testField() { doTest(); } + +}