MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

add and use PropertyKind

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2018-02-12 14:34:29 +03:00
parent 58faa5208a
commit b080aed673
3 changed files with 77 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/util/PropertyUtil.java
+14 -22
View File
@@ -1,6 +1,7 @@
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.psi.util;
import com.intellij.lang.java.beans.PropertyKind;
import com.intellij.lang.jvm.JvmModifier;
import com.intellij.psi.*;
import com.intellij.psi.impl.JavaSimplePropertyIndexKt;
@@ -96,7 +97,7 @@ public class PropertyUtil extends PropertyUtilBase {
}
else {
@NonNls final String name = method.getName();
if (!name.startsWith("set")) {
if (!name.startsWith(SET_PREFIX)) {
return null;
}
final PsiCodeBlock body = method.getBody();
@@ -187,43 +188,34 @@ public class PropertyUtil extends PropertyUtilBase {
return null;
}
final String methodName = propertyMethod.getName();
final String prefix;
if (methodName.startsWith("get")) {
prefix = "get";
}
else if (methodName.startsWith(IS_PREFIX)) {
prefix = IS_PREFIX;
}
else if (methodName.startsWith("set")) {
prefix = "set";
}
else {
final PropertyKind kind = getPropertyKind(propertyMethod.getName());
if (kind == null) {
return null;
}
final String name = methodName.substring(prefix.length());
final PsiField field = prefix.equals("set") ? getFieldOfSetter(propertyMethod) : getFieldOfGetter(propertyMethod);
final String name = methodName.substring(kind.prefix.length());
final PsiField field = kind == PropertyKind.SETTER ? getFieldOfSetter(propertyMethod) : getFieldOfGetter(propertyMethod);
if (field == null) {
return null;
}
if (prefix.equals("set")) {
final PsiMethod result = findPropertyMethod(aClass, "get", name, field);
if (kind == PropertyKind.SETTER) {
final PsiMethod result = findPropertyMethod(aClass, PropertyKind.GETTER, name, field);
if (result != null) {
return result;
}
return findPropertyMethod(aClass, IS_PREFIX, name, field);
return findPropertyMethod(aClass, PropertyKind.BOOLEAN_GETTER, name, field);
}
else {
return findPropertyMethod(aClass, "set", name, field);
return findPropertyMethod(aClass, PropertyKind.SETTER, name, field);
}
}
private static PsiMethod findPropertyMethod(@NotNull PsiClass aClass,
@NotNull String prefix,
@NotNull PropertyKind kind,
@NotNull String propertyName,
@NotNull PsiField field1) {
final PsiMethod[] methods = aClass.findMethodsByName(prefix + propertyName, true);
final PsiMethod[] methods = aClass.findMethodsByName(kind.prefix + propertyName, true);
for (PsiMethod method : methods) {
final PsiField field2 = prefix.equals("set") ? getFieldOfSetter(method) : getFieldOfGetter(method);
final PsiField field2 = kind == PropertyKind.SETTER ? getFieldOfSetter(method) : getFieldOfGetter(method);
if (field1.equals(field2)) {
return method;
}
java/java-psi-api/src/com/intellij/lang/java/beans/PropertyKind.java
+14
View File
@@ -0,0 +1,14 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.lang.java.beans;
public enum PropertyKind {
GETTER("get"),
BOOLEAN_GETTER("is"),
SETTER("set");
public final String prefix;
PropertyKind(String prefix) {
this.prefix = prefix;
}
}
java/java-psi-api/src/com/intellij/psi/util/PropertyUtilBase.java
+49 -11
View File
@@ -1,10 +1,12 @@
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.psi.util;
import com.intellij.codeInsight.NullableNotNullManager;
import com.intellij.lang.java.beans.PropertyKind;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
@@ -24,8 +26,10 @@ import java.util.*;
public class PropertyUtilBase {
private static final Logger LOG = Logger.getInstance("#com.intellij.psi.util.PropertyUtil");
@NonNls protected static final String GET_PREFIX = PropertyKind.GETTER.prefix;
@NonNls protected static final String IS_PREFIX = PropertyKind.BOOLEAN_GETTER.prefix;
@NotNull protected static final String SET_PREFIX = PropertyKind.SETTER.prefix;
@NonNls protected static final String IS_PREFIX = "is";
@Nullable
public static String getPropertyName(@NonNls @NotNull String methodName) {
return StringUtil.getPropertyName(methodName);
@@ -258,7 +262,7 @@ public class PropertyUtilBase {
@NotNull
public static GetterFlavour getMethodNameGetterFlavour(@NotNull String methodName) {
if (checkPrefix(methodName, "get")) {
if (checkPrefix(methodName, GET_PREFIX)) {
return GetterFlavour.GENERIC;
}
else if (checkPrefix(methodName, IS_PREFIX)) {
@@ -363,7 +367,7 @@ public class PropertyUtilBase {
}
public static boolean isSetterName(@NotNull String methodName) {
return checkPrefix(methodName, "set");
return checkPrefix(methodName, SET_PREFIX);
}
@Nullable
@@ -380,8 +384,8 @@ public class PropertyUtilBase {
@NotNull
public static String getPropertyNameByGetter(PsiMethod getterMethod) {
@NonNls String methodName = getterMethod.getName();
if (methodName.startsWith("get")) return StringUtil.decapitalize(methodName.substring(3));
if (methodName.startsWith("is")) return StringUtil.decapitalize(methodName.substring(2));
if (methodName.startsWith(GET_PREFIX)) return StringUtil.decapitalize(methodName.substring(3));
if (methodName.startsWith(IS_PREFIX)) return StringUtil.decapitalize(methodName.substring(2));
return methodName;
}
@@ -401,7 +405,7 @@ public class PropertyUtilBase {
@NotNull
public static String[] suggestGetterNames(@NotNull String propertyName) {
final String str = StringUtil.capitalizeWithJavaBeanConvention(StringUtil.sanitizeJavaIdentifier(propertyName));
return new String[]{IS_PREFIX + str, "get" + str};
return new String[]{IS_PREFIX + str, GET_PREFIX + str};
}
public static String suggestGetterName(@NonNls @NotNull String propertyName, @Nullable PsiType propertyType) {
@@ -412,15 +416,15 @@ public class PropertyUtilBase {
@NonNls StringBuilder name =
new StringBuilder(StringUtil.capitalizeWithJavaBeanConvention(StringUtil.sanitizeJavaIdentifier(propertyName)));
if (isBoolean(propertyType)) {
if (existingGetterName == null || !existingGetterName.startsWith("get")) {
if (existingGetterName == null || !existingGetterName.startsWith(GET_PREFIX)) {
name.insert(0, IS_PREFIX);
}
else {
name.insert(0, "get");
name.insert(0, GET_PREFIX);
}
}
else {
name.insert(0, "get");
name.insert(0, GET_PREFIX);
}
return name.toString();
@@ -428,7 +432,7 @@ public class PropertyUtilBase {
public static String suggestSetterName(@NonNls @NotNull String propertyName) {
return suggestSetterName(propertyName, "set");
return suggestSetterName(propertyName, SET_PREFIX);
}
public static String suggestSetterName(@NonNls @NotNull String propertyName, String setterPrefix) {
@@ -656,4 +660,38 @@ public class PropertyUtilBase {
return statement instanceof PsiReturnStatement ? ((PsiReturnStatement)statement).getReturnValue() : null;
}
@Contract(pure = true)
@Nullable
public static PropertyKind getPropertyKind(@NotNull String accessorName) {
for (PropertyKind kind : PropertyKind.values()) {
String prefix = kind.prefix;
int prefixLength = prefix.length();
if (accessorName.startsWith(prefix) && accessorName.length() > prefixLength) {
return kind;
}
}
return null;
}
/**
* @see StringUtil#getPropertyName(String)
* @see Introspector
*/
@Contract(pure = true)
@Nullable
public static Pair<String, PropertyKind> getPropertyNameAndKind(@NotNull String accessorName) {
PropertyKind kind = getPropertyKind(accessorName);
if (kind == null) {
return null;
}
String baseName = accessorName.substring(kind.prefix.length());
String propertyName = Introspector.decapitalize(baseName);
return Pair.create(propertyName, kind);
}
@Contract(pure = true)
@NotNull
public static String getAccessorName(@NotNull String propertyName, @NotNull PropertyKind kind) {
return kind.prefix + StringUtil.capitalizeWithJavaBeanConvention(propertyName);
}
}