optimize inspections

Author: lte2000

src/com/millennialmedia/intellibot/ide/inspections/cleanup/RobotImportNotUsed.java

@@ -29,15 +29,12 @@ public String getDisplayName() {
 
     @Override
     public boolean skip(PsiElement element) {
-        if (element.getNode().getElementType() != RobotTokenTypes.ARGUMENT) {
-            return true;
-        } else if (!(element instanceof Argument)) {
-            return true;
-        }
-        PsiFile file = element.getContainingFile();
-        if (!(file instanceof RobotFile)) {
+        if (!(element instanceof Argument)) {
             return true;
         }
+//        else if (element.getNode().getElementType() != RobotTokenTypes.ARGUMENT) {
+//            return true;
+//        }
 
         PsiElement parent = element.getParent();
 
@@ -58,7 +55,11 @@ public boolean skip(PsiElement element) {
                 if (importFile == null) {
                     return true; // we cannot find the file thus we do not know if we use it
                 }
-                
+
+                PsiFile file = element.getContainingFile();
+                if (!(file instanceof RobotFile)) {
+                    return true;
+                }
                 Collection<PsiFile> referenced = ((RobotFile) file).getFilesFromInvokedKeywordsAndVariables();
                 return referenced.contains(importFile.getContainingFile());
             } else {

src/com/millennialmedia/intellibot/ide/inspections/compilation/RobotImportNotFound.java

@@ -5,6 +5,7 @@
 import com.millennialmedia.intellibot.RobotBundle;
 import com.millennialmedia.intellibot.ide.inspections.SimpleRobotInspection;
 import com.millennialmedia.intellibot.psi.RobotTokenTypes;
+import com.millennialmedia.intellibot.psi.element.Argument;
 import com.millennialmedia.intellibot.psi.element.Import;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
@@ -24,7 +25,10 @@ public String getDisplayName() {
 
     @Override
     public boolean skip(PsiElement element) {
-        if (element.getNode().getElementType() != RobotTokenTypes.ARGUMENT) {
+//        if (element.getNode().getElementType() != RobotTokenTypes.ARGUMENT) {
+//            return true;
+//        }
+        if (!(element instanceof Argument)) {
             return true;
         }
         PsiElement parent = element.getParent();

src/com/millennialmedia/intellibot/ide/inspections/compilation/RobotVariableNotFound.java

@@ -45,8 +45,8 @@ public boolean skip(PsiElement element) {
                 container = container.getParent();
             }
             if (container instanceof KeywordStatement) {
-                KeywordInvokable invokable = ((KeywordStatement) container).getInvokable();
-                String text = invokable == null ? null : invokable.getPresentableText();
+//                KeywordInvokable invokable = ((KeywordStatement) container).getInvokable();
+//                String text = invokable == null ? null : invokable.getPresentableText();
 //                if (text != null) {
 //                    if (text.startsWith(":")) {
 //                        // TODO: for loops

src/com/millennialmedia/intellibot/ide/inspections/readability/RobotKeywordDefinitionStartingWithGherkin.java

@@ -17,6 +17,12 @@
  */
 public class RobotKeywordDefinitionStartingWithGherkin extends SimpleRobotInspection {
 
+    private static final Collection<String> gherkin;
+
+    static {
+        gherkin = RobotKeywordProvider.getInstance().getSyntaxOfType(RobotTokenTypes.GHERKIN);
+    }
+
     @Nls
     @NotNull
     @Override
@@ -30,16 +36,12 @@ public boolean skip(PsiElement element) {
     }
 
     private boolean valid(String text) {
-        Collection<String> gherkin = RobotKeywordProvider.getInstance().getSyntaxOfType(RobotTokenTypes.GHERKIN);
+//        Collection<String> gherkin = RobotKeywordProvider.getInstance().getSyntaxOfType(RobotTokenTypes.GHERKIN);
         int firstSpace = text.indexOf(" ");
-
-        String word;
-        if (firstSpace < 0) {
-            word = text;
-        } else {
-            word = text.substring(0, firstSpace);
+        if (firstSpace >= 0) {
+            text = text.substring(0, firstSpace);
         }
-        return !gherkin.contains(word);
+        return !gherkin.contains(text);
     }
 
     @Override

src/com/millennialmedia/intellibot/psi/ref/RobotKeywordReference.java

@@ -24,10 +24,11 @@ public PsiElement resolve() {
         String keyword = element.getPresentableText();
         // all files we import are based off the file we are currently in
         // TODO: potentially unsafe cast
-        PerformanceCollector debug = new PerformanceCollector((PerformanceEntity) element, "resolve");
-        PsiElement results = ResolverUtils.resolveKeywordFromFile(keyword, element.getContainingFile());
-        debug.complete();
-        return results;
+//        PerformanceCollector debug = new PerformanceCollector((PerformanceEntity) element, "resolve");
+//        PsiElement results = ResolverUtils.resolveKeywordFromFile(keyword, element.getContainingFile());
+//        debug.complete();
+//        return results;
+        return ResolverUtils.resolveKeywordFromFile(keyword, element.getContainingFile());
     }
 
     @NotNull