@@ -62,7 +62,7 @@ public final class JavaBracesMatcher implements BracesMatcher, BracesMatcherFact
6262 new JavaTokenId []{JavaTokenId .RBRACE },
6363 new JavaTokenId []{JavaTokenId .LT },
6464 new JavaTokenId []{JavaTokenId .GT , JavaTokenId .GTGT , JavaTokenId .GTGTGT }};
65- private static final JavaTokenId [] LTGT_TOKENS = {JavaTokenId .LT , JavaTokenId .GT , JavaTokenId .GTGT , JavaTokenId .GTGTGT };
65+ private static final JavaTokenId [] GENERIC_CANDIDATE_TOKEN_IDS = {JavaTokenId .LT , JavaTokenId .GT , JavaTokenId .GTGT , JavaTokenId .GTGTGT };
6666
6767 private final MatcherContext context ;
6868
@@ -152,9 +152,9 @@ public int[] findMatches() throws InterruptedException, BadLocationException {
152152 boolean seqMoved = seq .moveNext ();
153153 if (seqMoved ) {
154154 Token <?> token = seq .token ();
155- if (containsToken (token .id (), LTGT_TOKENS )) {
155+ if (containsToken (token .id (), GENERIC_CANDIDATE_TOKEN_IDS )) {
156156 // test if token is part of java generic.
157- boolean valid = checkLTGT (context .getDocument (), originOffset );
157+ boolean valid = isPartOfGeneric (context .getDocument (), originOffset );
158158 if (!valid ) {
159159 return new int []{-1 , -1 };
160160 }
@@ -287,7 +287,7 @@ public int[] findMatches() throws InterruptedException, BadLocationException {
287287 for (TokenSequenceIterator tsi = new TokenSequenceIterator (list , backward ); tsi .hasMore (); ) {
288288 TokenSequence <?> sq = tsi .getSequence ();
289289 if (containsToken (sq .token ().id (), originId )) {
290- if (containsToken (sq .token ().id (), LTGT_TOKENS )) {
290+ if (containsToken (sq .token ().id (), GENERIC_CANDIDATE_TOKEN_IDS )) {
291291 if (sq .token ().id ().equals (JavaTokenId .GTGT )) {
292292 counter += 2 ;
293293 } else if (sq .token ().id ().equals (JavaTokenId .GTGTGT )) {
@@ -299,7 +299,7 @@ public int[] findMatches() throws InterruptedException, BadLocationException {
299299 counter ++;
300300 }
301301 } else if (containsToken (sq .token ().id (), lookingForId )) {
302- if (containsToken (sq .token ().id (), LTGT_TOKENS )) {
302+ if (containsToken (sq .token ().id (), GENERIC_CANDIDATE_TOKEN_IDS )) {
303303 boolean multipledGT = false ;
304304 if (counter == 0 ) {
305305 matchStart = sq .offset ();
@@ -346,7 +346,7 @@ public int[] findMatches() throws InterruptedException, BadLocationException {
346346 * @param srcOffset
347347 * @return true if token is java generic.
348348 */
349- private boolean checkLTGT (Document doc , final int srcOffset ) {
349+ private boolean isPartOfGeneric (Document doc , final int srcOffset ) {
350350 JavaSource javaSource = JavaSource .forDocument (doc );
351351 if (javaSource == null ) {
352352 return false ;
0 commit comments