Merge pull request #1116 from Haehnchen/feature/unused-code

drop unused and unreachable code

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/SettingsForm.java

@@ -4,7 +4,6 @@
 import com.intellij.openapi.fileChooser.FileChooser;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
-import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.Project;

src/fr/adrienbrault/idea/symfony2plugin/Symfony2ProjectComponent.java

@@ -7,7 +7,6 @@
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.wm.StatusBar;
 import com.intellij.openapi.wm.WindowManager;

src/fr/adrienbrault/idea/symfony2plugin/action/ServiceActionUtil.java

@@ -14,7 +14,6 @@
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlTag;
 import com.jetbrains.php.lang.psi.elements.Method;
 import com.jetbrains.php.lang.psi.elements.Parameter;

src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionProvider.java

@@ -9,6 +9,7 @@
 import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
@@ -18,25 +19,21 @@
  */
 public class YamlCompletionProvider extends CompletionProvider<CompletionParameters> {
 
-
+    @Nullable
     private List<LookupElement> lookupList;
+
+    @Nullable
     private Map<String, String> lookupMap;
-    private String[] lookupArray;
 
-    public YamlCompletionProvider(List<LookupElement> lookups) {
+    public YamlCompletionProvider(@Nullable List<LookupElement> lookups) {
         this.lookupList = lookups;
     }
 
-    public YamlCompletionProvider(Map<String, String> lookups) {
+    public YamlCompletionProvider(@Nullable Map<String, String> lookups) {
         this.lookupMap = lookups;
     }
 
-    public YamlCompletionProvider(String[] lookups) {
-        this.lookupArray = lookups;
-    }
-
     public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet resultSet) {
-
         if(!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) {
             return;
         }
@@ -52,12 +49,6 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
 
                 resultSet.addElement(lookupElement);
             }
-        } else if(lookupArray != null) {
-            for (String lookup : lookupArray) {
-                resultSet.addElement(LookupElementBuilder.create(lookup).withIcon(Symfony2Icons.SYMFONY));
-            }
         }
-
-
     }
 }

src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlElementPatternHelper.java

@@ -596,26 +596,6 @@ public static ElementPattern<? extends PsiElement> getAfterCommaPattern() {
 
     }
 
