cdt/cdt_6_0_x/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CIndenter.java
equal
deleted
inserted
replaced
831 } else if (prevToken == Symbols.TokenCOLON && !fPrefs.prefIndentBracesForBlocks) { |
831 } else if (prevToken == Symbols.TokenCOLON && !fPrefs.prefIndentBracesForBlocks) { |
832 extraIndent= -1; |
832 extraIndent= -1; |
833 } else if ((prevToken == Symbols.TokenEQUAL || prevToken == Symbols.TokenRBRACKET) && |
833 } else if ((prevToken == Symbols.TokenEQUAL || prevToken == Symbols.TokenRBRACKET) && |
834 !fPrefs.prefIndentBracesForArrays) { |
834 !fPrefs.prefIndentBracesForArrays) { |
835 cancelIndent= true; |
835 cancelIndent= true; |
836 } else if (prevToken == Symbols.TokenRPAREN && fPrefs.prefIndentBracesForMethods) { |
836 } else if ((prevToken == Symbols.TokenRPAREN || prevToken == Symbols.TokenCONST) && fPrefs.prefIndentBracesForMethods) { |
837 extraIndent= 1; |
837 extraIndent= 1; |
838 } else if (prevToken == Symbols.TokenIDENT && fPrefs.prefIndentBracesForTypes) { |
838 } else if (prevToken == Symbols.TokenIDENT && fPrefs.prefIndentBracesForTypes) { |
839 extraIndent= 1; |
839 extraIndent= 1; |
840 } |
840 } |
841 break; |
841 break; |
1033 return fPosition; |
1033 return fPosition; |
1034 |
1034 |
1035 case Symbols.TokenTRY: |
1035 case Symbols.TokenTRY: |
1036 return skipToStatementStart(danglingElse, false); |
1036 return skipToStatementStart(danglingElse, false); |
1037 |
1037 |
|
1038 case Symbols.TokenCONST: |
|
1039 nextToken(); |
|
1040 if (fToken != Symbols.TokenRPAREN) { |
|
1041 return skipToPreviousListItemOrListStart(); |
|
1042 } |
|
1043 // could be const method decl |
|
1044 //$FALL-THROUGH$ |
1038 case Symbols.TokenRPAREN: |
1045 case Symbols.TokenRPAREN: |
1039 if (skipScope(Symbols.TokenLPAREN, Symbols.TokenRPAREN)) { |
1046 if (skipScope(Symbols.TokenLPAREN, Symbols.TokenRPAREN)) { |
1040 int scope= fPosition; |
1047 int scope= fPosition; |
1041 nextToken(); |
1048 nextToken(); |
1042 if (fToken == Symbols.TokenIF || fToken == Symbols.TokenWHILE || fToken == Symbols.TokenFOR) { |
1049 if (fToken == Symbols.TokenIF || fToken == Symbols.TokenWHILE || fToken == Symbols.TokenFOR) { |