summaryrefslogtreecommitdiff
path: root/plugins/InspectionGadgets/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/InspectionGadgets/src/com')
-rw-r--r--plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java216
-rw-r--r--plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/MissingPackageInfoInspection.java83
-rw-r--r--plugins/InspectionGadgets/src/com/siyeh/ig/memory/AnonymousInnerClassMayBeStaticInspection.java (renamed from plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AnonymousInnerClassMayBeStaticInspection.java)4
-rw-r--r--plugins/InspectionGadgets/src/com/siyeh/ig/style/NestedMethodCallInspection.java11
4 files changed, 308 insertions, 6 deletions
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java
new file mode 100644
index 000000000000..7b2355930287
--- /dev/null
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2000-2014 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.siyeh.ig.initialization;
+
+import com.intellij.codeInsight.CodeInsightUtilCore;
+import com.intellij.codeInspection.ProblemDescriptor;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Pass;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.psi.*;
+import com.intellij.psi.search.searches.ReferencesSearch;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiUtil;
+import com.intellij.refactoring.rename.RenamePsiElementProcessor;
+import com.intellij.refactoring.rename.inplace.MemberInplaceRenamer;
+import com.intellij.util.Processor;
+import com.siyeh.InspectionGadgetsBundle;
+import com.siyeh.ig.InspectionGadgetsFix;
+import com.siyeh.ig.psiutils.ControlFlowUtils;
+import com.siyeh.ig.psiutils.ParenthesesUtils;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+
+/**
+ * @author Bas Leijdekkers
+ */
+public class NonThreadSafeLazyInitializationInspection extends NonThreadSafeLazyInitializationInspectionBase {
+
+ @Override
+ protected InspectionGadgetsFix buildFix(Object... infos) {
+ final PsiIfStatement ifStatement = (PsiIfStatement)infos[0];
+ final PsiField field = (PsiField)infos[1];
+ if (!isStaticAndAssignedOnce(field) || !isSafeToDeleteIfStatement(ifStatement, field)) {
+ return null;
+ }
+ return new IntroduceHolderFix();
+ }
+
+ private static boolean isStaticAndAssignedOnce(PsiField field) {
+ if (!field.hasModifierProperty(PsiModifier.STATIC)) {
+ return false;
+ }
+ final int[] writeCount = new int[1];
+ return ReferencesSearch.search(field).forEach(new Processor<PsiReference>() {
+ @Override
+ public boolean process(PsiReference reference) {
+ final PsiElement element = reference.getElement();
+ if (!(element instanceof PsiExpression) || !PsiUtil.isAccessedForWriting((PsiExpression)element)) {
+ return true;
+ }
+ return ++writeCount[0] != 2;
+ }
+ });
+ }
+
+ private static boolean isSafeToDeleteIfStatement(PsiIfStatement ifStatement, PsiField field) {
+ if (ifStatement.getElseBranch() != null) {
+ return false;
+ }
+ final PsiStatement thenBranch = ifStatement.getThenBranch();
+ if (thenBranch == null) {
+ return false;
+ }
+ final PsiStatement statement = ControlFlowUtils.stripBraces(thenBranch);
+ if (!(statement instanceof PsiExpressionStatement)) {
+ return false;
+ }
+ final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement;
+ return isSimpleAssignment(expressionStatement, field);
+ }
+
+ private static boolean isSimpleAssignment(PsiExpressionStatement expressionStatement, PsiField field) {
+ final PsiExpression expression = expressionStatement.getExpression();
+ if (!(expression instanceof PsiAssignmentExpression)) {
+ return false;
+ }
+ final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression;
+ final PsiExpression lhs = ParenthesesUtils.stripParentheses(assignmentExpression.getLExpression());
+ if (!(lhs instanceof PsiReferenceExpression)) {
+ return false;
+ }
+ final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)lhs;
+ final PsiElement target = referenceExpression.resolve();
+ if (!field.equals(target)) {
+ return false;
+ }
+ final Collection<PsiReferenceExpression> referenceChildren =
+ PsiTreeUtil.findChildrenOfType(assignmentExpression.getRExpression(), PsiReferenceExpression.class);
+ for (PsiReferenceExpression child : referenceChildren) {
+ final PsiElement target2 = child.resolve();
+ if (!(target2 instanceof PsiMember)) {
+ return false;
+ }
+ final PsiMember member = (PsiMember)target2;
+ if (!member.hasModifierProperty(PsiModifier.STATIC)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private static class IntroduceHolderFix extends InspectionGadgetsFix {
+
+ @Override
+ protected void doFix(Project project, ProblemDescriptor descriptor) {
+ final PsiReferenceExpression expression = (PsiReferenceExpression)descriptor.getPsiElement();
+ final PsiElement resolved = expression.resolve();
+ if (!(resolved instanceof PsiField)) {
+ return;
+ }
+ final PsiField field = (PsiField)resolved;
+ @NonNls final String holderName = StringUtil.capitalize(field.getName()) + "Holder";
+ final PsiElement expressionParent = expression.getParent();
+ if (!(expressionParent instanceof PsiAssignmentExpression)) {
+ return;
+ }
+ final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expressionParent;
+ final PsiExpression rhs = assignmentExpression.getRExpression();
+ if (rhs == null) {
+ return;
+ }
+ @NonNls final String text = "private static class " + holderName + " {" +
+ "private static final " + field.getType().getCanonicalText() + " " +
+ field.getName() + " = " + rhs.getText() + ";}";
+ final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(field.getProject());
+ final PsiClass holder = elementFactory.createClassFromText(text, field).getInnerClasses()[0];
+ final PsiMethod method = PsiTreeUtil.getParentOfType(expression, PsiMethod.class);
+ if (method == null) {
+ return;
+ }
+ final PsiClass holderClass = (PsiClass)method.getParent().addBefore(holder, method);
+
+ final PsiIfStatement ifStatement = PsiTreeUtil.getParentOfType(expression, PsiIfStatement.class);
+ if (ifStatement != null) {
+ ifStatement.delete();
+ }
+
+ final PsiExpression holderReference = elementFactory.createExpressionFromText(holderName + "." + field.getName(), field);
+ for (PsiReference reference : ReferencesSearch.search(field).findAll()) {
+ reference.getElement().replace(holderReference);
+ }
+ field.delete();
+
+ if (!isOnTheFly()) {
+ return;
+ }
+ invokeInplaceRename(holderClass, holderName, suggestHolderName(field));
+ }
+
+ private static void invokeInplaceRename(PsiNameIdentifierOwner nameIdentifierOwner, final String... suggestedNames) {
+ final PsiNameIdentifierOwner elementToRename = CodeInsightUtilCore.forcePsiPostprocessAndRestoreElement(nameIdentifierOwner);
+ final Editor editor = FileEditorManager.getInstance(nameIdentifierOwner.getProject()).getSelectedTextEditor();
+ if (editor == null) {
+ return;
+ }
+ final PsiElement identifier = elementToRename.getNameIdentifier();
+ if (identifier == null) {
+ return;
+ }
+ editor.getCaretModel().moveToOffset(identifier.getTextOffset());
+ final RenamePsiElementProcessor processor = RenamePsiElementProcessor.forElement(elementToRename);
+ if (!processor.isInplaceRenameSupported()) {
+ return;
+ }
+ processor.substituteElementToRename(elementToRename, editor, new Pass<PsiElement>() {
+ @Override
+ public void pass(PsiElement substitutedElement) {
+ final MemberInplaceRenamer renamer = new MemberInplaceRenamer(elementToRename, substitutedElement, editor);
+ final LinkedHashSet<String> nameSuggestions = new LinkedHashSet<String>(Arrays.asList(suggestedNames));
+ renamer.performInplaceRefactoring(nameSuggestions);
+ }
+ });
+ }
+
+ @NonNls
+ private static String suggestHolderName(PsiField field) {
+ String string = field.getType().getDeepComponentType().getPresentableText();
+ final int index = string.indexOf('<');
+ if (index != -1) {
+ string = string.substring(0, index);
+ }
+ return string + "Holder";
+ }
+
+ @Override
+ @NotNull
+ public String getName() {
+ return InspectionGadgetsBundle.message("introduce.holder.class.quickfix");
+ }
+
+ @NotNull
+ @Override
+ public String getFamilyName() {
+ return getName();
+ }
+ }
+}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/MissingPackageInfoInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/MissingPackageInfoInspection.java
new file mode 100644
index 000000000000..2c498c207913
--- /dev/null
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/MissingPackageInfoInspection.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2000-2014 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.siyeh.ig.javadoc;
+
+import com.intellij.codeInspection.LocalInspectionTool;
+import com.intellij.codeInspection.ProblemDescriptor;
+import com.intellij.ide.DataManager;
+import com.intellij.ide.actions.CreatePackageInfoAction;
+import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.Presentation;
+import com.intellij.openapi.project.Project;
+import com.intellij.util.Consumer;
+import com.siyeh.ig.InspectionGadgetsFix;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Bas Leijdekkers
+ */
+public class MissingPackageInfoInspection extends MissingPackageInfoInspectionBase {
+
+ @Nullable
+ @Override
+ public LocalInspectionTool getSharedLocalInspectionTool() {
+ return new LocalMissingPackageInfoInspection(this);
+ }
+
+ private class LocalMissingPackageInfoInspection extends LocalMissingPackageInfoInspectionBase {
+
+ public LocalMissingPackageInfoInspection(MissingPackageInfoInspectionBase settingsDelegate) {
+ super(settingsDelegate);
+ }
+
+ @Nullable
+ @Override
+ protected InspectionGadgetsFix buildFix(Object... infos) {
+ return new InspectionGadgetsFix() {
+ @NotNull
+ @Override
+ public String getName() {
+ return "Create 'package-info.java'";
+ }
+
+ @NotNull
+ @Override
+ public String getFamilyName() {
+ return getName();
+ }
+
+ @Override
+ protected boolean prepareForWriting() {
+ return false;
+ }
+
+ @Override
+ protected void doFix(Project project, ProblemDescriptor descriptor) {
+ DataManager.getInstance().getDataContextFromFocus().doWhenDone(new Consumer<DataContext>() {
+ @Override
+ public void consume(DataContext context) {
+ final AnActionEvent event = new AnActionEvent(null, context, "", new Presentation(), ActionManager.getInstance(), 0);
+ new CreatePackageInfoAction().actionPerformed(event);
+ }
+ });
+ }
+ };
+ }
+ }
+}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AnonymousInnerClassMayBeStaticInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/memory/AnonymousInnerClassMayBeStaticInspection.java
index 6862eaf3fd14..f403f1326bd0 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AnonymousInnerClassMayBeStaticInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/memory/AnonymousInnerClassMayBeStaticInspection.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2008 Dave Griffith, Bas Leijdekkers
+ * Copyright 2003-2014 Dave Griffith, Bas Leijdekkers
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.siyeh.ig.j2me;
+package com.siyeh.ig.memory;
import com.siyeh.InspectionGadgetsBundle;
import com.siyeh.ig.InspectionGadgetsFix;
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/NestedMethodCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/NestedMethodCallInspection.java
index bcdcf61c9175..097a24573328 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/NestedMethodCallInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/NestedMethodCallInspection.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2012 Dave Griffith, Bas Leijdekkers
+ * Copyright 2003-2014 Dave Griffith, Bas Leijdekkers
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
*/
package com.siyeh.ig.style;
-import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
+import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.siyeh.InspectionGadgetsBundle;
import com.siyeh.ig.InspectionGadgetsFix;
import com.siyeh.ig.fixes.IntroduceVariableFix;
@@ -26,8 +26,11 @@ public class NestedMethodCallInspection extends NestedMethodCallInspectionBase {
@Override
public JComponent createOptionsPanel() {
- return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("nested.method.call.ignore.option"),
- this, "m_ignoreFieldInitializations");
+ final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
+ panel.addCheckbox(InspectionGadgetsBundle.message("nested.method.call.ignore.option"), "m_ignoreFieldInitializations");
+ panel.addCheckbox(InspectionGadgetsBundle.message("ignore.calls.to.static.methods"), "ignoreStaticMethods");
+ panel.addCheckbox(InspectionGadgetsBundle.message("ignore.calls.to.property.getters"), "ignoreGetterCalls");
+ return panel;
}
@Override
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 05:01:11 +0000