PSI-class prefixes aren't getting added consistently #123

Author: gregsh

support/org/intellij/grammar/generator/ParserGenerator.java

@@ -123,7 +123,7 @@ public ParserGenerator(BnfFile tree, String sourcePath, String outputPath) {
     String tmpVisitorClass = getRootAttribute(myFile, KnownAttribute.PSI_VISITOR_NAME);
     visitorClassName = !G.generateVisitor || StringUtil.isEmpty(tmpVisitorClass) ? null :
                        !tmpVisitorClass.equals(myPsiClassFormat.strip(tmpVisitorClass)) ? tmpVisitorClass :
-                       myPsiClassFormat.enforce("") + tmpVisitorClass;
+                       myPsiClassFormat.apply("") + tmpVisitorClass;
     mySimpleTokens = ContainerUtil.newLinkedHashMap(RuleGraphHelper.getTokenMap(myFile));
     myUnknownRootAttributes = collectUnknownAttributes(myFile);
     myGraphHelper = RuleGraphHelper.getCached(myFile);

support/org/intellij/grammar/generator/ParserGeneratorUtil.java

@@ -269,7 +269,7 @@ public static String toIdentifier(@NotNull String text, @Nullable NameFormat for
       if (cas == Case.CAMEL && i < len - 1 && !strings[i+1].startsWith("_") && Case.UPPER.apply(s).equals(s)) sb.append(s);
       else sb.append(cas.apply(s));
     }
-    return format == null ? sb.toString() : format.enforce(sb.toString());
+    return format == null ? sb.toString() : format.apply(sb.toString());
   }
 
   public static String getPsiPackage(BnfFile file) {
@@ -797,9 +797,9 @@ private NameFormat(@Nullable String format) {
       suffix = StringUtil.join(parts.skip(1), "");
     }
 
-    public String enforce(String s) {
-      if (prefix != null && !s.startsWith(prefix)) s = prefix + s;
-      if (suffix != null && !s.endsWith(suffix)) s += suffix;
+    public String apply(String s) {
+      if (prefix != null) s = prefix + s;
+      if (suffix != null) s += suffix;
       return s;
     }
 

tests/org/intellij/grammar/BnfUtilTest.java

@@ -29,6 +29,12 @@ public class BnfUtilTest extends UsefulTestCase {
   public void testIdentifiers() {
     assertEquals("AbcEdf", toIdentifier("abc-edf", Case.CAMEL));
     assertEquals("SampleAbcEdfElement", toIdentifier("abc-edf", "Sample/Element", Case.CAMEL));
+
+    // w/ a single-letter psiClass-prefix coincidentally matching the 1st letter of name being transformed
+    assertEquals("CContinueStatementElement", toIdentifier("continue-statement", "C/Element", Case.CAMEL));
+    // w/ a psiClass-suffix that matches the rule name suffix but has a different meaning & context and should be preserved
+    assertEquals("HtmlBodyElementElement", toIdentifier("body-element", "Html/Element", Case.CAMEL));
+
     assertEquals("getAbcEdf", getGetterName("abc-edf"));
     assertEquals("getMySomething", getGetterName("MY_SOMETHING"));
     assertEquals("getWithSpace", getGetterName("with space"));