diff options
Diffstat (limited to 'plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring')
4 files changed, 5 insertions, 6 deletions
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionUtil.java index 6ba946c6798b..b1856c124e0e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionUtil.java @@ -128,7 +128,7 @@ public class GroovyNameSuggestionUtil { NameValidator validator, boolean forStaticVariable, Project project) { - if (!JavaPsiFacade.getInstance(project).getNameHelper().isIdentifier(value)) return; + if (!PsiNameHelper.getInstance(project).isIdentifier(value)) return; if (forStaticVariable) { StringBuilder buffer = new StringBuilder(value.length() + 10); char[] chars = new char[value.length()]; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUtil.java index 8c8b156eace4..097d90024daf 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUtil.java @@ -17,13 +17,14 @@ package org.jetbrains.plugins.groovy.refactoring.changeSignature; import com.intellij.openapi.project.Project; import com.intellij.psi.JavaPsiFacade; +import com.intellij.psi.PsiNameHelper; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.lang.psi.util.GrStringUtil; public class GrChangeSignatureUtil { @NotNull public static String getNameWithQuotesIfNeeded(@NotNull final String originalName, @NotNull final Project project) { - return JavaPsiFacade.getInstance(project).getNameHelper().isIdentifier(originalName) + return PsiNameHelper.getInstance(project).isIdentifier(originalName) ? originalName : GrStringUtil.getLiteralTextByValue(originalName).toString(); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java index 7658a3e2f211..a6f9673fbe62 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java @@ -354,7 +354,7 @@ public class GrIntroduceConstantDialog extends DialogWrapper return; } final String trimmed = targetClassName.trim(); - if (!JavaPsiFacade.getInstance(myContext.getProject()).getNameHelper().isQualifiedName(trimmed)) { + if (!PsiNameHelper.getInstance(myContext.getProject()).isQualifiedName(trimmed)) { setOKActionEnabled(false); return; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantProcessor.java index d3531eac1720..297f3fa7770a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantProcessor.java @@ -155,13 +155,11 @@ public class GrIntroduceConstantProcessor { return GroovyRefactoringBundle.message("class.language.is.not.groovy"); } - final JavaPsiFacade facade = JavaPsiFacade.getInstance(context.getProject()); - if (fieldName == null || fieldName.isEmpty()) { return RefactoringBundle.message("no.field.name.specified"); } - else if (!facade.getNameHelper().isIdentifier(fieldName)) { + else if (!PsiNameHelper.getInstance(context.getProject()).isIdentifier(fieldName)) { return RefactoringMessageUtil.getIncorrectIdentifierMessage(fieldName); } |