Merge pull request #319 from Haehnchen/feature/phpdoctag

Haehnchen · web-flow · commit e03703758c1c · 2024-10-16T18:05:43.000+02:00
use direct interface for "com.jetbrains.php.lang.psi.stubs.PhpStubElementType phpDocTag" access to fix member field issue (EAP)
diff --git a/src/main/java/de/espend/idea/php/annotation/completion/PhpAnnotationCompletionConfidence.java b/src/main/java/de/espend/idea/php/annotation/completion/PhpAnnotationCompletionConfidence.java
@@ -6,6 +6,7 @@
 import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.util.ThreeState;
 import com.jetbrains.php.lang.documentation.phpdoc.lexer.PhpDocTokenTypes;
+import com.jetbrains.php.lang.documentation.phpdoc.parser.BasicPhpDocStubElementTypes;
 import com.jetbrains.php.lang.documentation.phpdoc.parser.PhpDocElementTypes;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment;
 import com.jetbrains.php.lang.patterns.PhpPatterns;
@@ -52,7 +53,7 @@ public ThreeState shouldSkipAutopopup(@NotNull PsiElement contextElement, @NotNu
             }
 
             // @<|>
-            if(PhpPatterns.psiElement(PhpDocElementTypes.phpDocTag).accepts(context)) {
+            if(PhpPatterns.psiElement(BasicPhpDocStubElementTypes.phpDocTag).accepts(context)) {
                 return ThreeState.NO;
             }
 
diff --git a/src/main/java/de/espend/idea/php/annotation/pattern/AnnotationPattern.java b/src/main/java/de/espend/idea/php/annotation/pattern/AnnotationPattern.java
@@ -9,6 +9,7 @@
 import com.intellij.util.ProcessingContext;
 import com.jetbrains.php.lang.PhpLanguage;
 import com.jetbrains.php.lang.documentation.phpdoc.lexer.PhpDocTokenTypes;
+import com.jetbrains.php.lang.documentation.phpdoc.parser.BasicPhpDocStubElementTypes;
 import com.jetbrains.php.lang.documentation.phpdoc.parser.PhpDocElementTypes;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocPsiElement;
@@ -75,7 +76,7 @@ public boolean accepts(@NotNull PsiElement psiElement, ProcessingContext process
 
             )
             .inside(PlatformPatterns
-                .psiElement(PhpDocElementTypes.phpDocTag)
+                .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
             )
             .withLanguage(PhpLanguage.INSTANCE);
     }
@@ -103,7 +104,7 @@ public static ElementPattern<PsiElement> getTextIdentifier() {
                 .withParent(PlatformPatterns
                     .psiElement(PhpDocElementTypes.phpDocAttributeList)
                     .withParent(PlatformPatterns
-                        .psiElement(PhpDocElementTypes.phpDocTag)
+                        .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
                     )
                 )
             );
