← Back to branch summary

~ubuntu-branches/debian/sid/eclipse-cdt/sid

« back to all changes in this revision

Viewing changes to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java

  • Committer: Package Import Robot
  • Author(s): Jakub Adam
  • Date: 2013-10-03 20:30:16 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20131003203016-d4ug6l0xgosasumq
Tags: 8.2.1-1
* New upstream release.
* Updated autotools documentation sources.

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
680
680
                                final StringBuilder buffer = new StringBuilder(3);
681
681
                                buffer.append(character);
682
682
                                buffer.append(closingCharacter);
683
 
                                if (closingCharacter == '>' && nextToken != Symbols.TokenEOF
684
 
                                                && document.getChar(offset + length) == '>') {
685
 
                                        // Insert a space to avoid two consecutive closing angular brackets.
686
 
                                        buffer.append(' ');
687
 
                                }
 
683
                                // No longer necessary since consecutive closing angular brackets are allowed in C++11.
 
684
//                              if (closingCharacter == '>' && nextToken != Symbols.TokenEOF
 
685
//                                              && document.getChar(offset + length) == '>') {
 
686
//                                      // Insert a space to avoid two consecutive closing angular brackets.
 
687
//                                      buffer.append(' ');
 
688
//                              }
688
689
 
689
690
                                document.replace(offset, length, buffer.toString());
690
691
 
699
700
                                model.addGroup(group);
700
701
                                model.forceInstall();
701
702
 
702
 
//                              level.fOffset = offset;
703
 
//                              level.fLength = 2;
704
 
 
705
 
                                // set up position tracking for our magic peers
 
703
                                // Set up position tracking for our magic peers
706
704
                                if (fBracketLevelStack.size() == 1) {
707
705
                                        document.addPositionCategory(CATEGORY);
708
706
                                        document.addPositionUpdater(fUpdater);
3578
3576
                };
3579
3577
                SelectionListenerWithASTManager.getDefault().addListener(this, fPostSelectionListenerWithAST);
3580
3578
                if (forceUpdate && getSelectionProvider() != null) {
3581
 
                        fForcedMarkOccurrencesSelection= getSelectionProvider().getSelection();
3582
 
                        ASTProvider.getASTProvider().runOnAST(getInputCElement(), ASTProvider.WAIT_NO, getProgressMonitor(), new ASTRunnable() {
3583
 
                                @Override
3584
 
                                public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException {
3585
 
                                        updateOccurrenceAnnotations((ITextSelection) fForcedMarkOccurrencesSelection, ast);
3586
 
                                        return Status.OK_STATUS;
3587
 
                                }});
 
3579
                        ICElement inputCElement = getInputCElement();
 
3580
                        if (inputCElement instanceof ITranslationUnit) {
 
3581
                                fForcedMarkOccurrencesSelection= getSelectionProvider().getSelection();
 
3582
                                ASTProvider.getASTProvider().runOnAST(inputCElement, ASTProvider.WAIT_NO, getProgressMonitor(), new ASTRunnable() {
 
3583
                                        @Override
 
3584
                                        public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException {
 
3585
                                                updateOccurrenceAnnotations((ITextSelection) fForcedMarkOccurrencesSelection, ast);
 
3586
                                                return Status.OK_STATUS;
 
3587
                                        }
 
3588
                                });
 
3589
                        }
3588
3590
                }
3589
3591
 
3590
3592
                if (fOccurrencesFinderJobCanceler == null) {