Skip to content

#324 Incompatibility with PhpStorm 2025.1: Replace BasicPhpDocStubElementTypes => PhpDocStubElementTypes #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Haehnchen merged 1 commit into from
Mar 19, 2025
Merged

#324 Incompatibility with PhpStorm 2025.1: Replace BasicPhpDocStubElementTypes => PhpDocStubElementTypes #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...main/java/de/espend/idea/php/annotation/completion/PhpAnnotationCompletionConfidence.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/de/espend/idea/php/annotation/pattern/AnnotationPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -76,7 +76,7 @@ public boolean accepts(@NotNull PsiElement psiElement, ProcessingContext process

)
.inside(PlatformPatterns
.psiElement(BasicPhpDocStubElementTypes.phpDocTag)
.psiElement(PhpDocStubElementTypes.phpDocTag)
)
.withLanguage(PhpLanguage.INSTANCE);
}
Expand Down Expand Up @@ -104,7 +104,7 @@ public static ElementPattern<PsiElement> getTextIdentifier() {
.withParent(PlatformPatterns
.psiElement(PhpDocElementTypes.phpDocAttributeList)
.withParent(PlatformPatterns
.psiElement(BasicPhpDocStubElementTypes.phpDocTag)
.psiElement(PhpDocStubElementTypes.phpDocTag)
)
)
);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
Loading