@@ -145,7 +146,7 @@ public static PsiElementPattern.Capture<PsiElement> getDefaultPropertyValue() {
             .withParent(PlatformPatterns.psiElement(StringLiteralExpression.class).withParent(PlatformPatterns
                 .psiElement(PhpDocElementTypes.phpDocAttributeList)
                 .withParent(PlatformPatterns
-                    .psiElement(PhpDocElementTypes.phpDocTag)
+                    .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
                 )
             ))
             .withLanguage(PhpLanguage.INSTANCE);
@@ -163,7 +164,7 @@ public static ElementPattern<StringLiteralExpression> getDefaultPropertyValueStr
              .withParent(PlatformPatterns
                  .psiElement(PhpDocElementTypes.phpDocAttributeList)
                  .withParent(PlatformPatterns
-                     .psiElement(PhpDocElementTypes.phpDocTag)
+                     .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
                  )
              )
              .withLanguage(PhpLanguage.INSTANCE);
@@ -181,7 +182,7 @@ public static ElementPattern<StringLiteralExpression> getPropertyValueString() {
                 .withParent(PlatformPatterns
                         .psiElement(PhpDocElementTypes.phpDocAttributeList)
                         .withParent(PlatformPatterns
-                                .psiElement(PhpDocElementTypes.phpDocTag)
+                                .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
                         )
                 )
                 .withLanguage(PhpLanguage.INSTANCE);

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import com.intellij.psi.PsiWhiteSpace;`
`7`	`7`	`import com.intellij.util.ThreeState;`
`8`	`8`	`import com.jetbrains.php.lang.documentation.phpdoc.lexer.PhpDocTokenTypes;`
	`9`	`+import com.jetbrains.php.lang.documentation.phpdoc.parser.BasicPhpDocStubElementTypes;`
`9`	`10`	`import com.jetbrains.php.lang.documentation.phpdoc.parser.PhpDocElementTypes;`
`10`	`11`	`import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment;`
`11`	`12`	`import com.jetbrains.php.lang.patterns.PhpPatterns;`
`@@ -52,7 +53,7 @@ public ThreeState shouldSkipAutopopup(@NotNull PsiElement contextElement, @NotNu`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`// @<\|>`
`55`		`- if(PhpPatterns.psiElement(PhpDocElementTypes.phpDocTag).accepts(context)) {`
	`56`	`+ if(PhpPatterns.psiElement(BasicPhpDocStubElementTypes.phpDocTag).accepts(context)) {`
`56`	`57`	`return ThreeState.NO;`
`57`	`58`	`}`
`58`	`59`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`import com.intellij.util.ProcessingContext;`
`10`	`10`	`import com.jetbrains.php.lang.PhpLanguage;`
`11`	`11`	`import com.jetbrains.php.lang.documentation.phpdoc.lexer.PhpDocTokenTypes;`
	`12`	`+import com.jetbrains.php.lang.documentation.phpdoc.parser.BasicPhpDocStubElementTypes;`
`12`	`13`	`import com.jetbrains.php.lang.documentation.phpdoc.parser.PhpDocElementTypes;`
`13`	`14`	`import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment;`
`14`	`15`	`import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocPsiElement;`
`@@ -75,7 +76,7 @@ public boolean accepts(@NotNull PsiElement psiElement, ProcessingContext process`
`75`	`76`
`76`	`77`	`)`
`77`	`78`	`.inside(PlatformPatterns`
`78`		`- .psiElement(PhpDocElementTypes.phpDocTag)`
	`79`	`+ .psiElement(BasicPhpDocStubElementTypes.phpDocTag)`
`79`	`80`	`)`
`80`	`81`	`.withLanguage(PhpLanguage.INSTANCE);`
`81`	`82`	`}`
`@@ -103,7 +104,7 @@ public static ElementPattern<PsiElement> getTextIdentifier() {`
`103`	`104`	`.withParent(PlatformPatterns`
`104`	`105`	`.psiElement(PhpDocElementTypes.phpDocAttributeList)`
`105`	`106`	`.withParent(PlatformPatterns`
`106`		`- .psiElement(PhpDocElementTypes.phpDocTag)`
	`107`	`+ .psiElement(BasicPhpDocStubElementTypes.phpDocTag)`
`107`	`108`	`)`
`108`	`109`	`)`
`109`	`110`	`);`
`@@ -145,7 +146,7 @@ public static PsiElementPattern.Capture<PsiElement> getDefaultPropertyValue() {`
`145`	`146`	`.withParent(PlatformPatterns.psiElement(StringLiteralExpression.class).withParent(PlatformPatterns`
`146`	`147`	`.psiElement(PhpDocElementTypes.phpDocAttributeList)`
`147`	`148`	`.withParent(PlatformPatterns`
`148`		`- .psiElement(PhpDocElementTypes.phpDocTag)`
	`149`	`+ .psiElement(BasicPhpDocStubElementTypes.phpDocTag)`
`149`	`150`	`)`
`150`	`151`	`))`
`151`	`152`	`.withLanguage(PhpLanguage.INSTANCE);`
`@@ -163,7 +164,7 @@ public static ElementPattern<StringLiteralExpression> getDefaultPropertyValueStr`
`163`	`164`	`.withParent(PlatformPatterns`
`164`	`165`	`.psiElement(PhpDocElementTypes.phpDocAttributeList)`
`165`	`166`	`.withParent(PlatformPatterns`
`166`		`- .psiElement(PhpDocElementTypes.phpDocTag)`
	`167`	`+ .psiElement(BasicPhpDocStubElementTypes.phpDocTag)`
`167`	`168`	`)`
`168`	`169`	`)`
`169`	`170`	`.withLanguage(PhpLanguage.INSTANCE);`
`@@ -181,7 +182,7 @@ public static ElementPattern<StringLiteralExpression> getPropertyValueString() {`
`181`	`182`	`.withParent(PlatformPatterns`
`182`	`183`	`.psiElement(PhpDocElementTypes.phpDocAttributeList)`
`183`	`184`	`.withParent(PlatformPatterns`
`184`		`- .psiElement(PhpDocElementTypes.phpDocTag)`
	`185`	`+ .psiElement(BasicPhpDocStubElementTypes.phpDocTag)`
`185`	`186`	`)`
`186`	`187`	`)`
`187`	`188`	`.withLanguage(PhpLanguage.INSTANCE);`