Cleanup in PyPep8NamingInspection

diff --git a/python/psi-api/src/com/jetbrains/python/PyNames.java b/python/psi-api/src/com/jetbrains/python/PyNames.java
index df8460608f53345c6e466a68b610408685abcf78..d73539b2f8ef49a95271200d8ef5ae2de09fd300 100644 (file)
--- a/python/psi-api/src/com/jetbrains/python/PyNames.java
+++ b/python/psi-api/src/com/jetbrains/python/PyNames.java
@@ -165,6 +165,7 @@ public class PyNames {
 
   public static final String NAME = "__name__";
   public static final String ENTER = "__enter__";
+  public static final String EXIT = "__exit__";
 
   public static final String CALLABLE_BUILTIN = "callable";
   public static final String NAMEDTUPLE = "namedtuple";

diff --git a/python/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java b/python/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java
index 4a15358f7f7166958ed6f23bd221b561c6ec5b68..7d2e4feebfa024baa0922d526ad6737a7556166e 100644 (file)
--- a/python/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java
+++ b/python/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java
@@ -15,6 +15,7 @@
  */
 package com.jetbrains.python.inspections;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.intellij.codeInspection.*;
@@ -35,8 +36,8 @@ import com.intellij.ui.components.JBList;
 import com.intellij.util.Consumer;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import com.intellij.util.containers.HashMap;
 import com.intellij.util.ui.CheckBox;
+import com.jetbrains.python.PyNames;
 import com.jetbrains.python.codeInsight.controlflow.ControlFlowCache;
 import com.jetbrains.python.codeInsight.dataflow.scope.Scope;
 import com.jetbrains.python.inspections.quickfix.PyRenameElementQuickFix;
@@ -52,6 +53,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -65,6 +67,16 @@ public class PyPep8NamingInspection extends PyInspection {
   private static final Pattern UPPERCASE_REGEX = Pattern.compile("[_\\p{javaUpperCase}][_\\p{javaUpperCase}0-9]*");
   private static final Pattern MIXEDCASE_REGEX = Pattern.compile("_?_?[\\p{javaUpperCase}][\\p{javaLowerCase}\\p{javaUpperCase}0-9]*");
   private static final String INSPECTION_SHORT_NAME = "PyPep8NamingInspection";
+  private static final Map<String, String> ERROR_CODES_DESCRIPTION = ImmutableMap.<String, String>builder()
+    .put("N801", "Class names should use CamelCase convention")
+    .put("N802", "Function name should be lowercase")
+    .put("N803", "Argument name should be lowercase")
+    .put("N806", "Variable in function should be lowercase")
+    .put("N811", "Constant variable imported as non constant")
+    .put("N812", "Lowercase variable imported as non lowercase)")
+    .put("N813", "CamelCase variable imported as lowercase")
+    .put("N814", "CamelCase variable imported as constant")
+    .build();
 
   public final List<String> ignoredErrors = new ArrayList<String>();
 
@@ -94,19 +106,6 @@ public class PyPep8NamingInspection extends PyInspection {
   }
 
   public class Visitor extends PyInspectionVisitor {
-    @SuppressWarnings("Duplicates") private final HashMap<String, String> errorCodesDescription = new HashMap<String, String>() {
-      {
-        put("N801", "Class names should use CamelCase convention");
-        put("N802", "Function name should be lowercase");
-        put("N803", "Argument name should be lowercase");
-        put("N806", "Variable in function should be lowercase");
-        put("N811", "Constant variable imported as non constant");
-        put("N812", "Lowercase variable imported as non lowercase");
-        put("N813", "CamelCase variable imported as lowercase");
-        put("N814", "CamelCase variable imported as constant");
-      }
-    };
-
     public Visitor(ProblemsHolder holder, LocalInspectionToolSession session) {
       super(holder, session);
     }
@@ -145,9 +144,9 @@ public class PyPep8NamingInspection extends PyInspection {
 
     private void registerAndAddRenameAndIgnoreErrorQuickFixes(@Nullable final PsiElement node, @NotNull final String errorCode) {
       if (getHolder() != null && getHolder().isOnTheFly())
-        registerProblem(node, errorCodesDescription.get(errorCode), new PyRenameElementQuickFix(), new IgnoreErrorFix(errorCode));
+        registerProblem(node, ERROR_CODES_DESCRIPTION.get(errorCode), new PyRenameElementQuickFix(), new IgnoreErrorFix(errorCode));
       else
-        registerProblem(node, errorCodesDescription.get(errorCode), new IgnoreErrorFix(errorCode));
+        registerProblem(node, ERROR_CODES_DESCRIPTION.get(errorCode), new IgnoreErrorFix(errorCode));
     }
 
     @Override
@@ -172,7 +171,7 @@ public class PyPep8NamingInspection extends PyInspection {
           final String errorCode = "N802";
           if (!ignoredErrors.contains(errorCode)) {
             quickFixes.add(new IgnoreErrorFix(errorCode));
-            registerProblem(nameNode.getPsi(), errorCodesDescription.get(errorCode),
+            registerProblem(nameNode.getPsi(), ERROR_CODES_DESCRIPTION.get(errorCode),
                             quickFixes.toArray(new LocalQuickFix[quickFixes.size()]));
           }
         }
@@ -218,7 +217,7 @@ public class PyPep8NamingInspection extends PyInspection {
     }
 
     private boolean isContextManager(PyClass node) {
-      final String[] contextManagerFunctionNames = new String[] {"__enter__", "__exit__"};
+      final String[] contextManagerFunctionNames = {PyNames.ENTER, PyNames.EXIT};
       for (String name: contextManagerFunctionNames) {
         if (node.findMethodByName(name, false, myTypeEvalContext) == null) {
           return false;