cleanup

Author: ignatov

src/org/intellij/erlang/ErlangDescriptionProvider.java

@@ -72,6 +72,7 @@ public String getElementDescription(@NotNull PsiElement o, @NotNull ElementDescr
       else if (o instanceof ErlangQAtom) return "atom";
       else if (o instanceof ErlangTypeRef) return "type";
       else if (o instanceof ErlangFunctionCallExpression) return "function";
+      else if (o instanceof ErlangSpecification) return "specification";
     }
     LOG.error("Unexpected element " + o.getText() +
               ", class: " + o.getClass() +

src/org/intellij/erlang/index/ErlangAtomIndex.java

@@ -23,7 +23,6 @@
 import com.intellij.util.indexing.*;
 import com.intellij.util.io.EnumeratorStringDescriptor;
 import com.intellij.util.io.KeyDescriptor;
-import gnu.trove.THashMap;
 import org.intellij.erlang.psi.ErlangFile;
 import org.intellij.erlang.psi.ErlangQAtom;
 import org.intellij.erlang.psi.ErlangRecursiveVisitor;

src/org/intellij/erlang/inspection/ErlangConflictingBehavioursInspection.java

@@ -41,9 +41,9 @@ protected void checkFile(@NotNull ErlangFile file, @NotNull ProblemsHolder holde
     }
   }
 
