introduce Twig pattern class

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/asset/AssetGoToDeclarationHandler.java

@@ -7,6 +7,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiManager;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
+import fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern;
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigHelper;
 import org.apache.commons.lang.ArrayUtils;
 import org.jetbrains.annotations.Nullable;
@@ -49,7 +50,7 @@ private String[] findValidAssetFilter(PsiElement psiElement) {
  }
 
  // asset / absolute_url dont have pre filter
- if(TwigHelper.getPrintBlockOrTagFunctionPattern("asset", "absolute_url").accepts(psiElement)) {
+ if(TwigPattern.getPrintBlockOrTagFunctionPattern("asset", "absolute_url").accepts(psiElement)) {
  return (String[]) ArrayUtils.addAll(TwigHelper.CSS_FILES_EXTENSIONS, TwigHelper.JS_FILES_EXTENSIONS);
  }
 
@@ -59,7 +60,7 @@ private String[] findValidAssetFilter(PsiElement psiElement) {
  @Nullable
  private String[] getFileExtensionFilterIfValidTag(PsiElement psiElement) {
  for (String tag: new String[] {"stylesheets", "javascripts"}) {
- if (!TwigHelper.getAutocompletableAssetTag(tag).accepts(psiElement)) {
+ if (!TwigPattern.getAutocompletableAssetTag(tag).accepts(psiElement)) {
  continue;
  }
 

src/fr/adrienbrault/idea/symfony2plugin/navigation/TwigFoldingBuilder.java

@@ -10,6 +10,7 @@
 import com.jetbrains.twig.TwigFile;
 import fr.adrienbrault.idea.symfony2plugin.Settings;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
+import fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern;
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigHelper;
 import fr.adrienbrault.idea.symfony2plugin.routing.Route;
 import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
@@ -56,7 +57,7 @@ public FoldingDescriptor[] buildFoldRegions(@NotNull PsiElement psiElement, @Not
  private void attachTemplateFoldingDescriptors(PsiElement psiElement, List<FoldingDescriptor> descriptors) {
  // find path calls in file
  PsiElement[] fileReferences = PsiTreeUtil.collectElements(psiElement, psiElement1 ->
- TwigHelper.getTemplateFileReferenceTagPattern().accepts(psiElement1) || TwigHelper.getFormThemeFileTag().accepts(psiElement1)
+ TwigPattern.getTemplateFileReferenceTagPattern().accepts(psiElement1) || TwigHelper.getFormThemeFileTag().accepts(psiElement1)
  );
 
  if(fileReferences.length == 0) {
@@ -83,7 +84,7 @@ private void attachPathFoldingDescriptors(PsiElement psiElement, List<FoldingDes
 
  // find path calls in file
  PsiElement[] psiElements = PsiTreeUtil.collectElements(psiElement, psiElement12 ->
- TwigHelper.getAutocompletableRoutePattern().accepts(psiElement12)
+ TwigPattern.getAutocompletableRoutePattern().accepts(psiElement12)
  );
 
  if(psiElements.length == 0) {
@@ -122,7 +123,7 @@ public String getPlaceholderText() {
  private void attachConstantFoldingDescriptors(PsiElement psiElement, List<FoldingDescriptor> descriptors) {
  // find path calls in file
  PsiElement[] constantReferences = PsiTreeUtil.collectElements(psiElement, psiElement1 ->
- TwigHelper.getPrintBlockOrTagFunctionPattern("constant").accepts(psiElement1)
+ TwigPattern.getPrintBlockOrTagFunctionPattern("constant").accepts(psiElement1)
  );
 
  if(constantReferences.length == 0) {

src/fr/adrienbrault/idea/symfony2plugin/routing/inspection/TwigRouteMissingInspection.java

@@ -5,7 +5,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
-import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigHelper;
+import fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern;
 import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
 import org.apache.commons.lang.StringUtils;
@@ -24,7 +24,7 @@ public PsiElementVisitor buildVisitor(final @NotNull ProblemsHolder holder, bool
  return new PsiElementVisitor() {
  @Override
  public void visitElement(PsiElement element) {
- if(TwigHelper.getAutocompletableRoutePattern().accepts(element) && TwigUtil.isValidStringWithoutInterpolatedOrConcat(element)) {
+ if(TwigPattern.getAutocompletableRoutePattern().accepts(element) && TwigUtil.isValidStringWithoutInterpolatedOrConcat(element)) {
  invoke(element, holder);
  }
 

src/fr/adrienbrault/idea/symfony2plugin/security/VoterGotoCompletionRegistrar.java

@@ -9,7 +9,7 @@
 import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.jetbrains.php.lang.psi.elements.StringLiteralExpression;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons;
-import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigHelper;
+import fr.adrienbrault.idea.symfony2plugin.templating.TwigPattern;
 import fr.adrienbrault.idea.symfony2plugin.codeInsight.GotoCompletionProvider;
 import fr.adrienbrault.idea.symfony2plugin.codeInsight.GotoCompletionRegistrar;
 import fr.adrienbrault.idea.symfony2plugin.codeInsight.GotoCompletionRegistrarParameter;
@@ -32,9 +32,9 @@ public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
  // {% is_granted(['foobar']) %}
  registrar.register(
  PlatformPatterns.or(
- TwigHelper.getPrintBlockOrTagFunctionPattern("is_granted"),
- TwigHelper.getFunctionWithFirstParameterAsArrayPattern("is_granted"),
- TwigHelper.getFunctionWithFirstParameterAsLiteralPattern("is_granted")
+ TwigPattern.getPrintBlockOrTagFunctionPattern("is_granted"),
+ TwigPattern.getFunctionWithFirstParameterAsArrayPattern("is_granted"),
+ TwigPattern.getFunctionWithFirstParameterAsLiteralPattern("is_granted")
  ),
  MyVisitorGotoCompletionProvider::new
  );

src/fr/adrienbrault/idea/symfony2plugin/templating/BlockGotoCompletionRegistrar.java

@@ -25,7 +25,7 @@ public class BlockGotoCompletionRegistrar implements GotoCompletionRegistrar {
  public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
 
  // {{ block('foo_block') }}
- registrar.register(TwigHelper.getPrintBlockFunctionPattern("block"), psiElement -> {
+ registrar.register(TwigPattern.getPrintBlockFunctionPattern("block"), psiElement -> {
  if (!Symfony2ProjectComponent.isEnabled(psiElement)) {
  return null;
  }

src/fr/adrienbrault/idea/symfony2plugin/templating/FilterGotoCompletionRegistrar.java

@@ -4,7 +4,6 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.util.containers.ContainerUtil;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
-import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigHelper;
 import fr.adrienbrault.idea.symfony2plugin.codeInsight.GotoCompletionProvider;
 import fr.adrienbrault.idea.symfony2plugin.codeInsight.GotoCompletionRegistrar;
 import fr.adrienbrault.idea.symfony2plugin.codeInsight.GotoCompletionRegistrarParameter;
@@ -25,7 +24,7 @@
 public class FilterGotoCompletionRegistrar implements GotoCompletionRegistrar {
  public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
  // {% trans foo<caret>bar %}
- registrar.register(TwigHelper.getFilterTagPattern(), psiElement -> {
+ registrar.register(TwigPattern.getFilterTagPattern(), psiElement -> {
  if (!Symfony2ProjectComponent.isEnabled(psiElement)) {
  return null;
  }

src/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java

@@ -65,7 +65,7 @@ public void collectSlowLineMarkers(@NotNull List<PsiElement> psiElements, @NotNu
  if(overwrites != null) {
  results.add(overwrites);
  }
- } else if (TwigHelper.getBlockTagPattern().accepts(psiElement) || TwigHelper.getPrintBlockFunctionPattern("block").accepts(psiElement)) {
+ } else if (TwigPattern.getBlockTagPattern().accepts(psiElement) || TwigPattern.getPrintBlockFunctionPattern("block").accepts(psiElement)) {
  // blocks: {% block 'foobar' %}, {{ block('foobar') }}
 
  LineMarkerInfo lineImpl = this.attachBlockImplements(psiElement);