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

java name suggestions should work for java

Browse Source
This commit is contained in:
Anna Kozlova
2014-03-24 11:07:10 +01:00
parent ce4031e3ed
commit c15f69bb86
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java
+4
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.refactoring.rename;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
@@ -23,6 +24,7 @@ import com.intellij.psi.codeStyle.SuggestedNameInfo;
import com.intellij.psi.codeStyle.VariableKind;
import com.intellij.psi.util.PropertyUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.usageView.UsageViewUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
@@ -33,6 +35,7 @@ import java.util.*;
public class JavaNameSuggestionProvider implements NameSuggestionProvider {
@Nullable
public SuggestedNameInfo getSuggestedNames(final PsiElement element, final PsiElement nameSuggestionContext, Set<String> result) {
if (!PsiUtilCore.findLanguageFromElement(element).isKindOf(JavaLanguage.INSTANCE)) return null;
String initialName = UsageViewUtil.getShortName(element);
SuggestedNameInfo info = suggestNamesForElement(element, nameSuggestionContext);
if (info != null) {
@@ -95,6 +98,7 @@ public class JavaNameSuggestionProvider implements NameSuggestionProvider {
@Nullable
private static String[] suggestProperlyCasedName(PsiElement psiElement) {
if (!(psiElement instanceof PsiNamedElement)) return null;
if (psiElement instanceof PsiFile) return null;
String name = ((PsiNamedElement)psiElement).getName();
if (name == null) return null;
String prefix = "";