-  private void reportProblem(@NotNull ErlangModule module,
-                             @NotNull ProblemsHolder problemsHolder,
-                             @NotNull List<Pair<String, List<String>>> callbacksAndRequiringModules) {
+  private static void reportProblem(@NotNull ErlangModule module,
+                                    @NotNull ProblemsHolder problemsHolder,
+                                    @NotNull List<Pair<String, List<String>>> callbacksAndRequiringModules) {
     assert !callbacksAndRequiringModules.isEmpty();
 
     StringBuilder builder = new StringBuilder("Conflicting behaviours - ");

src/org/intellij/erlang/inspection/ErlangIllegalGuardInspection.java

@@ -58,7 +58,7 @@ protected void checkFile(@NotNull ErlangFile file, @NotNull ProblemsHolder holde
     }
   }
 
-  private class GuardDetector extends ErlangRecursiveVisitor {
+  private static class GuardDetector extends ErlangRecursiveVisitor {
     private final ProblemsHolder myHolder;
 
     public GuardDetector(ProblemsHolder holder) {

src/org/intellij/erlang/inspection/ErlangIllegalPatternInspection.java

@@ -37,7 +37,7 @@ protected void checkFile(@NotNull ErlangFile file, @NotNull ProblemsHolder holde
     }
   }
 
-  private class PatternInspector extends ErlangRecursiveVisitor {
+  private static class PatternInspector extends ErlangRecursiveVisitor {
     private final ProblemsHolder myHolder;
 
     public PatternInspector(ProblemsHolder holder) {
@@ -76,7 +76,8 @@ private void visitGlobalListOpExpression(@NotNull ErlangListOpExpression o) {
       }
     }
 
-    private void checkExpressionAndReport(@NotNull PsiElement element, @NotNull final ProblemsHolder problemsHolder) {
+    private static void checkExpressionAndReport(@NotNull PsiElement element,
+                                                 @NotNull final ProblemsHolder problemsHolder) {
       element.accept(new ErlangRecursiveVisitor() {
 
         private void registerProblemIfContainsNonConstant(@NotNull ErlangExpression o) {

src/org/intellij/erlang/inspection/ErlangImportDirectiveOverridesAutoImportedBifInspection.java

@@ -51,5 +51,4 @@ protected void checkFile(@NotNull ErlangFile file, @NotNull ProblemsHolder probl
                                      new ErlangRemoveFunctionFromImportFixBase.ErlangRemoveFunctionFromImportFix());
     }
   }
-
 }

src/org/intellij/erlang/inspection/ErlangUnboundVariableInspection.java

@@ -42,6 +42,7 @@ protected ErlangVisitor buildErlangVisitor(@NotNull final ProblemsHolder holder,
     return new ErlangVisitor() {
       @Override
       public void visitQVar(@NotNull ErlangQVar o) {
+        if (!o.isValid()) return;
         if (inArgumentDefinition(o) && !inArgumentList(o)
           || inDefinitionBeforeArgumentList(o)
           || inLeftPartOfAssignment(o) || inAtomAttribute(o)
@@ -50,7 +51,7 @@ public void visitQVar(@NotNull ErlangQVar o) {
           return;
         }
         PsiReference reference = o.getReference();
-        if (reference != null && reference.resolve() == null) {
+        if (reference.resolve() == null) {
           registerProblem(holder, o, "Variable " + "'" + o.getText() + "' is unbound", new ErlangIntroduceVariableQuickFix());
         }
       }
@@ -75,26 +76,23 @@ public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descri
       }
 
       if (anchor != null) {
-        PsiElement parent = anchor.getParent();
-        if (parent != null) {
-          Editor editor = PsiEditorUtil.findEditor(anchor);
-          if (editor == null) return;
+        Editor editor = PsiEditorUtil.findEditor(anchor);
+        if (editor == null) return;
 
-          editor.getCaretModel().moveToOffset(anchor.getTextRange().getStartOffset());
+        editor.getCaretModel().moveToOffset(anchor.getTextRange().getStartOffset());
 
-          TemplateManager manager = TemplateManager.getInstance(project);
-          Template template = manager.createTemplate("", "");
+        TemplateManager manager = TemplateManager.getInstance(project);
+        Template template = manager.createTemplate("", "");
 
-          template.addTextSegment(((ErlangQVar) psiElement).getName());
-          template.addTextSegment(" = ");
-          template.addVariable(new ConstantNode("unbound"), true);
-          template.addTextSegment("");
-          template.addEndVariable();
-          template.addTextSegment(",\n");
+        template.addTextSegment(((ErlangQVar) psiElement).getName());
+        template.addTextSegment(" = ");
+        template.addVariable(new ConstantNode("unbound"), true);
+        template.addTextSegment("");
+        template.addEndVariable();
+        template.addTextSegment(",\n");
 
-          manager.startTemplate(editor, template);
+        manager.startTemplate(editor, template);
 
-        }
       }
     }
   }

src/org/intellij/erlang/inspection/ErlangUnresolvedIncludeLibInspection.java

@@ -51,7 +51,7 @@ static void processInclude(@NotNull ProblemsHolder problemsHolder,
                              String what) {
     boolean empty = string.getTextLength() <= 2;
     TextRange range = empty ? TextRange.create(0, string.getTextLength()) : TextRange.create(1, string.getTextLength() - 1);
-    if (files.size() == 0) {
+    if (files.isEmpty()) {
       LOG.debug(what + ": " + string.getText() + " unresolved");
       if (empty) {
         problemsHolder.registerProblem(string, range, "Unresolved " + what + ": file not found", getFindIncludeQuickFix(what));

src/org/intellij/erlang/inspection/ErlangUnresolvedRecordInspection.java

@@ -48,7 +48,7 @@ public void visitQAtom(@NotNull ErlangQAtom o) {
     };
   }
 
-  private void process(@NotNull PsiElement o, @NotNull ProblemsHolder problemsHolder) {
+  private static void process(@NotNull PsiElement o, @NotNull ProblemsHolder problemsHolder) {
     PsiReference ref = o.getReference();
     if (ref == null || ref.resolve() == null) {
       registerProblem(problemsHolder, o, "Unresolved record " + "'" + o.getText() + "'", new ErlangIntroduceRecordFix());

src/org/intellij/erlang/inspection/ErlangUnusedVariableInspection.java

@@ -41,7 +41,7 @@ public void visitQVar(@NotNull ErlangQVar o) {
             if (isForceSkipped(o) || !inLeftPartOfAssignment(o) && (!inArgumentDefinition(o) || inArgumentList(o))) return;
 
             PsiReference reference = o.getReference();
-            PsiElement resolve = reference != null ? reference.resolve() : null;
+            PsiElement resolve = reference.resolve();
             if (resolve != null) return;
 
             Query<PsiReference> search = ReferencesSearch.search(o, new LocalSearchScope(functionClause));