[support for 2020.2 version] get rid of start comment tokens in doc patterns & migrate to non-atomic PsiComment structure

Author: slapoguzov

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java

@@ -48,7 +48,7 @@ public class TwigPattern {
         PlatformPatterns.psiElement(TwigTokenTypes.SINGLE_QUOTE)
     );
 
-    public static final String DOC_SEE_REGEX  = "\\{#[\\s]+@see[\\s]+([-@\\./\\:\\w\\\\\\[\\]]+)[\\s]*#}";
+    public static final String DOC_SEE_REGEX  = "@see[\\s]+([-@\\./\\:\\w\\\\\\[\\]]+)[\\s]*";
 
     /**
      * {% trans with {'%name%': 'Fabien'} from "app" %}
@@ -869,7 +869,7 @@ public static ElementPattern<PsiComment> getTwigTypeDocBlockPattern() {
         Collection<ElementPattern> patterns = new ArrayList<>();
 
         for (String s : TwigTypeResolveUtil.DOC_TYPE_PATTERN_SINGLE) {
-            patterns.add(PlatformPatterns.psiComment().withText(PlatformPatterns.string().matches(s)).withLanguage(TwigLanguage.INSTANCE));
+            patterns.add(PlatformPatterns.psiElement(TwigTokenTypes.COMMENT_TEXT).withText(PlatformPatterns.string().matches(s)).withLanguage(TwigLanguage.INSTANCE));
         }
 
         return PlatformPatterns.or(patterns.toArray(new ElementPattern[patterns.size()]));
@@ -881,10 +881,10 @@ public static ElementPattern<PsiComment> getTwigTypeDocBlockPattern() {
      * {# \Class #}
      */
     @NotNull
-    public static ElementPattern<PsiComment> getTwigDocSeePattern() {
+    public static ElementPattern<PsiElement> getTwigDocSeePattern() {
         return PlatformPatterns.or(
-            PlatformPatterns.psiComment().withText(PlatformPatterns.string().matches(DOC_SEE_REGEX)).withLanguage(TwigLanguage.INSTANCE),
-            PlatformPatterns.psiComment().withText(PlatformPatterns.string().matches(TwigUtil.DOC_SEE_REGEX_WITHOUT_SEE)).withLanguage(TwigLanguage.INSTANCE)
+            PlatformPatterns.psiElement(TwigTokenTypes.COMMENT_TEXT).withText(PlatformPatterns.string().matches(DOC_SEE_REGEX)).withLanguage(TwigLanguage.INSTANCE),
+            PlatformPatterns.psiElement(TwigTokenTypes.COMMENT_TEXT).withText(PlatformPatterns.string().matches(TwigUtil.DOC_SEE_REGEX_WITHOUT_SEE)).withLanguage(TwigLanguage.INSTANCE)
         );
     }
 

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

@@ -69,9 +69,9 @@ public class TwigTypeResolveUtil {
 
     // for supporting completion and navigation of one line element
     public static final String[] DOC_TYPE_PATTERN_SINGLE  = new String[] {
-        "\\{#[\\s]+(?<var>[\\w]+)[\\s]+(?<class>[\\w\\\\\\[\\]]+)[\\s]+#}",
-        "\\{#[\\s]+"+ DOC_TYPE_PATTERN_CLASS_SECOND + "[\\s]+#}",
-        "\\{#[\\s]+"+ DOC_TYPE_PATTERN_CLASS_FIRST + "[\\s]+#}",
+        "^(?<var>[\\w]+)[\\s]+(?<class>[\\w\\\\\\[\\]]+)[\\s]*$",
+        DOC_TYPE_PATTERN_CLASS_SECOND,
+        DOC_TYPE_PATTERN_CLASS_FIRST
     };
 
     private static String[] PROPERTY_SHORTCUTS = new String[] {"get", "is", "has"};

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java

@@ -79,7 +79,7 @@
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class TwigUtil {
-    public static final String DOC_SEE_REGEX_WITHOUT_SEE  = "\\{#[\\s]+([-@\\./\\:\\w\\\\\\[\\]]+)[\\s]*#}";
+    public static final String DOC_SEE_REGEX_WITHOUT_SEE  = "([-@\\./\\:\\w\\\\\\[\\]]+)[\\s]*";
 
     /**
      * Twig namespace for "non namespace"; its also a reserved value in Twig library

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

@@ -54,9 +54,9 @@ public void testFindFileVariableDocBlock() {
     }
 
     public void testReqExForInlineDocVariables() {
-        assertMatches("{# @var foo_1 \\AppBundle\\Entity\\MeterValueDTO #}", TwigTypeResolveUtil.DOC_TYPE_PATTERN_SINGLE);
-        assertMatches("{# @var \\AppBundle\\Entity\\MeterValueDTO foo_1 #}", TwigTypeResolveUtil.DOC_TYPE_PATTERN_SINGLE);
-        assertMatches("{# foo_1 \\AppBundle\\Entity\\MeterValueDTO #}", TwigTypeResolveUtil.DOC_TYPE_PATTERN_SINGLE);
+        assertMatches("@var foo_1 \\AppBundle\\Entity\\MeterValueDTO", TwigTypeResolveUtil.DOC_TYPE_PATTERN_SINGLE);
+        assertMatches("@var \\AppBundle\\Entity\\MeterValueDTO foo_1", TwigTypeResolveUtil.DOC_TYPE_PATTERN_SINGLE);
+        assertMatches("foo_1 \\AppBundle\\Entity\\MeterValueDTO", TwigTypeResolveUtil.DOC_TYPE_PATTERN_SINGLE);
     }
 
     /**