8000 drop redundant null check for PhpClass.getPresentableFQN as this is N… · Koc/idea-php-symfony2-plugin@2e4fe20 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2e4fe20

Browse files
HaehnchenHaehnchen
committed
drop redundant null check for PhpClass.getPresentableFQN as this is NotNull in all supported api levels now
1 parent 91b85af commit 2e4fe20

15 files changed

+27
-73
lines changed

‎src/fr/adrienbrault/idea/symfony2plugin/codeInsight/caret/overlay/provider/XmlServiceContainerCaretTextOverlay.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,7 @@ private CaretTextOverlayElement getServiceInstanceOverlay(@NotNull XmlAttributeV
106106
return null;
107107
}
108108

109-
final String service = serviceClass.getPresentableFQN();
110-
if(service == null) {
111-
return null;
112-
}
113-
114-
return new CaretTextOverlayElement(service);
109+
return new CaretTextOverlayElement(serviceClass.getPresentableFQN());
115110
}
116111

117112
private CaretTextOverlayElement getParameterValueOverlay(@NotNull XmlText psiElement, @NotNull CaretTextOverlayArguments args) {

‎src/fr/adrienbrault/idea/symfony2plugin/config/EventDispatcherSubscriberUtil.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ private static void attachSubscriberEventNames(@NotNull Collection<EventDispatch
9595
}
9696

9797
String presentableFQN = phpClass.getPresentableFQN();
98-
if(presentableFQN == null) {
99-
return;
100-
}
10198

10299
Iterable<ArrayHashElement> arrayHashElements = ((ArrayCreationExpression) array).getHashElements();
103100
for(ArrayHashElement arrayHashElement: arrayHashElements) {

‎src/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineUtil.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,7 @@ private static Collection<Pair<String, String>> getClassRepositoryPair(@NotNull
127127
return false;
128128
}
129129

130-
String presentableFQN = ((PhpClass) phpClass).getPresentableFQN();
131-
if (StringUtils.isNotBlank(presentableFQN)) {
132-
pairs.add(Pair.create(presentableFQN, getAnnotationRepositoryClass(phpDocTag)));
133-
}
130+
pairs.add(Pair.create(((PhpClass) phpClass).getPresentableFQN(), getAnnotationRepositoryClass(phpDocTag)));
134131

135132
return false;
136133
}, MODEL_CLASS_ANNOTATION));

