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

Fix mark occurrences on outdated offset while editing

Browse source
This commit is contained in:
Anton Leherbauer 2008-03-06 13:55:00 +00:00
parent e10f67a94a
commit 3ddfd62af8
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/MarkOccurrenceTest.java
View file

@ -356,6 +356,7 @@ public class MarkOccurrenceTest extends BaseUITestCase {
} }
assertNotNull(fMatch); assertNotNull(fMatch);
fMatch= new Region(fMatch.getOffset(), fMatch.getLength() - 1);
fEditor.selectAndReveal(fMatch.getOffset(), fMatch.getLength()); fEditor.selectAndReveal(fMatch.getOffset(), fMatch.getLength());
assertOccurrences(2); assertOccurrences(2);

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

@ -3102,10 +3102,12 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
if (document == null) if (document == null)
return; return;
final IRegion wordRegion= CWordFinder.findWord(document, selection.getOffset()); if (getSelectionProvider() instanceof ISelectionValidator) {
if (wordRegion == null) { ISelectionValidator validator= (ISelectionValidator)getSelectionProvider();
if (!validator.isValid(selection)) {
return; return;
} }
}
boolean hasChanged= false; boolean hasChanged= false;
if (document instanceof IDocumentExtension4) { if (document instanceof IDocumentExtension4) {
@ -3117,14 +3119,14 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
if (markOccurrenceTargetRegion.getOffset() <= offset && offset <= markOccurrenceTargetRegion.getOffset() + markOccurrenceTargetRegion.getLength()) if (markOccurrenceTargetRegion.getOffset() <= offset && offset <= markOccurrenceTargetRegion.getOffset() + markOccurrenceTargetRegion.getLength())
return; return;
} }
fMarkOccurrenceTargetRegion= wordRegion; fMarkOccurrenceTargetRegion= CWordFinder.findWord(document, offset);
fMarkOccurrenceModificationStamp= currentModificationStamp; fMarkOccurrenceModificationStamp= currentModificationStamp;
} }
OccurrenceLocation[] locations= null; OccurrenceLocation[] locations= null;
IASTNodeSelector selector= astRoot.getNodeSelector(astRoot.getFilePath()); IASTNodeSelector selector= astRoot.getNodeSelector(astRoot.getFilePath());
IASTName name= selector.findEnclosingName(wordRegion.getOffset(), wordRegion.getLength()); IASTName name= selector.findEnclosingName(selection.getOffset(), selection.getLength());
if (name != null) { if (name != null) {
IBinding binding= name.resolveBinding(); IBinding binding= name.resolveBinding();