From 7b56bdb9bee9116a3c9789ac9427ca5001e65a18 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Mon, 12 Sep 2011 13:55:01 +0200
Subject: [PATCH] rename: warn about invalid identifier (IDEA-74132 )

---
 .../refactoring/rename/PsiPackageRenameValidator.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/rename/PsiPackageRenameValidator.java b/java/java-impl/src/com/intellij/refactoring/rename/PsiPackageRenameValidator.java
index 77829419211c..2a25f057e82f 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/PsiPackageRenameValidator.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/PsiPackageRenameValidator.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.patterns.ElementPattern;
 import com.intellij.patterns.PlatformPatterns;
+import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiPackage;
 import com.intellij.psi.impl.file.PsiDirectoryFactory;
@@ -36,8 +37,13 @@ public class PsiPackageRenameValidator implements RenameInputValidatorEx {
     if (FileTypeManager.getInstance().isFileIgnored(newName)) {
       return "Trying to create a package with ignored name, result will not be visible";
     }
-    if (newName.length() > 0 && !PsiDirectoryFactory.getInstance(project).isValidPackageName(newName)) {
-      return "Not a valid package name";
+    if (newName.length() > 0) {
+      if (!PsiDirectoryFactory.getInstance(project).isValidPackageName(newName)) {
+        return "Not a valid package name";
+      }
+      if (!JavaPsiFacade.getInstance(project).getNameHelper().isIdentifier(newName)) {
+        return "Not a valid identifier name";
+      }
     }
     return null;
   }