‎src/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityHelper.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -381,11 +381,9 @@ public static Collection<DoctrineModelField> getModelFields(@NotNull PhpClass ph
381381

382382
// new code
383383
String presentableFQN = phpClass.getPresentableFQN();
384-
if(presentableFQN != null) {
385-
DoctrineMetadataModel modelFields = DoctrineMetadataUtil.getModelFields(phpClass.getProject(), presentableFQN);
386-
if(modelFields != null) {
387-
return modelFields.getFields();
388-
}
384+
DoctrineMetadataModel fields = DoctrineMetadataUtil.getModelFields(phpClass.getProject(), presentableFQN);
385+
if(fields != null) {
386+
return fields.getFields();
389387
}
390388

391389
// @TODO: old deprecated code

‎src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderMethodReferenceParser.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -247,12 +247,10 @@ private Map<String, String> findRootDefinition(Collection<MethodReference> metho
247247
if(phpClass != null && PhpElementsUtil.isInstanceOf(phpClass, "\\Doctrine\\Common\\Persistence\\ObjectRepository")) {
248248
for(DoctrineModel model: EntityHelper.getModelClasses(project)) {
249249
String className = model.getPhpClass().getPresentableFQN();
250-
if(className != null) {
251-
PhpClass resolvedRepoName = EntityHelper.getEntityRepositoryClass(project, className);
252-
if(PhpElementsUtil.isEqualClassName(resolvedRepoName, phpClass.getPresentableFQN())) {
253-
roots.put(className, rootAlias);
254-
return roots;
255-
}
250+
PhpClass resolvedRepoName = EntityHelper.getEntityRepositoryClass(project, className);
251+
if(PhpElementsUtil.isEqualClassName(resolvedRepoName, phpClass.getPresentableFQN())) {
252+
roots.put(className, rootAlias);
253+
return roots;
256254
}
257255
}
258256
}
@@ -274,7 +272,7 @@ private Map<String, String> findRootDefinition(Collection<MethodReference> metho
274272
parameter = PhpTypeProviderUtil.getResolvedParameter(PhpIndex.getInstance(project), parameter);
275273
if(parameter != null) {
276274
PhpClass phpClass = EntityHelper.resolveShortcutName(project, parameter);
277-
if(phpClass != null && phpClass.getPresentableFQN() != null) {
275+
if(phpClass != null) {
278276
roots.put(phpClass.getPresentableFQN(), rootAlias);
279277
return roots;
280278
}

‎src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/detector/FormQueryBuilderRepositoryDetector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public String getRepository(@NotNull QueryBuilderRepositoryDetectorParameter par
5050

5151
// finally we found our class key
5252
PhpClass phpClass = EntityHelper.resolveShortcutName(parameter.getProject(), aClass);
53-
if(phpClass != null && phpClass.getPresentableFQN() != null) {
53+
if(phpClass != null) {
5454
return phpClass.getPresentableFQN();
5555
}
5656

‎src/fr/adrienbrault/idea/symfony2plugin/form/FormGotoCompletionRegistrar.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,6 @@ private FormOptionsGotoCompletionProvider getFormProvider(StringLiteralExpressio
273273
}
274274

275275
String presentableFQN = phpClass.getPresentableFQN();
276-
if(presentableFQN == null) {
277-
presentableFQN = "form";
278-
}
279-
280276
return new FormOptionsGotoCompletionProvider(psiElement, presentableFQN, FormOption.EXTENSION, FormOption.DEFAULT_OPTIONS);
281277
}
282278
}

‎src/fr/adrienbrault/idea/symfony2plugin/form/util/FormOptionsUtil.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,7 @@ public static Map<String, String> getFormDefaultKeys(@NotNull Project project, @
202202

203203
getFormDefaultKeys(project, formTypeName, new HashMap<>(), new FormUtil.FormTypeCollector(project).collect(), 0, (psiElement, option, formClass, optionEnum) -> {
204204
String presentableFQN = formClass.getPhpClass().getPresentableFQN();
205-
if(presentableFQN != null) {
206-
items.put(option, presentableFQN);
207-
}
205+
items.put(option, presentableFQN);
208206
});
209207

210208
return items;
@@ -341,7 +339,7 @@ private static void getDefaultOptions(@NotNull Project project, @NotNull PhpClas
341339
public static LookupElement getOptionLookupElement(FormOption formOption) {
342340

343341
String typeText = formOption.getFormClass().getPhpClass().getPresentableFQN();
344-
if(typeText != null && typeText.lastIndexOf("\\") != -1) {
342+
if(typeText.lastIndexOf("\\") != -1) {
345343
typeText = typeText.substring(typeText.lastIndexOf("\\") + 1);
346344
if(typeText.endsWith("Extension")) {
347345
typeText = typeText.substring(0, typeText.length() - 9);

‎src/fr/adrienbrault/idea/symfony2plugin/form/visitor/FormOptionLookupVisitor.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ public FormOptionLookupVisitor(Collection<LookupElement> lookupElements) {
2525
public void visit(@NotNull PsiElement psiElement, @NotNull String option, @NotNull FormClass formClass, @NotNull FormOptionEnum optionEnum) {
2626

2727
String typeText = formClass.getPhpClass().getPresentableFQN();
28-
if(typeText != null) {
29-
if(typeText.lastIndexOf("\\") != -1) {
30-
typeText = typeText.substring(typeText.lastIndexOf("\\") + 1);
31-
}
32-
33-
if(typeText.endsWith("Type")) {
34-
typeText = typeText.substring(0, typeText.length() - 4);
35-
}
28+
if(typeText.lastIndexOf("\\") != -1) {
29+
typeText = typeText.substring(typeText.lastIndexOf("\\") + 1);
30+
}
31+
32+
if(typeText.endsWith("Type")) {
33+
typeText = typeText.substring(0, typeText.length() - 4);
3634
}
3735

3836
lookupElements.add(LookupElementBuilder.create(option)

‎src/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ public static PsiElement[] findServiceDefinitions(@Nullable PhpClass phpClass) {
117117
}
118118

119119
String phpClassName = phpClass.getPresentableFQN();
120-
if(phpClassName == null) {
121-
return new PsiElement[0];
122-
}
123-
124120
Set<String> serviceNames = ContainerCollectionResolver.ServiceCollector.create(phpClass.getProject()).convertClassNameToServices(phpClassName);
125121

126122
if(serviceNames.size() == 0) {
@@ -142,10 +138,6 @@ public static ClassServiceDefinitionTargetLazyValue findServiceDefinitionsLazy(@
142138
}
143139

144140
String phpClassName = phpClass.getPresentableFQN();
145-
if(phpClassName == null) {
146-
return null;
147-
}
148-
149141
Set<String> serviceNames = ContainerCollectionResolver.ServiceCollector.create(phpClass.getProject()).convertClassNameToServices(phpClassName);
150142
if(serviceNames.size() == 0) {
151143
return null;

‎src/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ public void addCompletions(@NotNull CompletionParameters parameters,
391391

392392
if(parts.length >= 1) {
393393
PhpClass phpClass = PhpElementsUtil.getClassInterface(position.getProject(), parts[0]);
394-
if(phpClass != null && phpClass.getPresentableFQN() != null) {
394+
if(phpClass != null) {
395395
for(Field field: phpClass.getFields()) {
396396
if(field.isConstant()) {
397397
resultSet.addElement(LookupElementBuilder.create(phpClass.getPresentableFQN() + "::" + field.getName()).withIcon(PhpIcons.CONSTANT));

‎src/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigExtensionParser.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -471,10 +471,7 @@ private void visitNewExpression(NewExpression element) {
471471
if(parameters[0] instanceof Variable && "this".equals(((Variable) parameters[0]).getName())) {
472472
String methodName = PhpElementsUtil.getStringValue(parameters[1]);
473473
if(methodName != null) {
474-
String presentableFQN = containingClass.getPresentableFQN();
475-
if(presentableFQN != null) {
476-
signature = String.format("#M#C\\%s.%s", presentableFQN, methodName);
477-
}
474+
signature = String.format("#M#C\\%s.%s", containingClass.getPresentableFQN(), methodName);
478475
}
479476

480477
}
@@ -568,10 +565,7 @@ private void visitNewExpression(NewExpression element) {
568565
if(parameters[0] instanceof Variable && "this".equals(((Variable) parameters[0]).getName())) {
569566
String methodName = PhpElementsUtil.getStringValue(parameters[1]);
570567
if(methodName != null) {
571-
String presentableFQN = containingClass.getPresentableFQN();
572-
if(presentableFQN != null) {
573-
signature = String.format("#M#C\\%s.%s", presentableFQN, methodName);
574-
}
568+
signature = String.format("#M#C\\%s.%s", containingClass.getPresentableFQN(), methodName);
575569
}
576570

577571
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,9 @@ public static Collection<? extends PhpNamedElement> getTwigPhpNameTargets(PhpNam
441441

442442
public static String getTypeDisplayName(Project project, Set<String> types) {
443443

444-
for(PhpClass phpClass: PhpElementsUtil.getClassFromPhpTypeSet(project, types)) {
445-
if(phpClass.getPresentableFQN() != null) {
446-
return phpClass.getPresentableFQN();
447-
}
444+
Collection<PhpClass> classFromPhpTypeSet = PhpElementsUtil.getClassFromPhpTypeSet(project, types);
445+
if(classFromPhpTypeSet.size() > 0) {
446+
return classFromPhpTypeSet.iterator().next().getPresentableFQN();
448447
}
449448

450449
PhpType phpType = new PhpType();

‎src/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -578,10 +578,6 @@ static public PsiElement getArrayKeyValueInsideSignaturePsi(PsiElement psiElemen
578578
}
579579

580580
String className = phpClass.getPresentableFQN();
581-
if(className == null) {
582-
return null;
583-
}
584-
585581
for (String s : callTo) {
586582
// @TODO: replace signature
587583
PsiElement arrayKeyValueInsideSignature = PhpElementsUtil.getArrayKeyValueInsideSignaturePsi(psiElementInsideClass.getProject(), "#M#C\\" + className + "." + s, methodName, keyName);
@@ -976,7 +972,7 @@ public static void visitNamespaceClassForCompletion(PsiElement psiElement, int c
976972
// search classes in current namespace and child namespaces
977973
for(PhpClass phpClass: PhpIndexUtil.getPhpClassInsideNamespace(psiElement.getProject(), namespace)) {
978974
String presentableFQN = phpClass.getPresentableFQN();
979-
if(presentableFQN != null && fr.adrienbrault.idea.symfony2plugin.util.StringUtils.startWithEqualClassname(presentableFQN, beforeCursor)) {
975+
if(fr.adrienbrault.idea.symfony2plugin.util.StringUtils.startWithEqualClassname(presentableFQN, beforeCursor)) {
980976
visitor.visit(phpClass, presentableFQN, prefix);
981977
}
982978

@@ -1091,10 +1087,6 @@ public static boolean isTestClass(@NotNull PhpClass phpClass) {
10911087
}
10921088

10931089
String fqn = phpClass.getPresentableFQN();
1094-
if(fqn == null) {
1095-
return false;
1096-
}
1097-
10981090
return fqn.contains("\\Test\\") || fqn.contains("\\Tests\\");
10991091
}
11001092

‎src/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ public static Collection<PhpClass> getTaggedClassesWithCompiled(Project project,
325325
Collection<PhpClass> taggedClasses = new ArrayList<>();
326326
for(PhpClass phpClass: getTaggedClasses(project, tagName)) {
327327
String presentableFQN = phpClass.getPresentableFQN();
328-
if(presentableFQN != null && !uniqueClass.contains(presentableFQN)) {
328+
if(!uniqueClass.contains(presentableFQN)) {
329329
uniqueClass.add(presentableFQN);
330330
taggedClasses.add(phpClass);
331331
}

0 commit comments

Comments
 (0)
0