add support for Twig 2 hassers for the attribute operator Haehnchen#964

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigTypeResolveUtil.java

@@ -49,7 +49,7 @@ public class TwigTypeResolveUtil {
  // for supporting completion and navigation of one line element
  public static final String DOC_TYPE_PATTERN_SINGLE = "\\{#[\\s]+@var[\\s]+([\\w]+)[\\s]+([\\w\\\\\\[\\]]+)[\\s]+#}";
 
- private static String[] propertyShortcuts = new String[] {"get", "is"};
+ private static String[] PROPERTY_SHORTCUTS = new String[] {"get", "is", "has"};
 
  private static final ExtensionPointName<TwigFileVariableCollector> TWIG_FILE_VARIABLE_COLLECTORS = new ExtensionPointName<>(
  "fr.adrienbrault.idea.symfony2plugin.extension.TwigVariableCollector"
@@ -461,7 +461,7 @@ public static String getTypeDisplayName(Project project, Set<String> types) {
 
  public static boolean isPropertyShortcutMethod(Method method) {
 
- for(String shortcut: propertyShortcuts) {
+ for(String shortcut: PROPERTY_SHORTCUTS) {
  if(method.getName().startsWith(shortcut) && method.getName().length() > shortcut.length()) {
  return true;
  }
@@ -472,7 +472,7 @@ public static boolean isPropertyShortcutMethod(Method method) {
 
  public static boolean isPropertyShortcutMethodEqual(String methodName, String variableName) {
 
- for(String shortcut: propertyShortcuts) {
+ for(String shortcut: PROPERTY_SHORTCUTS) {
  if(methodName.equalsIgnoreCase(shortcut + variableName)) {
  return true;
  }
@@ -481,10 +481,18 @@ public static boolean isPropertyShortcutMethodEqual(String methodName, String va
  return false;
  }
 
- public static String getPropertyShortcutMethodName(Method method) {
-
+ /**
+ * Twig attribute shortcuts
+ *
+ * getFoo => foo
+ * hasFoo => foo
+ * isFoo => foo
+ */
+ @NotNull
+ public static String getPropertyShortcutMethodName(@NotNull Method method) {
  String methodName = method.getName();
- for(String shortcut: propertyShortcuts) {
+
+ for(String shortcut: PROPERTY_SHORTCUTS) {
  // strip possible property shortcut and make it lcfirst
  if(method.getName().startsWith(shortcut) && method.getName().length() > shortcut.length()) {
  methodName = methodName.substring(shortcut.length());

tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/TwigVariablePathInspectionTest.java

@@ -32,6 +32,8 @@ public void testThatOnlyVariablesWithPublicAccessLevelAreHighlighted() {
 
  assertLocalInspectionNotContains("f.html.twig", "{# @var bar \\Foo\\Bar #} {{ bar.c<caret>ar }}", "Field or method not found");
  assertLocalInspectionNotContains("f.html.twig", "{# @var bar \\Foo\\Bar #} {{ bar.is<caret>Car }}", "Field or method not found");
+ assertLocalInspectionNotContains("f.html.twig", "{# @var bar \\Foo\\Bar #} {{ bar.has<caret>Hassers }}", "Field or method not found");
+ assertLocalInspectionNotContains("f.html.twig", "{# @var bar \\Foo\\Bar #} {{ bar.ha<caret>ssers }}", "Field or method not found");
  assertLocalInspectionNotContains("f.html.twig", "{# @var bar \\Foo\\Bar #} {{ bar.pub<caret>lic }}", "Field or method not found");
  assertLocalInspectionNotContains("f.html.twig", "{# @var bar \\Foo\\Bar #} {{ bar.next.pub<caret>lic }}", "Field or method not found");
  assertLocalInspectionNotContains("f.html.twig", "{# @var bar \\Foo\\Bar #} {{ bar.getNext.pub<caret>lic }}", "Field or method not found");

tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/inspection/fixtures/classes.php

@@ -15,6 +15,7 @@ class Bar
  public $public;
 
  public function getFoo() {}
+ public function hasHassers() {}
  public function isCar() {}
  protected function getApple() {}
 

tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigTypeResolveUtilTest.java

@@ -0,0 +1,28 @@
+package fr.adrienbrault.idea.symfony2plugin.tests.templating.util;
+
+import com.jetbrains.php.lang.psi.PhpPsiElementFactory;
+import com.jetbrains.php.lang.psi.elements.Method;
+import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigTypeResolveUtil;
+import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Daniel Espendiller <daniel@espendiller.net>
+ */
+public class TwigTypeResolveUtilTest extends SymfonyLightCodeInsightFixtureTestCase {
+ public void testThatTwigGetAttributeSupportShortcuts() {
+ assertEquals("myFoobar", TwigTypeResolveUtil.getPropertyShortcutMethodName(createMethod("myFoobar")));
+ assertEquals("foo", TwigTypeResolveUtil.getPropertyShortcutMethodName(createMethod("getFoo")));
+ assertEquals("foo", TwigTypeResolveUtil.getPropertyShortcutMethodName(createMethod("hasFoo")));
+ assertEquals("foo", TwigTypeResolveUtil.getPropertyShortcutMethodName(createMethod("isFoo")));
+ }
+
+ @NotNull
+ private Method createMethod(@NotNull String method) {
+ return PhpPsiElementFactory.createFromText(
+ getProject(),
+ Method.class,
+ "<?php interface F { function " + method + "(); }"
+ );
+ }
+}