Merge pull request #326 from Haehnchen/feature/324

Haehnchen · web-flow · commit 9d23a15526a6 · 2025-03-19T16:55:35.000+01:00
#324 Incompatibility with PhpStorm 2025.1: Replace BasicPhpDocStubElementTypes => PhpDocStubElementTypes
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,8 +6,8 @@
 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.parser.PhpDocStubElementTypes;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment;
 import com.jetbrains.php.lang.patterns.PhpPatterns;
 import com.jetbrains.php.lang.psi.PhpFile;
@@ -53,7 +53,7 @@ public ThreeState shouldSkipAutopopup(@NotNull PsiElement contextElement, @NotNu
             }
 
             // @<|>
-            if(PhpPatterns.psiElement(BasicPhpDocStubElementTypes.phpDocTag).accepts(context)) {
+            if(PhpPatterns.psiElement(PhpDocStubElementTypes.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,8 +9,8 @@
 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.parser.PhpDocStubElementTypes;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment;
 import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocPsiElement;
 import com.jetbrains.php.lang.lexer.PhpTokenTypes;
@@ -76,7 +76,7 @@ public boolean accepts(@NotNull PsiElement psiElement, ProcessingContext process
 
             )
             .inside(PlatformPatterns
-                .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
+                .psiElement(PhpDocStubElementTypes.phpDocTag)
             )
             .withLanguage(PhpLanguage.INSTANCE);
     }
@@ -104,7 +104,7 @@ public static ElementPattern<PsiElement> getTextIdentifier() {
                 .withParent(PlatformPatterns
                     .psiElement(PhpDocElementTypes.phpDocAttributeList)
                     .withParent(PlatformPatterns
-                        .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
+                        .psiElement(PhpDocStubElementTypes.phpDocTag)
                     )
                 )
             );
@@ -146,7 +146,7 @@ public static PsiElementPattern.Capture<PsiElement> getDefaultPropertyValue() {
             .withParent(PlatformPatterns.psiElement(StringLiteralExpression.class).withParent(PlatformPatterns
                 .psiElement(PhpDocElementTypes.phpDocAttributeList)
                 .withParent(PlatformPatterns
-                    .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
+                    .psiElement(PhpDocStubElementTypes.phpDocTag)
                 )
             ))
             .withLanguage(PhpLanguage.INSTANCE);
@@ -164,7 +164,7 @@ public static ElementPattern<StringLiteralExpression> getDefaultPropertyValueStr
              .withParent(PlatformPatterns
                  .psiElement(PhpDocElementTypes.phpDocAttributeList)
                  .withParent(PlatformPatterns
-                     .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
+                     .psiElement(PhpDocStubElementTypes.phpDocTag)
                  )
              )
              .withLanguage(PhpLanguage.INSTANCE);
@@ -182,7 +182,7 @@ public static ElementPattern<StringLiteralExpression> getPropertyValueString() {
                 .withParent(PlatformPatterns
                         .psiElement(PhpDocElementTypes.phpDocAttributeList)
                         .withParent(PlatformPatterns
-                                .psiElement(BasicPhpDocStubElementTypes.phpDocTag)
+                                .psiElement(PhpDocStubElementTypes.phpDocTag)
                         )
                 )
                 .withLanguage(PhpLanguage.INSTANCE);

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@`
`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;`
`13`	`12`	`import com.jetbrains.php.lang.documentation.phpdoc.parser.PhpDocElementTypes;`
	`13`	`+import com.jetbrains.php.lang.documentation.phpdoc.parser.PhpDocStubElementTypes;`
`14`	`14`	`import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment;`
`15`	`15`	`import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocPsiElement;`
`16`	`16`	`import com.jetbrains.php.lang.lexer.PhpTokenTypes;`
`@@ -76,7 +76,7 @@ public boolean accepts(@NotNull PsiElement psiElement, ProcessingContext process`
`76`	`76`
`77`	`77`	`)`
`78`	`78`	`.inside(PlatformPatterns`
`79`		`- .psiElement(BasicPhpDocStubElementTypes.phpDocTag)`
	`79`	`+ .psiElement(PhpDocStubElementTypes.phpDocTag)`
`80`	`80`	`)`
`81`	`81`	`.withLanguage(PhpLanguage.INSTANCE);`
`82`	`82`	`}`
`@@ -104,7 +104,7 @@ public static ElementPattern<PsiElement> getTextIdentifier() {`
`104`	`104`	`.withParent(PlatformPatterns`
`105`	`105`	`.psiElement(PhpDocElementTypes.phpDocAttributeList)`
`106`	`106`	`.withParent(PlatformPatterns`
`107`		`- .psiElement(BasicPhpDocStubElementTypes.phpDocTag)`
	`107`	`+ .psiElement(PhpDocStubElementTypes.phpDocTag)`
`108`	`108`	`)`
`109`	`109`	`)`
`110`	`110`	`);`
`@@ -146,7 +146,7 @@ public static PsiElementPattern.Capture<PsiElement> getDefaultPropertyValue() {`
`146`	`146`	`.withParent(PlatformPatterns.psiElement(StringLiteralExpression.class).withParent(PlatformPatterns`
`147`	`147`	`.psiElement(PhpDocElementTypes.phpDocAttributeList)`
`148`	`148`	`.withParent(PlatformPatterns`
`149`		`- .psiElement(BasicPhpDocStubElementTypes.phpDocTag)`
	`149`	`+ .psiElement(PhpDocStubElementTypes.phpDocTag)`
`150`	`150`	`)`
`151`	`151`	`))`
`152`	`152`	`.withLanguage(PhpLanguage.INSTANCE);`
`@@ -164,7 +164,7 @@ public static ElementPattern<StringLiteralExpression> getDefaultPropertyValueStr`
`164`	`164`	`.withParent(PlatformPatterns`
`165`	`165`	`.psiElement(PhpDocElementTypes.phpDocAttributeList)`
`166`	`166`	`.withParent(PlatformPatterns`
`167`		`- .psiElement(BasicPhpDocStubElementTypes.phpDocTag)`
	`167`	`+ .psiElement(PhpDocStubElementTypes.phpDocTag)`
`168`	`168`	`)`
`169`	`169`	`)`
`170`	`170`	`.withLanguage(PhpLanguage.INSTANCE);`
`@@ -182,7 +182,7 @@ public static ElementPattern<StringLiteralExpression> getPropertyValueString() {`
`182`	`182`	`.withParent(PlatformPatterns`
`183`	`183`	`.psiElement(PhpDocElementTypes.phpDocAttributeList)`
`184`	`184`	`.withParent(PlatformPatterns`
`185`		`- .psiElement(BasicPhpDocStubElementTypes.phpDocTag)`
	`185`	`+ .psiElement(PhpDocStubElementTypes.phpDocTag)`
`186`	`186`	`)`
`187`	`187`	`)`
`188`	`188`	`.withLanguage(PhpLanguage.INSTANCE);`