diff options
| author | Lars Vogel | 2021-02-05 11:10:08 +0000 |
|---|---|---|
| committer | Lars Vogel | 2021-02-12 07:59:41 +0000 |
| commit | 4f0f856d19868f583a884849ae1f0fe05f87b909 (patch) | |
| tree | cf8c0cc0b60afa5f277b7ade9044e98b9fdadaf6 | |
| parent | 342b7a591064638657b6f7f23b77f1e8f8cf8939 (diff) | |
| download | eclipse.platform.text-4f0f856d19868f583a884849ae1f0fe05f87b909.tar.gz eclipse.platform.text-4f0f856d19868f583a884849ae1f0fe05f87b909.tar.xz eclipse.platform.text-4f0f856d19868f583a884849ae1f0fe05f87b909.zip | |
Bug 570952 - Use new atomic marker creation API in MarkerHighlighter
The new marker API from Bug 570914 allows to create markers with
attributes and therefore avoids sending out resource change events for
every attribute change.
Also updates the required min resource API version as 3.14 defines the
new API.
Change-Id: Ifd6b2bc3e6205d45067f9bc1059dd5b921504e8d
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
| -rw-r--r-- | org.eclipse.search/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.search/META-INF/MANIFEST.MF b/org.eclipse.search/META-INF/MANIFEST.MF index 9c9ad230711..4502d8f90cb 100644 --- a/org.eclipse.search/META-INF/MANIFEST.MF +++ b/org.eclipse.search/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Export-Package: org.eclipse.search.core.text, org.eclipse.search2.internal.ui.text2;x-internal:=true Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", - org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.14.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java index a0995051474..939c9f3b621 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java @@ -70,9 +70,7 @@ public class MarkerHighlighter extends Highlighter { // need to clone position, can't have it twice in a document. position= new Position(position.getOffset(), position.getLength()); } - IMarker marker= match.isFiltered() - ? fFile.createMarker(SearchPlugin.FILTERED_SEARCH_MARKER) - : fFile.createMarker(NewSearchUI.SEARCH_MARKER); + HashMap<String, Integer> attributes= new HashMap<>(4); if (match.getBaseUnit() == Match.UNIT_CHARACTER) { attributes.put(IMarker.CHAR_START, Integer.valueOf(position.getOffset())); @@ -80,7 +78,9 @@ public class MarkerHighlighter extends Highlighter { } else { attributes.put(IMarker.LINE_NUMBER, Integer.valueOf(position.getOffset())); } - marker.setAttributes(attributes); + IMarker marker = match.isFiltered() ? fFile.createMarker(SearchPlugin.FILTERED_SEARCH_MARKER, attributes) + : fFile.createMarker(NewSearchUI.SEARCH_MARKER, attributes); + return marker; } |