Fix syntax highlighting and code navigation for recursive type vars

[eric-milles]

Consider the following:

interface I<Self extends I<Self, K, V>, K, V> {
  V getAt(K key)
}
class C<T> {
  static <X> C<X> m(C<? extends C<? extends X>> c_of_c_of_x) {
  }
}

Highlighting and navigation is not available for occurrences of a type within its own type vars.

[eric-milles]