Skip to content

Commit 995fa6e

Browse files
HaehnchenHaehnchen
committed
migrate all type provider to "PhpTypeProvider4" extension
1 parent 901fbb5 commit 995fa6e

File tree

6 files changed

+47
-17
lines changed

6 files changed

+47
-17
lines changed

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/signature/MethodSignatureTypeProvider.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.jetbrains.php.lang.psi.elements.PhpNamedElement;
1111
import com.jetbrains.php.lang.psi.elements.StringLiteralExpression;
1212
import com.jetbrains.php.lang.psi.resolve.types.PhpType;
13-
import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider3;
13+
import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider4;
1414
import fr.adrienbrault.idea.symfony2plugin.Settings;
1515
import fr.adrienbrault.idea.symfony2plugin.extension.MethodSignatureTypeProviderExtension;
1616
import fr.adrienbrault.idea.symfony2plugin.extension.MethodSignatureTypeProviderParameter;
@@ -27,7 +27,7 @@
2727
* @author Adrien Brault <[email protected]>
2828
* @author Daniel Espendiller <[email protected]>
2929
*/
30-
public class MethodSignatureTypeProvider implements PhpTypeProvider3 {
30+
public class MethodSignatureTypeProvider implements PhpTypeProvider4 {
3131

3232
final static char TRIM_KEY = '\u0181';
3333
private static final ExtensionPointName<MethodSignatureTypeProviderExtension> EXTENSIONS = new ExtensionPointName<>("fr.adrienbrault.idea.symfony2plugin.extension.MethodSignatureTypeProviderExtension");
@@ -83,6 +83,12 @@ public PhpType getType(PsiElement e) {
8383
return null;
8484
}
8585

86+
@Nullable
87+
@Override
88+
public PhpType complete(String s, Project project) {
89+
return null;
90+
}
91+
8692
@NotNull
8793
private Collection<MethodSignatureSetting> getSignatureSettings(@NotNull PsiElement psiElement) {
8894
Collection<MethodSignatureSetting> signatures = new ArrayList<>();

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/SymfonyContainerTypeProvider.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.jetbrains.php.lang.psi.elements.MethodReference;
99
import com.jetbrains.php.lang.psi.elements.PhpNamedElement;
1010
import com.jetbrains.php.lang.psi.resolve.types.PhpType;
11-
import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider3;
11+
import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider4;
1212
import fr.adrienbrault.idea.symfony2plugin.Settings;
1313
import fr.adrienbrault.idea.symfony2plugin.dic.container.util.ServiceContainerUtil;
1414
import fr.adrienbrault.idea.symfony2plugin.stubs.ContainerCollectionResolver;
@@ -24,8 +24,8 @@
2424
* @author Adrien Brault <[email protected]>
2525
* @author Daniel Espendiller <[email protected]>
2626
*/
27-
public class SymfonyContainerTypeProvider implements PhpTypeProvider3 {
28-
private static char TRIM_KEY = '\u0182';
27+
public class SymfonyContainerTypeProvider implements PhpTypeProvider4 {
28+
private static final char TRIM_KEY = '\u0182';
2929

3030
@Override
3131
public char getKey() {
@@ -48,6 +48,12 @@ public PhpType getType(PsiElement e) {
4848
return signature == null ? null : new PhpType().add("#" + this.getKey() + signature);
4949
}
5050

51+
@Nullable
52+
@Override
53+
public PhpType complete(String s, Project project) {
54+
return null;
55+
}
56+
5157
@Override
5258
public Collection<? extends PhpNamedElement> getBySignature(String expression, Set<String> visited, int depth, Project project) {
5359

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectManagerFindTypeProvider.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.jetbrains.php.lang.psi.elements.PhpClass;
1010
import com.jetbrains.php.lang.psi.elements.PhpNamedElement;
1111
import com.jetbrains.php.lang.psi.resolve.types.PhpType;
12-
import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider3;
12+
import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider4;
1313
import fr.adrienbrault.idea.symfony2plugin.Settings;
1414
import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
1515
import fr.adrienbrault.idea.symfony2plugin.util.PhpTypeProviderUtil;
@@ -24,7 +24,7 @@
2424
*
2525
* @author Daniel Espendiller <[email protected]>
2626
*/
27-
public class ObjectManagerFindTypeProvider implements PhpTypeProvider3 {
27+
public class ObjectManagerFindTypeProvider implements PhpTypeProvider4 {
2828

2929
final static char TRIM_KEY = '\u0183';
3030

@@ -62,6 +62,12 @@ public PhpType getType(PsiElement e) {
6262
return null;
6363
}
6464

65+
@Nullable
66+
@Override
67+
public PhpType complete(String s, Project project) {
68+
return null;
69+
}
70+
6571
@Override
6672
public Collection<? extends PhpNamedElement> getBySignature(String expression, Set<String> visited, int depth, Project project) {
6773
// get back our original call

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryTypeProvider.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.jetbrains.php.lang.psi.elements.PhpClass;
1010
import com.jetbrains.php.lang.psi.elements.PhpNamedElement;
1111
import com.jetbrains.php.lang.psi.resolve.types.PhpType;
12-
import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider3;
12+
import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider4;
1313
import fr.adrienbrault.idea.symfony2plugin.Settings;
1414
import fr.adrienbrault.idea.symfony2plugin.util.MethodMatcher;
1515
import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
@@ -23,8 +23,8 @@
2323
/**
2424
* @author Daniel Espendiller <[email protected]>
2525
*/
26-
public class ObjectRepositoryTypeProvider implements PhpTypeProvider3 {
27-
private static MethodMatcher.CallToSignature[] GET_REPOSITORIES_SIGNATURES = new MethodMatcher.CallToSignature[] {
26+
public class ObjectRepositoryTypeProvider implements PhpTypeProvider4 {
27+
private static final MethodMatcher.CallToSignature[] GET_REPOSITORIES_SIGNATURES = new MethodMatcher.CallToSignature[] {
2828
new MethodMatcher.CallToSignature("\\Doctrine\\Common\\Persistence\\ManagerRegistry", "getRepository"),
2929
new MethodMatcher.CallToSignature("\\Doctrine\\Common\\Persistence\\ObjectManager", "getRepository"),
3030
new MethodMatcher.CallToSignature("\\Doctrine\\Persistence\\ManagerRegistry", "getRepository"),
@@ -59,6 +59,12 @@ public PhpType getType(PsiElement e) {
5959
return signature == null ? null : new PhpType().add("#" + this.getKey() + signature);
6060
}
6161

62+
@Nullable
63+
@Override
64+
public PhpType complete(String s, Project project) {
65+
return null;
66+
}
67+
6268
@Override
6369
public Collection<? extends PhpNamedElement> getBySignature(String expression, Set<String> visited, int depth, Project project) {
6470
// get back our original call

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/util/EventDispatcherTypeProvider.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.jetbrains.php.PhpIndex;
66
import com.jetbrains.php.lang.psi.elements.*;
77
import com.jetbrains.php.lang.psi.resolve.types.PhpType;
8-
import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider3;
8+
import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider4;
99
import fr.adrienbrault.idea.symfony2plugin.Settings;
1010
import org.apache.commons.lang.StringUtils;
1111
import org.jetbrains.annotations.Nullable;
@@ -17,7 +17,7 @@
1717
/**
1818
* @author Daniel Espendiller <[email protected]>
1919
*/
20-
public class EventDispatcherTypeProvider implements PhpTypeProvider3 {
20+
public class EventDispatcherTypeProvider implements PhpTypeProvider4 {
2121

2222
private static char TRIM_KEY = '\u0197';
2323

@@ -76,6 +76,12 @@ public PhpType getType(PsiElement e) {
7676
return new PhpType().add("#" + this.getKey() + refSignature + TRIM_KEY + signature);
7777
}
7878

79+
@Nullable
80+
@Override
81+
public PhpType complete(String s, Project project) {
82+
return null;
83+
}
84+
7985
@Override
8086
public Collection<? extends PhpNamedElement> getBySignature(String expression, Set<String> visited, int depth, Project project) {
8187
// get back our original call

‎src/main/resources/META-INF/plugin.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@
100100
<idea-version since-build="201.0"/>
101101

102102
<extensions defaultExtensionNs="com.jetbrains.php">
103-
<typeProvider3 implementation="fr.adrienbrault.idea.symfony2plugin.dic.SymfonyContainerTypeProvider"/>
104-
<typeProvider3 implementation="fr.adrienbrault.idea.symfony2plugin.util.EventDispatcherTypeProvider"/>
105-
<typeProvider3 implementation="fr.adrienbrault.idea.symfony2plugin.doctrine.ObjectRepositoryTypeProvider"/>
103+
<typeProvider4 implementation="fr.adrienbrault.idea.symfony2plugin.dic.SymfonyContainerTypeProvider"/>
104+
<typeProvider4 implementation="fr.adrienbrault.idea.symfony2plugin.util.EventDispatcherTypeProvider"/>
105+
<typeProvider4 implementation="fr.adrienbrault.idea.symfony2plugin.doctrine.ObjectRepositoryTypeProvider"/>
106106
<typeProvider4 implementation="fr.adrienbrault.idea.symfony2plugin.doctrine.ObjectRepositoryResultTypeProvider"/>
107-
<typeProvider3 implementation="fr.adrienbrault.idea.symfony2plugin.doctrine.ObjectManagerFindTypeProvider"/>
108-
<typeProvider3 implementation="fr.adrienbrault.idea.symfony2plugin.assistant.signature.MethodSignatureTypeProvider"/>
107+
<typeProvider4 implementation="fr.adrienbrault.idea.symfony2plugin.doctrine.ObjectManagerFindTypeProvider"/>
108+
<typeProvider4 implementation="fr.adrienbrault.idea.symfony2plugin.assistant.signature.MethodSignatureTypeProvider"/>
109109
<libraryRoot id="symfony_meta" path="/symfony-meta/" runtime="false"/>
110110
<libraryRoot id="doctrine_meta" path="/doctrine-meta/" runtime="false"/>
111111
</extensions>

0 commit comments

Comments
 (0)