mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

bug 299421: Double-click causes jumping to a different marker on the same line

Browse source
This commit is contained in:
Andrew Gvozdev 2010-01-13 17:36:35 +00:00
parent fb574618b5
commit 8b83105af2
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
View file

@ -154,6 +154,7 @@ import org.eclipse.ui.texteditor.IEditorStatusLine;
import org.eclipse.ui.texteditor.ITextEditorActionConstants; import org.eclipse.ui.texteditor.ITextEditorActionConstants;
import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
import org.eclipse.ui.texteditor.IUpdate; import org.eclipse.ui.texteditor.IUpdate;
import org.eclipse.ui.texteditor.MarkerAnnotation;
import org.eclipse.ui.texteditor.MarkerUtilities; import org.eclipse.ui.texteditor.MarkerUtilities;
import org.eclipse.ui.texteditor.SourceViewerDecorationSupport; import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
import org.eclipse.ui.texteditor.TextNavigationAction; import org.eclipse.ui.texteditor.TextNavigationAction;
@ -227,6 +228,7 @@ import org.eclipse.cdt.internal.ui.viewsupport.SelectionListenerWithASTManager;
*/ */
public class CEditor extends TextEditor implements ISelectionChangedListener, ICReconcilingListener { public class CEditor extends TextEditor implements ISelectionChangedListener, ICReconcilingListener {
private IMarker fSyncProblemsViewMarker = null;
/** /**
* A slightly modified implementation of IGotomarker compared to AbstractDecoratedTextEditor. * A slightly modified implementation of IGotomarker compared to AbstractDecoratedTextEditor.
* *
@ -243,6 +245,8 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
if (getSourceViewer() == null) if (getSourceViewer() == null)
return; return;
fSyncProblemsViewMarker = marker;
int start= MarkerUtilities.getCharStart(marker); int start= MarkerUtilities.getCharStart(marker);
int end= MarkerUtilities.getCharEnd(marker); int end= MarkerUtilities.getCharEnd(marker);
@ -292,8 +296,10 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
} }
int length= document.getLength(); int length= document.getLength();
if (end - 1 < length && start < length) if (end - 1 < length && start < length) {
fIsUpdatingMarkerViews= true;
selectAndReveal(start, end - start); selectAndReveal(start, end - start);
}
} }
} }
@ -2504,7 +2510,8 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
protected void updateStatusLine() { protected void updateStatusLine() {
ITextSelection selection = (ITextSelection) getSelectionProvider().getSelection(); ITextSelection selection = (ITextSelection) getSelectionProvider().getSelection();
Annotation annotation = getAnnotation(selection.getOffset(), selection.getLength()); Annotation annotation = getAnnotation(selection.getOffset(), selection.getLength(), fSyncProblemsViewMarker);
fSyncProblemsViewMarker = null;
setStatusLineErrorMessage(null); setStatusLineErrorMessage(null);
setStatusLineMessage(null); setStatusLineMessage(null);
if (annotation != null) { if (annotation != null) {
@ -2519,10 +2526,10 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
* *
* @param offset the region offset * @param offset the region offset
* @param length the region length * @param length the region length
* @param marker associated marker or <code>null</code> of not available
* @return the found annotation or <code>null</code> * @return the found annotation or <code>null</code>
* @since 3.0
*/ */
private Annotation getAnnotation(int offset, int length) { private Annotation getAnnotation(int offset, int length, IMarker marker) {
IAnnotationModel model= getDocumentProvider().getAnnotationModel(getEditorInput()); IAnnotationModel model= getDocumentProvider().getAnnotationModel(getEditorInput());
if (model == null) if (model == null)
return null; return null;
@ -2537,17 +2544,29 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Iterator<Annotation> e= new CAnnotationIterator(parent, false); Iterator<Annotation> e= new CAnnotationIterator(parent, false);
Annotation annotation = null;
while (e.hasNext()) { while (e.hasNext()) {
Annotation a = e.next(); Annotation a = e.next();
if (!isNavigationTarget(a)) if (!isNavigationTarget(a))
continue; continue;
Position p = model.getPosition(a); Position p = model.getPosition(a);
if (p != null && p.overlapsWith(offset, length)) if (p != null && p.overlapsWith(offset, length)) {
return a; if (annotation==null) {
annotation = a;
if (marker==null)
break;
}
if (a instanceof MarkerAnnotation) {
if (((MarkerAnnotation)a).getMarker().equals(marker)) {
annotation = a;
break;
}
}
}
} }
return null; return annotation;
} }
/* /*