-    /**
-     * Get service before comma
-     *
-     * ["@service', createNewsletterManager|]
-     * [@service, createNewsletterManager|]
-     * ['@service', createNewsletterManager|]
-     */
-    public static ElementPattern<? extends PsiElement> getPreviousCommaSibling() {
-
-        return PlatformPatterns.or(
-            PlatformPatterns
-                .psiElement(YAMLScalar.class)
-                .beforeLeafSkipping(
-                    PlatformPatterns.psiElement(PsiWhiteSpace.class),
-                    PlatformPatterns.psiElement().withText(",")
-                )
-        );
-
-    }
-
     /**
      * parameters:
      *    foo.example.class: |
@@ -659,22 +639,6 @@ public static PsiElementPattern.Capture<PsiElement> getInsideKeyValue(String...
             );
     }
 
-    /**
-     * services:
-     *   i<caret>d: []
-     */
-    public static PsiElementPattern.Capture<PsiElement> getServiceIdKeyPattern() {
-        return PlatformPatterns.psiElement(YAMLTokenTypes.SCALAR_KEY)
-             .withParent(PlatformPatterns.psiElement(YAMLKeyValue.class)
-                 .withParent(PlatformPatterns.psiElement(YAMLCompoundValue.class)
-                     .withParent(
-                          PlatformPatterns.psiElement(YAMLKeyValue.class)
-                              .withName(PlatformPatterns.string().oneOfIgnoreCase("services"))
-                     )
-                 )
-             );
-    }
-
     /**
      * services:
      *   i<caret>d: []

src/fr/adrienbrault/idea/symfony2plugin/dic/ServiceLookupElement.java

@@ -12,7 +12,6 @@
 import com.jetbrains.php.PhpIndex;
 import com.jetbrains.php.lang.psi.elements.Field;
 import com.jetbrains.php.lang.psi.elements.Method;
-import com.jetbrains.php.lang.psi.elements.Parameter;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
 import fr.adrienbrault.idea.symfony2plugin.config.xml.XmlHelper;
 import fr.adrienbrault.idea.symfony2plugin.dic.attribute.value.AttributeValueInterface;

src/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java

@@ -23,10 +23,6 @@
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class XmlLineMarkerProvider implements LineMarkerProvider {
-
-    @Nullable
-    private Map<String, Collection<ContainerService>> decoratedServiceCache;
-
     @Nullable
     @Override
     public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement psiElement) {
@@ -65,7 +61,7 @@ private void visitServiceId(@NotNull XmlTag xmlTag, @NotNull Collection<LineMark
         // <service id="foo" decorates=foobar" />
         String decorates = xmlTag.getAttributeValue("decorates");
         if(decorates != null && StringUtils.isNotBlank(decorates)) {
-            result.add(ServiceUtil.getLineMarkerForDecoratesServiceId(xmlTag, decorates, result));
+            result.add(ServiceUtil.getLineMarkerForDecoratesServiceId(xmlTag, decorates));
         }
 
         NavigationGutterIconBuilder<PsiElement> lineMarker = ServiceUtil.getLineMarkerForDecoratedServiceId(

src/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/XmlLineMarkerProvider.java

@@ -22,10 +22,6 @@
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class YamlLineMarkerProvider implements LineMarkerProvider {
-
-    @Nullable
-    private Map<String, Collection<ContainerService>> decoratedServiceCache;
-
     @Nullable
     @Override
     public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement psiElement) {
@@ -61,7 +57,7 @@ private void visitServiceId(@NotNull YAMLKeyValue yamlKeyValue, @NotNull Collect
         // decorates: @foobar
         String decorates = YamlHelper.getYamlKeyValueAsString(yamlKeyValue, "decorates");
         if(decorates != null && StringUtils.isNotBlank(decorates)) {
-            result.add(ServiceUtil.getLineMarkerForDecoratesServiceId(yamlKeyValue, decorates, result));
+            result.add(ServiceUtil.getLineMarkerForDecoratesServiceId(yamlKeyValue, decorates));
         }
 
         NavigationGutterIconBuilder<PsiElement> lineMarker = ServiceUtil.getLineMarkerForDecoratedServiceId(

src/fr/adrienbrault/idea/symfony2plugin/dic/linemarker/YamlLineMarkerProvider.java

@@ -1,6 +1,5 @@
 package fr.adrienbrault.idea.symfony2plugin.doctrine.metadata.lookup;
 
-import com.intellij.codeInsight.completion.InsertHandler;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementPresentation;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
@@ -15,10 +14,8 @@
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class DoctrineRepositoryLookupElement extends LookupElement {
-
     @NotNull
     private final PhpClass phpClass;
-    private InsertHandler<DoctrineRepositoryLookupElement> insertHandler;
 
     private DoctrineRepositoryLookupElement(@NotNull PhpClass phpClass) {
         this.phpClass = phpClass;

src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/lookup/DoctrineRepositoryLookupElement.java

@@ -7,7 +7,6 @@
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;

src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/RepositoryQueryBuilderRepositoryDetector.java

@@ -14,7 +14,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;

src/fr/adrienbrault/idea/symfony2plugin/external/locator/TwigFileToolboxTargetLocator.java

@@ -13,7 +13,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;

src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ControllerToolboxProvider.java

@@ -6,7 +6,6 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.ContainerUtil;

src/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TwigToolboxProvider.java

@@ -8,14 +8,12 @@
 import com.intellij.patterns.XmlTagPattern;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlTag;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.config.xml.XmlHelper;
 import fr.adrienbrault.idea.symfony2plugin.util.resource.FileResourceUtil;
-import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/fr/adrienbrault/idea/symfony2plugin/intentions/xml/XmlServiceSuggestIntention.java

@@ -13,7 +13,6 @@
 import fr.adrienbrault.idea.symfony2plugin.doctrine.metadata.util.DoctrineMetadataUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.resource.FileResourceUtil;
-import fr.adrienbrault.idea.symfony2plugin.util.yaml.YamlHelper;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

src/fr/adrienbrault/idea/symfony2plugin/routing/XmlLineMarkerProvider.java

@@ -897,20 +897,6 @@ public static ElementPattern<PsiComment> getTwigDocSeePattern() {
         );
     }
 
-    public static ElementPattern<PsiElement> getRoutePattern() {
-        //noinspection unchecked
-        return PlatformPatterns
-            .psiElement(TwigTokenTypes.IDENTIFIER).withText("path")
-            .beforeLeafSkipping(
-                PlatformPatterns.or(
-                    PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE),
-                    PlatformPatterns.psiElement(PsiWhiteSpace.class)
-                ),
-                PlatformPatterns.psiElement(TwigTokenTypes.LBRACE)
-            )
-            .withLanguage(TwigLanguage.INSTANCE);
-    }
-
     public static ElementPattern<PsiElement> getAutocompletableRoutePattern() {
         //noinspection unchecked
         return PlatformPatterns
@@ -1171,26 +1157,6 @@ public static ElementPattern<PsiElement> getIfConditionVariablePattern() {
             .withLanguage(TwigLanguage.INSTANCE);
     }
 
-    public static ElementPattern<PsiElement> getTwigMacroNamePattern() {
-
-        // {% macro <foo>(user) %}
-
-        //noinspection unchecked
-        return PlatformPatterns
-            .psiElement(TwigTokenTypes.IDENTIFIER)
-            .withParent(PlatformPatterns.psiElement(
-                TwigElementTypes.MACRO_TAG
-            ))
-            .afterLeafSkipping(
-                PlatformPatterns.or(
-                    PlatformPatterns.psiElement(PsiWhiteSpace.class),
-                    PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE)
-                ),
-                PlatformPatterns.psiElement(TwigTokenTypes.TAG_NAME).withText("macro")
-            )
-            .withLanguage(TwigLanguage.INSTANCE);
-    }
-
     public static ElementPattern<PsiElement> getTwigTagUseNamePattern() {
 
         // {% use '<foo>' %}

src/fr/adrienbrault/idea/symfony2plugin/routing/YamlLineMarkerProvider.java

@@ -32,7 +32,6 @@
 import fr.adrienbrault.idea.symfony2plugin.twig.variable.collector.ControllerDocVariableCollector;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils;
-import fr.adrienbrault.idea.symfony2plugin.util.RegexPsiElementFilter;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -460,14 +459,17 @@ private Collection<PsiElement> getFunctions(@NotNull PsiElement psiElement) {
         return Arrays.asList(PhpElementsUtil.getPsiElementsBySignature(psiElement.getProject(), functions.get(funcName).getSignature()));
     }
 
+    @NotNull
     private Collection<PsiElement> getSets(@NotNull PsiElement psiElement) {
         String funcName = psiElement.getText();
         for(String twigSet: TwigUtil.getSetDeclaration(psiElement.getContainingFile())) {
             if(twigSet.equals(funcName)) {
-                return Arrays.asList(PsiTreeUtil.collectElements(psiElement.getContainingFile(), new RegexPsiElementFilter(
-                    TwigTagWithFileReference.class,
-                    "\\{%\\s?set\\s?" + Pattern.quote(funcName) + "\\s?.*")
-                ));
+                // @TODO: drop regex
+                return Arrays.asList(PsiTreeUtil.collectElements(psiElement.getContainingFile(), psiElement1 ->
+                    PlatformPatterns.psiElement(TwigTagWithFileReference.class)
+                    .accepts(psiElement1) && psiElement1.getText()
+                    .matches("\\{%\\s?set\\s?" + Pattern.quote(funcName) + "\\s?.*"))
+                );
             }
         }