Do not suggest invalid names while introducing variable

Author: zolotov

src/com/goide/refactor/GoRefactoringUtil.java

@@ -167,7 +167,7 @@ private static LinkedHashSet<String> getSuggestedNames(GoExpression expression,
         String name = StringUtil.decapitalize(callReference.getIdentifier().getText());
         for (String candidate : NameUtil.getSuggestionsByName(name, "", "", false, false, false)) {
           if (usedNames.contains(candidate)) continue;
-          if (namesValidator != null && namesValidator.isKeyword(candidate, null)) continue;
+          if (!isValidName(namesValidator, candidate)) continue;
           names.add(candidate);
         }
       }
@@ -179,7 +179,7 @@ private static LinkedHashSet<String> getSuggestedNames(GoExpression expression,
       boolean array = GoTypeUtil.isIterable(type) && !GoTypeUtil.isString(type);
       for (String candidate : NameUtil.getSuggestionsByName(typeText, "", "", false, false, array)) {
         if (usedNames.contains(candidate) || typeText.equals(candidate)) continue;
-        if (namesValidator != null && namesValidator.isKeyword(candidate, null)) continue;
+        if (!isValidName(namesValidator, candidate)) continue;
         names.add(candidate);
       }
     }
@@ -190,6 +190,10 @@ private static LinkedHashSet<String> getSuggestedNames(GoExpression expression,
     return names;
   }
 
+  private static boolean isValidName(NamesValidator namesValidator, String candidate) {
+    return namesValidator != null && !namesValidator.isKeyword(candidate, null) && namesValidator.isIdentifier(candidate, null);
+  }
+
   @NotNull
   private static LinkedHashSet<String> getNamesInContext(PsiElement context) {
     if (context == null) return ContainerUtil.newLinkedHashSet();