Merge pull request #70 from openjavaformat/single-letter-type-name

Treat a single upper case letter as a type name in a dotted chain

Author: abashev

open-java-format/src/main/java/com/palantir/javaformat/java/TypeNameClassifier.java

@@ -164,7 +164,8 @@ static JavaCaseFormat from(String name) {
                 hasLowercase |= Character.isLowerCase(c);
             }
             if (firstUppercase) {
-                return hasLowercase ? UPPER_CAMEL : UPPERCASE;
+                // A single upper case letter is a type name: Android's R, and generic type parameters such as T.
+                return (hasLowercase || name.length() == 1) ? UPPER_CAMEL : UPPERCASE;
             } else {
                 return hasUppercase ? LOWER_CAMEL : LOWERCASE;
             }

open-java-format/src/test/java/com/palantir/javaformat/java/TypeNameClassifierTest.java

@@ -41,6 +41,7 @@ public void caseFormat() throws Exception {
         assertThat(JavaCaseFormat.from("a_$")).isEqualTo(JavaCaseFormat.LOWERCASE);
         assertThat(JavaCaseFormat.from("_")).isEqualTo(JavaCaseFormat.LOWERCASE);
         assertThat(JavaCaseFormat.from("_A")).isEqualTo(JavaCaseFormat.UPPERCASE);
+        assertThat(JavaCaseFormat.from("A")).isEqualTo(JavaCaseFormat.UPPER_CAMEL);
     }
 
     private static Optional<Integer> getPrefix(String qualifiedName) {
@@ -60,6 +61,7 @@ public void typePrefixLength() {
         assertThat(getPrefix("ClassName.CONST")).hasValue(1);
         assertThat(getPrefix("ClassName.varName")).hasValue(1);
         assertThat(getPrefix("ClassName.Inner.varName")).hasValue(2);
+        assertThat(getPrefix("com.R.foo")).hasValue(2);
     }
 
     @Test

open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/b26306390.input

@@ -0,0 +1,3 @@
+class B26306390 {
+  int resourceId = com.some.extremely.verbose.pkg.name.R.string.some_extremely_long_resource_identifier_that_exceeds_the_column_limit;
+}

open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/b26306390.output

@@ -0,0 +1,4 @@
+class B26306390 {
+    int resourceId = com.some.extremely.verbose.pkg.name.R.string
+            .some_extremely_long_resource_identifier_that_exceeds_the_column_limit;
+}