Tweak new signature logic that checks context of dollar

- modify Signature.appendClassTypeSignature() logic for the
  last segment to use the old logic as it appears there is other
  code that is not prepared for the dollar being part of the class
  name and expects the dollar being converted to dot

Author: jjohnstn

org.eclipse.jdt.core/model/org/eclipse/jdt/core/Signature.java

@@ -667,24 +667,39 @@ private static int appendClassTypeSignature(char[] string, int start, boolean fu
 				}
 				break;
 			 case C_DOLLAR :
-			 	innerTypeStart = buffer.length();
-			 	inAnonymousType = false;
-			 	if (resolved) {
-			 		if (prevC == C_DOT || nextC == C_DOT) {
-			 			buffer.append('$');
-			 		} else {
-			 			// once we hit "$" there are no more package prefixes
-			 			removePackageQualifiers = false;
-			 			/**
-			 			 * Convert '$' in resolved type signatures into '.'.
-			 			 * NOTE: This assumes that the type signature is an inner type
-			 			 * signature. This is true in most cases, but someone can define a
-			 			 * non-inner type name containing a '$'.
-			 			 */
-			 			buffer.append('.');
-			 		}
-			 	}
-			 	break;
+				 if (nextC == C_DOT) {
+					 buffer.append('$');
+				 } else {
+					 boolean foundDotAfterDollar = false;
+					 if (prevC == C_DOT) {
+						 int i = p + 1;
+						 // check to see if we have dollar as part of package or class
+						 while (i < string.length) {
+							 if (string[i++] == C_DOT) {
+								 foundDotAfterDollar = true;
+								 break;
+							 }
+						 }
+					 }
+					 if (foundDotAfterDollar) {
+						 buffer.append('$');
+						 break;
+					 }
+					 innerTypeStart = buffer.length();
+					 inAnonymousType = false;
+					 if (resolved) {
+						 // once we hit "$" there are no more package prefixes
+						 removePackageQualifiers = false;
+						 /**
+						  * Convert '$' in resolved type signatures into '.'.
+						  * NOTE: This assumes that the type signature is an inner type
+						  * signature. This is true in most cases, but someone can define a
+						  * non-inner type name containing a '$'.
+						  */
+						 buffer.append('.');
+					 }
+				 }
+				 break;
 			 default :
 				if (innerTypeStart != -1 && !inAnonymousType && Character.isDigit(c)) {
 					inAnonymousType = true;