MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Remove methods for adding highlighters with both attributes and attributesKey. Migrate platform and feature usages to use either attributes or attributesKey

Browse Source 
GitOrigin-RevId: fba6df6b5a9c8de805a8137fc4dbd031cf2e080b
This commit is contained in:
Alexander.Kirsanov
2020-05-19 16:09:37 +00:00
committed by intellij-monorepo-bot
parent 1f58ce5101
commit 9e845508b1
55 changed files with 252 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/JavaTextBlockIndentPass.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class JavaTextBlockIndentPass extends TextEditorHighlightingPass {
}
else {
RangeHighlighter newHighlighter =
model.addRangeHighlighter(indent.startOffset, indent.endOffset, 0, null, null, HighlighterTargetArea.EXACT_RANGE);
model.addRangeHighlighter(null, indent.startOffset, indent.endOffset, 0, HighlighterTargetArea.EXACT_RANGE);
newHighlighter.setCustomRenderer(RENDERER);
StringContentIndentUtil.setIndent(newHighlighter, newIndent);
newHighlighters.add(newHighlighter);
java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
+1 -2
View File
@@ -265,8 +265,7 @@ public class IntroduceParameterHandler extends IntroduceHandlerBase {
if (nameIdentifier != null) {
final TextRange textRange = nameIdentifier.getTextRange();
final RangeHighlighter rangeHighlighter = markupModel.addRangeHighlighter(
textRange.getStartOffset(), textRange.getEndOffset(), HighlighterLayer.SELECTION - 1,
null, attributesKey,
attributesKey, textRange.getStartOffset(), textRange.getEndOffset(), HighlighterLayer.SELECTION - 1,
HighlighterTargetArea.EXACT_RANGE);
highlighters.add(rangeHighlighter);
}
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java
+1 -1
View File
@@ -418,7 +418,7 @@ public class UpdateHighlightersUtil {
};
if (highlighter == null) {
highlighter = markup.addRangeHighlighterAndChangeAttributes(infoStartOffset, infoEndOffset, layer, null, null,
highlighter = markup.addRangeHighlighterAndChangeAttributes(null, infoStartOffset, infoEndOffset, layer,
HighlighterTargetArea.EXACT_RANGE, false, changeAttributes);
if (HighlightInfoType.VISIBLE_IF_FOLDED.contains(info.type)) {
highlighter.setVisibleIfFolded(true);
platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedEditorRangeHighlighter.java
+2 -2
View File
@@ -89,8 +89,8 @@ class UnifiedEditorRangeHighlighter {
if (!delegate.isValid()) continue;
model.addRangeHighlighterAndChangeAttributes(
piece.getStart(), piece.getEnd(), delegate.getLayer(), delegate.getForcedTextAttributes(),
delegate.getTextAttributesKey(), delegate.getTargetArea(), false, ex -> {
delegate.getTextAttributesKey(), piece.getStart(), piece.getEnd(), delegate.getLayer(),
delegate.getTargetArea(), false, ex -> {
ex.copyFrom(delegate);
});
}
platform/diff-impl/src/com/intellij/diff/util/DiffDrawUtil.java
+2 -2
View File
@@ -451,7 +451,7 @@ public class DiffDrawUtil {
@NotNull BooleanGetter condition,
@Nullable Computable<String> description) {
RangeHighlighter marker = editor.getMarkupModel()
.addRangeHighlighter(offset1, offset2, LINE_MARKER_LAYER, null, null, HighlighterTargetArea.LINES_IN_RANGE);
.addRangeHighlighter(null, offset1, offset2, LINE_MARKER_LAYER, HighlighterTargetArea.LINES_IN_RANGE);
DiffLineSeparatorRenderer renderer = new DiffLineSeparatorRenderer(editor, condition, description);
marker.setLineSeparatorPlacement(SeparatorPlacement.TOP);
@@ -641,7 +641,7 @@ public class DiffDrawUtil {
offset = DocumentUtil.getFirstNonSpaceCharOffset(editor.getDocument(), line);
highlighter = editor.getMarkupModel()
.addRangeHighlighter(offset, offset, LINE_MARKER_LAYER, null, null, HighlighterTargetArea.LINES_IN_RANGE);
.addRangeHighlighter(null, offset, offset, LINE_MARKER_LAYER, HighlighterTargetArea.LINES_IN_RANGE);
}
@NotNull
platform/diff-impl/src/com/intellij/diff/util/DiffGutterOperation.java
+1 -2
View File
@@ -15,9 +15,8 @@ public abstract class DiffGutterOperation {
@NotNull private final RangeHighlighter myHighlighter;
public DiffGutterOperation(@NotNull Editor editor, int offset) {
myHighlighter = editor.getMarkupModel().addRangeHighlighter(offset, offset,
myHighlighter = editor.getMarkupModel().addRangeHighlighter(null, offset, offset,
HighlighterLayer.ADDITIONAL_SYNTAX,
null, null,
HighlighterTargetArea.LINES_IN_RANGE);
}
platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusMarkerRenderer.java
+2 -2
View File
@@ -58,8 +58,8 @@ public abstract class LineStatusMarkerRenderer {
Document document = myTracker.getDocument();
MarkupModel markupModel = DocumentMarkupModel.forDocument(document, myTracker.getProject(), true);
myHighlighter = markupModel.addRangeHighlighter(0, document.getTextLength(), DiffDrawUtil.LST_LINE_MARKER_LAYER,
null, null, HighlighterTargetArea.LINES_IN_RANGE);
myHighlighter = markupModel.addRangeHighlighter(null, 0, document.getTextLength(), DiffDrawUtil.LST_LINE_MARKER_LAYER,
HighlighterTargetArea.LINES_IN_RANGE);
myHighlighter.setGreedyToLeft(true);
myHighlighter.setGreedyToRight(true);
platform/editor-ui-api/src/com/intellij/openapi/editor/markup/MarkupModel.java
+10 -24
View File
@@ -29,26 +29,22 @@ public interface MarkupModel extends UserDataHolder {
* {@link com.intellij.openapi.editor.RangeMarker} instances and use the same rules for tracking
* the range after document changes.
*
* @param textAttributesKey the key to use for highlighting with the current color scheme,
* or {@code null} if it doesn't modify the text attributes.
* @param startOffset the start offset of the range to highlight.
* @param endOffset the end offset of the range to highlight.
* @param layer relative priority of the highlighter (highlighters with higher
* layer number override highlighters with lower layer number;
* layer number values for standard IDE highlighters are defined in
* {@link HighlighterLayer})
* @param forcedTextAttributes forced attributes to use for highlighting,
* or {@code null} if the textAttributeKey should be used,
* or it doesn't modify the text attributes.
* @param textAttributesKey the key to use for highlighting with the current color scheme,
* or {@code null} if it doesn't modify the text attributes.
* @param targetArea type of highlighting (specific range or all full lines covered by the range).
* @return the highlighter instance.
*/
@NotNull
RangeHighlighter addRangeHighlighter(int startOffset,
RangeHighlighter addRangeHighlighter(@Nullable TextAttributesKey textAttributesKey,
int startOffset,
int endOffset,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey,
@NotNull HighlighterTargetArea targetArea);
/**
@@ -56,43 +52,33 @@ public interface MarkupModel extends UserDataHolder {
*/
@Deprecated
@NotNull
default RangeHighlighter addRangeHighlighter(int startOffset,
RangeHighlighter addRangeHighlighter(int startOffset,
int endOffset,
int layer,
@Nullable TextAttributes textAttributes,
@NotNull HighlighterTargetArea targetArea) {
return addRangeHighlighter(startOffset, endOffset, layer, textAttributes, null, targetArea);
}
@NotNull HighlighterTargetArea targetArea);
/**
* Adds a highlighter covering the specified line in the document.
*
* @param textAttributesKey the key to use for highlighting with the current color scheme,
* or {@code null} if it doesn't modify the text attributes.
* @param line the line number of the line to highlight.
* @param layer relative priority of the highlighter (highlighters with higher
* layer number override highlighters with lower layer number;
* layer number values for standard IDE highlighters are defined in
* {@link HighlighterLayer})
* @param forcedTextAttributes forced attributes to use for highlighting,
* or {@code null} if the textAttributeKey should be used,
* or it doesn't modify the text attributes.
* @param textAttributesKey the key to use for highlighting with the current color scheme,
* or {@code null} if it doesn't modify the text attributes.
* @return the highlighter instance.
*/
@NotNull
RangeHighlighter addLineHighlighter(int line,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey);
RangeHighlighter addLineHighlighter(@Nullable TextAttributesKey textAttributesKey, int line, int layer);
/**
* @deprecated Use the overload with TextAttributeKey
*/
@Deprecated
@NotNull
default RangeHighlighter addLineHighlighter(int line, int layer, @Nullable TextAttributes textAttributes) {
return addLineHighlighter(line, layer, textAttributes, null);
}
RangeHighlighter addLineHighlighter(int line, int layer, @Nullable TextAttributes textAttributes);
/**
* Removes the specified highlighter instance.
platform/editor-ui-api/src/com/intellij/openapi/editor/markup/RangeHighlighter.java
+2 -2
View File
@@ -14,8 +14,8 @@ import java.awt.*;
* Represents a range of text in the document which has specific markup (special text attributes,
* line marker, gutter icon, error stripe marker or line separator).
*
* @see MarkupModel#addRangeHighlighter(int, int, int, TextAttributes, TextAttributesKey, HighlighterTargetArea)
* @see MarkupModel#addLineHighlighter(int, int, TextAttributes, TextAttributesKey)
* @see MarkupModel#addRangeHighlighter(TextAttributesKey, int, int, int, HighlighterTargetArea)
* @see MarkupModel#addLineHighlighter(TextAttributesKey, int, int)
* @see com.intellij.lang.annotation.Annotation
*/
public interface RangeHighlighter extends RangeMarker {
platform/editor-ui-ex/src/com/intellij/injected/editor/MarkupModelWindow.java
+14 -19
View File
@@ -54,30 +54,27 @@ public class MarkupModelWindow extends UserDataHolderBase implements MarkupModel
@Override
@NotNull
public RangeHighlighter addRangeHighlighter(final int startOffset,
public RangeHighlighter addRangeHighlighter(final @Nullable TextAttributesKey textAttributesKey,
final int startOffset,
final int endOffset,
final int layer,
final @Nullable TextAttributes forcedTextAttributes,
final @Nullable TextAttributesKey textAttributesKey,
@NotNull final HighlighterTargetArea targetArea) {
TextRange hostRange = myDocument.injectedToHost(new ProperTextRange(startOffset, endOffset));
return myHostModel.addRangeHighlighter(
hostRange.getStartOffset(), hostRange.getEndOffset(), layer, forcedTextAttributes, textAttributesKey, targetArea);
textAttributesKey, hostRange.getStartOffset(), hostRange.getEndOffset(), layer, targetArea);
}
@NotNull
@Override
public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(int startOffset,
public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(@Nullable TextAttributesKey textAttributesKey,
int startOffset,
int endOffset,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey,
@NotNull HighlighterTargetArea targetArea,
boolean isPersistent,
Consumer<? super RangeHighlighterEx> changeAttributesAction) {
TextRange hostRange = myDocument.injectedToHost(new ProperTextRange(startOffset, endOffset));
return myHostModel.addRangeHighlighterAndChangeAttributes(hostRange.getStartOffset(), hostRange.getEndOffset(), layer,
forcedTextAttributes, textAttributesKey,
return myHostModel.addRangeHighlighterAndChangeAttributes(textAttributesKey, hostRange.getStartOffset(), hostRange.getEndOffset(), layer,
targetArea, isPersistent, changeAttributesAction);
}
@@ -89,12 +86,11 @@ public class MarkupModelWindow extends UserDataHolderBase implements MarkupModel
@Override
@NotNull
public RangeHighlighter addLineHighlighter(final int line,
final int layer,
final @Nullable TextAttributes forcedTextAttributes,
final @Nullable TextAttributesKey textAttributesKey) {
public RangeHighlighter addLineHighlighter(final @Nullable TextAttributesKey textAttributesKey,
final int line,
final int layer) {
int hostLine = myDocument.injectedToHostLine(line);
return myHostModel.addLineHighlighter(hostLine, layer, forcedTextAttributes, textAttributesKey);
return myHostModel.addLineHighlighter(textAttributesKey, hostLine, layer);
}
@Override
@@ -118,12 +114,11 @@ public class MarkupModelWindow extends UserDataHolderBase implements MarkupModel
}
@Override
public RangeHighlighterEx addPersistentLineHighlighter(final int line,
final int layer,
final @Nullable TextAttributes forcedTextAttributes,
final @Nullable TextAttributesKey textAttributesKey) {
public RangeHighlighterEx addPersistentLineHighlighter(final @Nullable TextAttributesKey textAttributesKey,
final int line,
final int layer) {
int hostLine = myDocument.injectedToHostLine(line);
return myHostModel.addPersistentLineHighlighter(hostLine, layer, forcedTextAttributes, textAttributesKey);
return myHostModel.addPersistentLineHighlighter(textAttributesKey, hostLine, layer);
}
platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/MarkupModelEx.java
+40 -10
View File
@@ -18,10 +18,7 @@ public interface MarkupModelEx extends MarkupModel {
@Nullable
RangeHighlighterEx addPersistentLineHighlighter(int lineNumber,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey);
RangeHighlighterEx addPersistentLineHighlighter(@Nullable TextAttributesKey textAttributesKey, int lineNumber, int layer);
/**
* @deprecated Use the overload with TextAttributeKey
@@ -29,7 +26,11 @@ public interface MarkupModelEx extends MarkupModel {
@Deprecated
@Nullable
default RangeHighlighterEx addPersistentLineHighlighter(int lineNumber, int layer, @Nullable TextAttributes textAttributes) {
return addPersistentLineHighlighter(lineNumber, layer, textAttributes, null);
RangeHighlighterEx highlighter = addPersistentLineHighlighter(null, lineNumber, layer);
if (textAttributes != null && highlighter != null) {
highlighter.setTextAttributes(textAttributes);
}
return highlighter;
}
void fireAttributesChanged(@NotNull RangeHighlighterEx segmentHighlighter, boolean renderersChanged, boolean fontStyleChanged);
@@ -65,11 +66,10 @@ public interface MarkupModelEx extends MarkupModel {
// optimization: creates highlighter and fires only one event: highlighterCreated
@NotNull
RangeHighlighterEx addRangeHighlighterAndChangeAttributes(int startOffset,
RangeHighlighterEx addRangeHighlighterAndChangeAttributes(@Nullable TextAttributesKey textAttributesKey,
int startOffset,
int endOffset,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey,
@NotNull HighlighterTargetArea targetArea,
boolean isPersistent,
Consumer<? super RangeHighlighterEx> changeAttributesAction);
@@ -86,10 +86,40 @@ public interface MarkupModelEx extends MarkupModel {
@NotNull HighlighterTargetArea targetArea,
boolean isPersistent,
Consumer<? super RangeHighlighterEx> changeAttributesAction) {
return addRangeHighlighterAndChangeAttributes(startOffset, endOffset, layer, textAttributes, null, targetArea, isPersistent,
changeAttributesAction);
return addRangeHighlighterAndChangeAttributes(null, startOffset, endOffset, layer, targetArea, isPersistent, ex -> {
if (textAttributes != null) {
ex.setTextAttributes(textAttributes);
}
changeAttributesAction.consume(ex);
});
}
// runs change attributes action and fires highlighterChanged event if there were changes
void changeAttributesInBatch(@NotNull RangeHighlighterEx highlighter, @NotNull Consumer<? super RangeHighlighterEx> changeAttributesAction);
@Override
@Deprecated
@NotNull
default RangeHighlighter addRangeHighlighter(int startOffset,
int endOffset,
int layer,
@Nullable TextAttributes textAttributes,
@NotNull HighlighterTargetArea targetArea) {
RangeHighlighterEx highlighter = (RangeHighlighterEx)addRangeHighlighter(null, startOffset, endOffset, layer, targetArea);
if (textAttributes != null) {
highlighter.setTextAttributes(textAttributes);
}
return highlighter;
}
@Override
@Deprecated
@NotNull
default RangeHighlighter addLineHighlighter(int line, int layer, @Nullable TextAttributes textAttributes) {
RangeHighlighterEx highlighter = (RangeHighlighterEx)addLineHighlighter(null, line, layer);
if (textAttributes != null) {
highlighter.setTextAttributes(textAttributes);
}
return highlighter;
}
}
platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/EmptyMarkupModel.java
+6 -14
View File
@@ -51,22 +51,20 @@ public class EmptyMarkupModel implements MarkupModelEx {
@Override
@NotNull
public RangeHighlighter addRangeHighlighter(int startOffset,
public RangeHighlighter addRangeHighlighter(@Nullable TextAttributesKey textAttributesKey,
int startOffset,
int endOffset,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey,
@NotNull HighlighterTargetArea targetArea) {
throw new ProcessCanceledException();
}
@NotNull
@Override
public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(int startOffset,
public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(@Nullable TextAttributesKey textAttributesKey,
int startOffset,
int endOffset,
int layer,
TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey,
@NotNull HighlighterTargetArea targetArea,
boolean isPersistent,
Consumer<? super RangeHighlighterEx> changeAttributesAction) {
@@ -80,10 +78,7 @@ public class EmptyMarkupModel implements MarkupModelEx {
@Override
@NotNull
public RangeHighlighter addLineHighlighter(int line,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey) {
public RangeHighlighter addLineHighlighter(@Nullable TextAttributesKey textAttributesKey, int line, int layer) {
throw new ProcessCanceledException();
}
@@ -114,10 +109,7 @@ public class EmptyMarkupModel implements MarkupModelEx {
}
@Override
public RangeHighlighterEx addPersistentLineHighlighter(int lineNumber,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey) {
public RangeHighlighterEx addPersistentLineHighlighter(@Nullable TextAttributesKey textAttributesKey, int lineNumber, int layer) {
return null;
}
platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java
+11 -19
View File
@@ -62,24 +62,18 @@ public class MarkupModelImpl extends UserDataHolderBase implements MarkupModelEx
@Override
@NotNull
public RangeHighlighter addLineHighlighter(int lineNumber,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey) {
public RangeHighlighter addLineHighlighter(@Nullable TextAttributesKey textAttributesKey, int lineNumber, int layer) {
if (isNotValidLine(lineNumber)) {
throw new IndexOutOfBoundsException("lineNumber:" + lineNumber + ". Must be in [0, " + (getDocument().getLineCount() - 1) + "]");
}
int offset = DocumentUtil.getFirstNonSpaceCharOffset(getDocument(), lineNumber);
return addRangeHighlighter(offset, offset, layer, forcedTextAttributes, textAttributesKey, HighlighterTargetArea.LINES_IN_RANGE);
return addRangeHighlighter(textAttributesKey, offset, offset, layer, HighlighterTargetArea.LINES_IN_RANGE);
}
@Override
@Nullable
public RangeHighlighterEx addPersistentLineHighlighter(int lineNumber,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey) {
public RangeHighlighterEx addPersistentLineHighlighter(@Nullable TextAttributesKey textAttributesKey, int lineNumber, int layer) {
if (isNotValidLine(lineNumber)) {
return null;
}
@@ -87,7 +81,7 @@ public class MarkupModelImpl extends UserDataHolderBase implements MarkupModelEx
int offset = DocumentUtil.getFirstNonSpaceCharOffset(getDocument(), lineNumber);
return addRangeHighlighter(
PersistentRangeHighlighterImpl.create(
this, offset, layer, HighlighterTargetArea.LINES_IN_RANGE, forcedTextAttributes, textAttributesKey, false),
this, offset, layer, HighlighterTargetArea.LINES_IN_RANGE, textAttributesKey, false),
null);
}
@@ -113,18 +107,17 @@ public class MarkupModelImpl extends UserDataHolderBase implements MarkupModelEx
@NotNull
@Override
public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(int startOffset,
public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(@Nullable TextAttributesKey textAttributesKey,
int startOffset,
int endOffset,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey,
@NotNull HighlighterTargetArea targetArea,
boolean isPersistent,
@Nullable Consumer<? super RangeHighlighterEx> changeAttributesAction) {
return addRangeHighlighter(isPersistent
? PersistentRangeHighlighterImpl.create(this, startOffset, layer, targetArea, forcedTextAttributes,
? PersistentRangeHighlighterImpl.create(this, startOffset, layer, targetArea,
textAttributesKey, true)
: new RangeHighlighterImpl(this, startOffset, endOffset, layer, targetArea, forcedTextAttributes, textAttributesKey, false,
: new RangeHighlighterImpl(this, startOffset, endOffset, layer, targetArea, textAttributesKey, false,
false), changeAttributesAction);
}
@@ -169,13 +162,12 @@ public class MarkupModelImpl extends UserDataHolderBase implements MarkupModelEx
@Override
@NotNull
public RangeHighlighter addRangeHighlighter(int startOffset,
public RangeHighlighter addRangeHighlighter(@Nullable TextAttributesKey textAttributesKey,
int startOffset,
int endOffset,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey,
@NotNull HighlighterTargetArea targetArea) {
return addRangeHighlighterAndChangeAttributes(startOffset, endOffset, layer, forcedTextAttributes, textAttributesKey, targetArea, false,
return addRangeHighlighterAndChangeAttributes(textAttributesKey, startOffset, endOffset, layer, targetArea, false,
null);
}
platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/PersistentRangeHighlighterImpl.java
+2 -5
View File
@@ -20,7 +20,6 @@ import com.intellij.openapi.editor.event.DocumentEvent;
import com.intellij.openapi.editor.ex.DocumentEx;
import com.intellij.openapi.editor.impl.event.DocumentEventImpl;
import com.intellij.openapi.editor.markup.HighlighterTargetArea;
import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.util.DocumentUtil;
import com.intellij.util.diff.FilesTooBigForDiffException;
import org.jetbrains.annotations.NotNull;
@@ -36,12 +35,11 @@ class PersistentRangeHighlighterImpl extends RangeHighlighterImpl {
int offset,
int layer,
@NotNull HighlighterTargetArea target,
@Nullable TextAttributes textAttributes,
@Nullable TextAttributesKey textAttributesKey,
boolean normalizeStartOffset) {
int line = model.getDocument().getLineNumber(offset);
int startOffset = normalizeStartOffset ? model.getDocument().getLineStartOffset(line) : offset;
return new PersistentRangeHighlighterImpl(model, startOffset, line, layer, target, textAttributes, textAttributesKey);
return new PersistentRangeHighlighterImpl(model, startOffset, line, layer, target, textAttributesKey);
}
private PersistentRangeHighlighterImpl(@NotNull MarkupModelImpl model,
@@ -49,9 +47,8 @@ class PersistentRangeHighlighterImpl extends RangeHighlighterImpl {
int line,
int layer,
@NotNull HighlighterTargetArea target,
@Nullable TextAttributes textAttributes,
@Nullable TextAttributesKey textAttributesKey) {
super(model, startOffset, model.getDocument().getLineEndOffset(line), layer, target, textAttributes, textAttributesKey, false, false);
super(model, startOffset, model.getDocument().getLineEndOffset(line), layer, target, textAttributesKey, false, false);
myLine = line;
}
platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java
-2
View File
@@ -67,12 +67,10 @@ class RangeHighlighterImpl extends RangeMarkerImpl implements RangeHighlighterEx
int end,
int layer,
@NotNull HighlighterTargetArea target,
@Nullable TextAttributes textAttributes,
@Nullable TextAttributesKey textAttributesKey,
boolean greedyToLeft,
boolean greedyToRight) {
super((DocumentEx)model.getDocument(), start, end, false, false);
myForcedTextAttributes = textAttributes;
myTextAttributesKey = textAttributesKey;
setFlag(TARGET_AREA_IS_EXACT_MASK, target == HighlighterTargetArea.EXACT_RANGE);
myModel = model;
platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java
+1 -1
View File
@@ -552,7 +552,7 @@ public abstract class CodeStyleAbstractPanel implements Disposable, ComponentHig
TextAttributes attributesToUse = range.getLength() > 0 ? backgroundAttributes : borderAttributes;
markupModel.addRangeHighlighter(
range.getStartOffset(), range.getEndOffset(), HighlighterLayer.SELECTION, attributesToUse, null, HighlighterTargetArea.EXACT_RANGE
range.getStartOffset(), range.getEndOffset(), HighlighterLayer.SELECTION, attributesToUse, HighlighterTargetArea.EXACT_RANGE
);
}
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IndentsPass.java
+2 -2
View File
@@ -344,8 +344,8 @@ public class IndentsPass extends TextEditorHighlightingPass implements DumbAware
@NotNull
private static RangeHighlighter createHighlighter(MarkupModel mm, TextRange range) {
final RangeHighlighter highlighter = mm.addRangeHighlighter(range.getStartOffset(), range.getEndOffset(), 0,
null, null, HighlighterTargetArea.EXACT_RANGE);
final RangeHighlighter highlighter = mm.addRangeHighlighter(null, range.getStartOffset(), range.getEndOffset(), 0,
HighlighterTargetArea.EXACT_RANGE);
highlighter.setCustomRenderer(RENDERER);
return highlighter;
}
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersUtil.java
+2 -2
View File
@@ -94,8 +94,8 @@ class LineMarkersUtil {
if (highlighter == null) {
newHighlighter = true;
highlighter = markupModel.addRangeHighlighterAndChangeAttributes(
info.startOffset, info.endOffset,
HighlighterLayer.ADDITIONAL_SYNTAX, null, null, HighlighterTargetArea.LINES_IN_RANGE, false,
null, info.startOffset, info.endOffset,
HighlighterLayer.ADDITIONAL_SYNTAX, HighlighterTargetArea.LINES_IN_RANGE, false,
markerEx -> {
markerEx.setGutterIconRenderer(newRenderer);
markerEx.setLineSeparatorColor(info.separatorColor);
platform/lang-impl/src/com/intellij/codeInsight/documentation/render/DocRenderItem.java
+1 -2
View File
@@ -224,8 +224,7 @@ public class DocRenderItem {
this.editor = editor;
this.textToRender = textToRender;
highlighter = editor.getMarkupModel()
.addRangeHighlighter(textRange.getStartOffset(), textRange.getEndOffset(), 0,
null, null, HighlighterTargetArea.EXACT_RANGE);
.addRangeHighlighter(null, textRange.getStartOffset(), textRange.getEndOffset(), 0, HighlighterTargetArea.EXACT_RANGE);
updateIcon();
}
platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java
+3 -3
View File
@@ -332,8 +332,8 @@ public class BraceHighlightingHandler {
private void highlightBrace(@NotNull TextRange braceRange, boolean matched) {
TextAttributesKey attributesKey = matched ? CodeInsightColors.MATCHED_BRACE_ATTRIBUTES : CodeInsightColors.UNMATCHED_BRACE_ATTRIBUTES;
RangeHighlighter rbraceHighlighter =
myEditor.getMarkupModel().addRangeHighlighter(braceRange.getStartOffset(), braceRange.getEndOffset(),
LAYER, null, attributesKey, HighlighterTargetArea.EXACT_RANGE);
myEditor.getMarkupModel().addRangeHighlighter(attributesKey, braceRange.getStartOffset(), braceRange.getEndOffset(),
LAYER, HighlighterTargetArea.EXACT_RANGE);
rbraceHighlighter.setGreedyToLeft(false);
rbraceHighlighter.setGreedyToRight(false);
registerHighlighter(rbraceHighlighter);
@@ -436,7 +436,7 @@ public class BraceHighlightingHandler {
LineMarkerRenderer renderer = createLineMarkerRenderer(matched);
RangeHighlighter highlighter = editor.getMarkupModel()
.addRangeHighlighterAndChangeAttributes(startOffset, endOffset, 0, null, null, HighlighterTargetArea.LINES_IN_RANGE, false,
.addRangeHighlighterAndChangeAttributes(null, startOffset, endOffset, 0, HighlighterTargetArea.LINES_IN_RANGE, false,
h -> h.setLineMarkerRenderer(renderer));
editor.putUserData(LINE_MARKER_IN_EDITOR_KEY, highlighter);
}
platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightManagerImpl.java
+26 -22
View File
@@ -18,7 +18,6 @@ import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.editor.event.DocumentEvent;
import com.intellij.openapi.editor.event.DocumentListener;
import com.intellij.openapi.editor.ex.MarkupModelEx;
import com.intellij.openapi.editor.ex.RangeHighlighterEx;
import com.intellij.openapi.editor.impl.ImaginaryEditor;
import com.intellij.openapi.editor.markup.*;
import com.intellij.openapi.project.Project;
@@ -187,29 +186,34 @@ public final class HighlightManagerImpl extends HighlightManager {
}
private void addOccurrenceHighlight(@NotNull Editor editor,
int start,
int end,
@Nullable TextAttributes forcedAttributes,
@Nullable TextAttributesKey attributesKey,
int flags,
@Nullable Collection<? super RangeHighlighter> outHighlighters,
@Nullable Color scrollMarkColor) {
RangeHighlighter highlighter = editor.getMarkupModel()
.addRangeHighlighter(start, end, HighlighterLayer.SELECTION - 1,
forcedAttributes, attributesKey,
HighlighterTargetArea.EXACT_RANGE);
HighlightFlags info = new HighlightFlags(editor instanceof EditorWindow ? ((EditorWindow)editor).getDelegate() : editor, flags);
Map<RangeHighlighter, HighlightFlags> map = getHighlightInfoMap(editor, true);
map.put(highlighter, info);
int start,
int end,
@Nullable TextAttributes forcedAttributes,
@Nullable TextAttributesKey attributesKey,
int flags,
@Nullable Collection<? super RangeHighlighter> outHighlighters,
@Nullable Color scrollMarkColor) {
MarkupModelEx markupModel = (MarkupModelEx)editor.getMarkupModel();
markupModel.addRangeHighlighterAndChangeAttributes(attributesKey, start, end, HighlighterLayer.SELECTION - 1,
HighlighterTargetArea.EXACT_RANGE, false, highlighter -> {
if (highlighter instanceof RangeHighlighterEx) ((RangeHighlighterEx)highlighter).setVisibleIfFolded(true);
if (outHighlighters != null) {
outHighlighters.add(highlighter);
}
HighlightFlags info = new HighlightFlags(editor instanceof EditorWindow ? ((EditorWindow)editor).getDelegate() : editor, flags);
Map<RangeHighlighter, HighlightFlags> map = getHighlightInfoMap(editor, true);
map.put(highlighter, info);
if (scrollMarkColor != null) {
highlighter.setErrorStripeMarkColor(scrollMarkColor);
}
highlighter.setVisibleIfFolded(true);
if (outHighlighters != null) {
outHighlighters.add(highlighter);
}
if (forcedAttributes != null) {
highlighter.setTextAttributes(forcedAttributes);
}
if (scrollMarkColor != null) {
highlighter.setErrorStripeMarkColor(scrollMarkColor);
}
});
}
@Override
platform/lang-impl/src/com/intellij/codeInsight/navigation/IncrementalSearchHandler.java
+2 -2
View File
@@ -288,8 +288,8 @@ public final class IncrementalSearchHandler {
data.label.setForeground(JBColor.foreground());
if (matchLength > 0) {
data.segmentHighlighter = editor.getMarkupModel()
.addRangeHighlighter(index, index + matchLength, HighlighterLayer.LAST + 1,
null, EditorColors.SEARCH_RESULT_ATTRIBUTES, HighlighterTargetArea.EXACT_RANGE);
.addRangeHighlighter(EditorColors.SEARCH_RESULT_ATTRIBUTES, index, index + matchLength, HighlighterLayer.LAST + 1,
HighlighterTargetArea.EXACT_RANGE);
}
data.ignoreCaretMove = true;
editor.getCaretModel().moveToOffset(index);
platform/lang-impl/src/com/intellij/codeInsight/unwrap/ScopeHighlighter.java
+2 -2
View File
@@ -86,8 +86,8 @@ public class ScopeHighlighter {
private void addHighlighter(TextRange r, int level, TextAttributesKey key) {
MarkupModel markupModel = myEditor.getMarkupModel();
RangeHighlighter highlighter = markupModel.addRangeHighlighter(r.getStartOffset(), r.getEndOffset(), level,
null, key, HighlighterTargetArea.EXACT_RANGE);
RangeHighlighter highlighter = markupModel.addRangeHighlighter(key, r.getStartOffset(), r.getEndOffset(), level,
HighlighterTargetArea.EXACT_RANGE);
myActiveHighliters.add(highlighter);
}
platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java
+2 -2
View File
@@ -364,8 +364,8 @@ public final class LanguageConsoleBuilder {
}
RangeHighlighter highlighter = getHistoryViewer().getMarkupModel()
.addRangeHighlighter(0, getDocument().getTextLength(), HighlighterLayer.ADDITIONAL_SYNTAX,
null, null, HighlighterTargetArea.EXACT_RANGE);
.addRangeHighlighter(null, 0, getDocument().getTextLength(), HighlighterLayer.ADDITIONAL_SYNTAX,
HighlighterTargetArea.EXACT_RANGE);
highlighter.setGreedyToRight(true);
highlighter.setCustomRenderer(renderer);
lineSeparatorPainter = highlighter;
platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
+2 -2
View File
@@ -439,8 +439,8 @@ public class LanguageConsoleImpl extends ConsoleViewImpl implements LanguageCons
private void addPromptToHistoryImpl(@NotNull String prompt) {
DocumentEx document = getHistoryViewer().getDocument();
RangeHighlighter highlighter =
this.getHistoryViewer().getMarkupModel().addRangeHighlighter(document.getTextLength(), document.getTextLength(), 0,
null, null, HighlighterTargetArea.EXACT_RANGE);
this.getHistoryViewer().getMarkupModel().addRangeHighlighter(null, document.getTextLength(), document.getTextLength(), 0,
HighlighterTargetArea.EXACT_RANGE);
print(prompt, myConsoleExecutionEditor.getPromptAttributes());
highlighter.putUserData(ConsoleHistoryCopyHandler.PROMPT_LENGTH_MARKER, prompt.length());
}
platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+11 -5
View File
@@ -815,13 +815,19 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
int startOffset,
int endOffset) {
ApplicationManager.getApplication().assertIsDispatchThread();
TextAttributes attributes = contentType.getForcedAttributes();
TextAttributesKey attributesKey = contentType.getAttributesKey();
MarkupModel model = DocumentMarkupModel.forDocument(myEditor.getDocument(), getProject(), true);
MarkupModelEx model = (MarkupModelEx)DocumentMarkupModel.forDocument(myEditor.getDocument(), getProject(), true);
int layer = HighlighterLayer.SYNTAX + 1; // make custom filters able to draw their text attributes over the default ones
RangeHighlighter tokenMarker = model.addRangeHighlighter(startOffset, endOffset, layer,
attributes, attributesKey, HighlighterTargetArea.EXACT_RANGE);
tokenMarker.putUserData(CONTENT_TYPE, contentType);
model.addRangeHighlighterAndChangeAttributes(
attributesKey, startOffset, endOffset, layer, HighlighterTargetArea.EXACT_RANGE, false,
ex -> {
// fallback for contentTypes which provide only attributes
TextAttributes attributes = contentType.getForcedAttributes();
if (attributes != null) {
ex.setTextAttributes(attributes);
}
ex.putUserData(CONTENT_TYPE, contentType);
});
}
private boolean isDisposed() {
platform/lang-impl/src/com/intellij/find/FindUtil.java
+2 -1
View File
@@ -722,10 +722,11 @@ public class FindUtil {
if (!model.isGlobal()) {
final RangeHighlighterEx segmentHighlighter = (RangeHighlighterEx)editor.getMarkupModel().addRangeHighlighter(
EditorColors.SEARCH_RESULT_ATTRIBUTES,
result.getStartOffset(),
result.getEndOffset(),
HighlighterLayer.SELECTION + 1,
null, EditorColors.SEARCH_RESULT_ATTRIBUTES, HighlighterTargetArea.EXACT_RANGE);
HighlighterTargetArea.EXACT_RANGE);
MyListener listener = new MyListener(editor, segmentHighlighter);
caretModel.addCaretListener(listener);
}
platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java
+5 -2
View File
@@ -14,7 +14,10 @@ import com.intellij.openapi.actionSystem.ActionGroup;
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.RangeMarker;
import com.intellij.openapi.editor.colors.*;
import com.intellij.openapi.editor.colors.CodeInsightColors;
import com.intellij.openapi.editor.colors.EditorColors;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.colors.EditorFontType;
import com.intellij.openapi.editor.ex.MarkupModelEx;
import com.intellij.openapi.editor.ex.RangeHighlighterEx;
import com.intellij.openapi.editor.impl.DocumentMarkupModel;
@@ -148,7 +151,7 @@ public final class Bookmark implements Navigatable, Comparable<Bookmark> {
final RangeHighlighterEx highlighter;
int line = getLine();
if (line >= 0) {
highlighter = markup.addPersistentLineHighlighter(line, HighlighterLayer.ERROR + 1, null, CodeInsightColors.BOOKMARKS_ATTRIBUTES);
highlighter = markup.addPersistentLineHighlighter(CodeInsightColors.BOOKMARKS_ATTRIBUTES, line, HighlighterLayer.ERROR + 1);
if (highlighter != null) {
highlighter.setGutterIconRenderer(new MyGutterIconRenderer(this));
highlighter.setErrorStripeTooltip(getBookmarkTooltip());
platform/lang-impl/src/com/intellij/refactoring/changeSignature/inplace/InplaceChangeSignature.java
+4 -4
View File
@@ -186,12 +186,12 @@ public class InplaceChangeSignature implements DocumentListener {
myPreview.getMarkupModel().removeAllHighlighters();
WriteCommandAction.writeCommandAction(null).run(() -> myPreview.getDocument().replaceString(0, myPreview.getDocument().getTextLength(), methodSignature));
for (TextRange range : deleteRanges) {
myPreview.getMarkupModel().addRangeHighlighter(range.getStartOffset(), range.getEndOffset(), HighlighterLayer.ADDITIONAL_SYNTAX,
null, CodeInsightColors.DEPRECATED_ATTRIBUTES, HighlighterTargetArea.EXACT_RANGE);
myPreview.getMarkupModel().addRangeHighlighter(CodeInsightColors.DEPRECATED_ATTRIBUTES, range.getStartOffset(), range.getEndOffset(), HighlighterLayer.ADDITIONAL_SYNTAX,
HighlighterTargetArea.EXACT_RANGE);
}
for (TextRange range : newRanges) {
myPreview.getMarkupModel().addRangeHighlighter(range.getStartOffset(), range.getEndOffset(), HighlighterLayer.ADDITIONAL_SYNTAX,
null, CodeInsightColors.TODO_DEFAULT_ATTRIBUTES, HighlighterTargetArea.EXACT_RANGE);
myPreview.getMarkupModel().addRangeHighlighter(CodeInsightColors.TODO_DEFAULT_ATTRIBUTES, range.getStartOffset(), range.getEndOffset(), HighlighterLayer.ADDITIONAL_SYNTAX,
HighlighterTargetArea.EXACT_RANGE);
}
}
platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/OccurrencesChooser.java
+1 -2
View File
@@ -129,8 +129,7 @@ public abstract class OccurrencesChooser<T> {
for (T occurrence : occurrenceList) {
final TextRange textRange = getOccurrenceRange(occurrence);
final RangeHighlighter rangeHighlighter = markupModel.addRangeHighlighter(
textRange.getStartOffset(), textRange.getEndOffset(), HighlighterLayer.SELECTION - 1,
null, EditorColors.SEARCH_RESULT_ATTRIBUTES,
EditorColors.SEARCH_RESULT_ATTRIBUTES, textRange.getStartOffset(), textRange.getEndOffset(), HighlighterLayer.SELECTION - 1,
HighlighterTargetArea.EXACT_RANGE);
myRangeHighlighters.add(rangeHighlighter);
}
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/RenameChooser.java
+2 -4
View File
@@ -58,8 +58,7 @@ abstract class RenameChooser {
for (Pair<PsiElement, TextRange> pair : stringUsages) {
final TextRange textRange = pair.second.shiftRight(pair.first.getTextOffset());
final RangeHighlighter rangeHighlighter = markupModel.addRangeHighlighter(
textRange.getStartOffset(), textRange.getEndOffset(), HighlighterLayer.SELECTION - 1,
null, EditorColors.SEARCH_RESULT_ATTRIBUTES,
EditorColors.SEARCH_RESULT_ATTRIBUTES, textRange.getStartOffset(), textRange.getEndOffset(), HighlighterLayer.SELECTION - 1,
HighlighterTargetArea.EXACT_RANGE);
myRangeHighlighters.add(rangeHighlighter);
}
@@ -69,8 +68,7 @@ abstract class RenameChooser {
final PsiElement element = reference.getElement();
final TextRange textRange = element.getTextRange();
final RangeHighlighter rangeHighlighter = markupModel.addRangeHighlighter(
textRange.getStartOffset(), textRange.getEndOffset(), HighlighterLayer.SELECTION - 1,
null, EditorColors.SEARCH_RESULT_ATTRIBUTES,
EditorColors.SEARCH_RESULT_ATTRIBUTES, textRange.getStartOffset(), textRange.getEndOffset(), HighlighterLayer.SELECTION - 1,
HighlighterTargetArea.EXACT_RANGE);
myRangeHighlighters.add(rangeHighlighter);
}
platform/lang-impl/src/com/intellij/refactoring/suggested/PerformSuggestedRefactoring.kt
+1 -1
View File
@@ -247,7 +247,7 @@ private fun <TData> createAndShowBalloon(
rangeToHighlight.startOffset,
rangeToHighlight.endOffset,
HighlighterLayer.FIRST,
attributes, null,
attributes,
HighlighterTargetArea.LINES_IN_RANGE
)
platform/platform-impl/src/com/intellij/application/options/colors/highlighting/HighlightData.java
+9 -4
View File
@@ -62,11 +62,16 @@ public class HighlightData {
UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
try {
// IDEA-53203: add ERASE_MARKER for manually defined attributes
view.getMarkupModel().addRangeHighlighter(myStartOffset, myEndOffset, HighlighterLayer.ADDITIONAL_SYNTAX,
TextAttributes.ERASE_MARKER, myHighlightType, HighlighterTargetArea.EXACT_RANGE);
RangeHighlighter erasedHighlighter = view.getMarkupModel()
.addRangeHighlighter(myHighlightType, myStartOffset, myEndOffset, HighlighterLayer.ADDITIONAL_SYNTAX,
HighlighterTargetArea.EXACT_RANGE);
if (erasedHighlighter instanceof RangeHighlighterEx) {
((RangeHighlighterEx)erasedHighlighter).setTextAttributes(TextAttributes.ERASE_MARKER);
}
RangeHighlighter highlighter = view.getMarkupModel()
.addRangeHighlighter(myStartOffset, myEndOffset, HighlighterLayer.ADDITIONAL_SYNTAX,
null, myHighlightType, HighlighterTargetArea.EXACT_RANGE);
.addRangeHighlighter(myHighlightType, myStartOffset, myEndOffset, HighlighterLayer.ADDITIONAL_SYNTAX,
HighlighterTargetArea.EXACT_RANGE);
final Color errorStripeColor = attr.getErrorStripeColor();
highlighter.setErrorStripeMarkColor(errorStripeColor);
final String tooltip = displayText.get(myHighlightType);
platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java
+12 -6
View File
@@ -238,11 +238,17 @@ public class EditorHyperlinkSupport {
@NotNull final HyperlinkInfo hyperlinkInfo,
@Nullable TextAttributes followedHyperlinkAttributes,
int layer) {
final RangeHighlighter highlighter = myEditor.getMarkupModel().addRangeHighlighter(highlightStartOffset,
highlightEndOffset,
layer,
highlightAttributes, CodeInsightColors.HYPERLINK_ATTRIBUTES,
HighlighterTargetArea.EXACT_RANGE);
final RangeHighlighter highlighter =
myEditor.getMarkupModel().addRangeHighlighterAndChangeAttributes(CodeInsightColors.HYPERLINK_ATTRIBUTES,
highlightStartOffset,
highlightEndOffset,
layer,
HighlighterTargetArea.EXACT_RANGE,
false, ex -> {
if (highlightAttributes != null) {
ex.setTextAttributes(highlightAttributes);
}
});
associateHyperlink(highlighter, hyperlinkInfo, followedHyperlinkAttributes);
return highlighter;
}
@@ -397,7 +403,7 @@ public class EditorHyperlinkSupport {
}
}
//refresh highlighter text attributes
markupModel.addRangeHighlighter(0, 0, link.getLayer(), null, CodeInsightColors.HYPERLINK_ATTRIBUTES, HighlighterTargetArea.EXACT_RANGE).dispose();
markupModel.addRangeHighlighter(CodeInsightColors.HYPERLINK_ATTRIBUTES, 0, 0, link.getLayer(), HighlighterTargetArea.EXACT_RANGE).dispose();
}
platform/platform-impl/src/com/intellij/ide/actions/RecentLocationsRenderer.java
+7 -5
View File
@@ -129,14 +129,10 @@ class RecentLocationsRenderer extends ColoredListCellRenderer<RecentLocationItem
editor.setBorder(JBUI.Borders.empty(0, 4, 6, 0));
if (RecentLocationsAction.getEmptyFileText().equals(editor.getDocument().getText())) {
TextAttributes unusedAttributes = colorsScheme.getAttributes(CodeInsightColors.NOT_USED_ELEMENT_ATTRIBUTES);
TextAttributes forcedTextAttributes = unusedAttributes == null
? SimpleTextAttributes.GRAYED_ATTRIBUTES.toTextAttributes()
: null;
editor.getMarkupModel().addRangeHighlighter(0,
RecentLocationsAction.getEmptyFileText().length(),
HighlighterLayer.SYNTAX,
forcedTextAttributes, CodeInsightColors.NOT_USED_ELEMENT_ATTRIBUTES,
createEmptyTextForegroundTextAttributes(colorsScheme),
HighlighterTargetArea.EXACT_RANGE);
}
@@ -228,6 +224,12 @@ class RecentLocationsRenderer extends ColoredListCellRenderer<RecentLocationItem
return defaultTextAttributes;
}
@NotNull
private static TextAttributes createEmptyTextForegroundTextAttributes(@NotNull EditorColorsScheme colorsScheme) {
TextAttributes unusedAttributes = colorsScheme.getAttributes(CodeInsightColors.NOT_USED_ELEMENT_ATTRIBUTES);
return unusedAttributes != null ? unusedAttributes : SimpleTextAttributes.GRAYED_ATTRIBUTES.toTextAttributes();
}
@Override
protected void customizeCellRenderer(@NotNull JList<? extends RecentLocationItem> list,
RecentLocationItem value,
platform/platform-impl/src/com/intellij/ide/impl/SelectInEditorManagerImpl.java
+4 -4
View File
@@ -90,18 +90,18 @@ public class SelectInEditorManagerImpl extends SelectInEditorManager implements
DocumentEx doc = (DocumentEx) editor.getDocument();
int lineNumber = doc.getLineNumber(startOffset);
if (lineNumber >= 0 && lineNumber < doc.getLineCount()){
mySegmentHighlighter = editor.getMarkupModel().addRangeHighlighter(doc.getLineStartOffset(lineNumber),
mySegmentHighlighter = editor.getMarkupModel().addRangeHighlighter(EditorColors.SEARCH_RESULT_ATTRIBUTES,
doc.getLineStartOffset(lineNumber),
doc.getLineEndOffset(lineNumber) + doc.getLineSeparatorLength(lineNumber),
HighlighterLayer.LAST + 1,
null, EditorColors.SEARCH_RESULT_ATTRIBUTES,
HighlighterTargetArea.EXACT_RANGE);
}
}
else{
mySegmentHighlighter = editor.getMarkupModel().addRangeHighlighter(startOffset,
mySegmentHighlighter = editor.getMarkupModel().addRangeHighlighter(EditorColors.SEARCH_RESULT_ATTRIBUTES,
startOffset,
endOffset,
HighlighterLayer.LAST + 1,
null, EditorColors.SEARCH_RESULT_ATTRIBUTES,
HighlighterTargetArea.EXACT_RANGE);
}
myEditor = editor;
platform/platform-impl/src/com/intellij/notification/EventLogConsole.java
+1 -1
View File
@@ -269,7 +269,7 @@ final class EventLogConsole {
int layer = HighlighterLayer.CARET_ROW + 1;
RangeHighlighter highlighter = editor.getMarkupModel()
.addRangeHighlighter(msgStart, document.getTextLength(), layer, null, key, HighlighterTargetArea.LINES_IN_RANGE);
.addRangeHighlighter(key, msgStart, document.getTextLength(), layer, HighlighterTargetArea.LINES_IN_RANGE);
GROUP_ID.set(highlighter, notification.getGroupId());
NOTIFICATION_ID.set(highlighter, notification.id);
platform/platform-impl/src/com/intellij/openapi/editor/actions/ShowEditorHighlighterTokensAction.java
+2 -3
View File
@@ -108,9 +108,8 @@ class ShowEditorHighlighterTokensAction extends EditorAction {
HighlighterIterator it = ((EditorEx)editor).getHighlighter().createIterator(0);
while (!it.atEnd()) {
RangeHighlighter h = editor.getMarkupModel().addRangeHighlighter(it.getStart(), it.getEnd(), 0,
Holder.OUR_TEXT_ATTRIBUTES, null,
HighlighterTargetArea.EXACT_RANGE);
RangeHighlighter h = editor.getMarkupModel().addRangeHighlighter(it.getStart(), it.getEnd(),
0, Holder.OUR_TEXT_ATTRIBUTES, HighlighterTargetArea.EXACT_RANGE);
IElementType tokenType = it.getTokenType();
h.putUserData(Holder.TOKEN_NAME, String.valueOf(tokenType));
it.advance();
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorFilteringMarkupModelEx.java
+9 -18
View File
@@ -118,11 +118,8 @@ public class EditorFilteringMarkupModelEx implements MarkupModelEx {
@Override
@Nullable
public RangeHighlighterEx addPersistentLineHighlighter(int lineNumber,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey) {
return myDelegate.addPersistentLineHighlighter(lineNumber, layer, forcedTextAttributes, textAttributesKey);
public RangeHighlighterEx addPersistentLineHighlighter(@Nullable TextAttributesKey textAttributesKey, int lineNumber, int layer) {
return myDelegate.addPersistentLineHighlighter(textAttributesKey, lineNumber, layer);
}
@Override
@@ -137,35 +134,29 @@ public class EditorFilteringMarkupModelEx implements MarkupModelEx {
@Override
@NotNull
public RangeHighlighter addRangeHighlighter(int startOffset,
public RangeHighlighter addRangeHighlighter(@Nullable TextAttributesKey textAttributesKey, int startOffset,
int endOffset,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey,
@NotNull HighlighterTargetArea targetArea) {
return myDelegate.addRangeHighlighter(startOffset, endOffset, layer, forcedTextAttributes, textAttributesKey, targetArea);
return myDelegate.addRangeHighlighter(textAttributesKey, startOffset, endOffset, layer, targetArea);
}
@Override
@NotNull
public RangeHighlighter addLineHighlighter(int line,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey) {
return myDelegate.addLineHighlighter(line, layer, forcedTextAttributes, textAttributesKey);
public RangeHighlighter addLineHighlighter(@Nullable TextAttributesKey textAttributesKey, int line, int layer) {
return myDelegate.addLineHighlighter(textAttributesKey, line, layer);
}
@Override
@NotNull
public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(int startOffset,
public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(@Nullable TextAttributesKey textAttributesKey,
int startOffset,
int endOffset,
int layer,
@Nullable TextAttributes forcedTextAttributes,
@Nullable TextAttributesKey textAttributesKey,
@NotNull HighlighterTargetArea targetArea,
boolean isPersistent,
Consumer<? super RangeHighlighterEx> changeAttributesAction) {
return myDelegate.addRangeHighlighterAndChangeAttributes(startOffset, endOffset, layer, forcedTextAttributes, textAttributesKey,
return myDelegate.addRangeHighlighterAndChangeAttributes(textAttributesKey, startOffset, endOffset, layer,
targetArea, isPersistent, changeAttributesAction);
}
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/DocumentMarkupModelTest.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class DocumentMarkupModelTest extends BasePlatformTestCase {
public void testPersistentHighlighterUpdateOnPartialDocumentUpdate() {
Document document = new DocumentImpl("line0\nline1\nline2");
MarkupModelEx model = (MarkupModelEx)DocumentMarkupModel.forDocument(document, getProject(), true);
RangeHighlighterEx highlighter = model.addPersistentLineHighlighter(2, 0, null, null);
RangeHighlighterEx highlighter = model.addPersistentLineHighlighter(null, 2, 0);
WriteCommandAction.runWriteCommandAction(getProject(), () -> document.deleteString(document.getLineStartOffset(1), document.getTextLength()));
assertFalse(highlighter.isValid());
}
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorImplTest.java
+2 -2
View File
@@ -308,7 +308,7 @@ public class EditorImplTest extends AbstractEditorTest {
document.addDocumentListener(new DocumentListener() {
@Override
public void bulkUpdateFinished(@NotNull Document document) {
getEditor().getMarkupModel().addRangeHighlighter(7, 8, 0, null, null, HighlighterTargetArea.EXACT_RANGE);
getEditor().getMarkupModel().addRangeHighlighter(null, 7, 8, 0, HighlighterTargetArea.EXACT_RANGE);
}
}, getTestRootDisposable());
runWriteCommand(() -> DocumentUtil.executeInBulk(document, true, ()-> document.insertString(3, "\n\n")));
@@ -324,7 +324,7 @@ public class EditorImplTest extends AbstractEditorTest {
runFoldingOperation(() -> {
((FoldingModelEx)getEditor().getFoldingModel()).clearFoldRegions();
getEditor().getMarkupModel().addRangeHighlighter(7, 8, 0,
new TextAttributes(null, null, null, null, Font.BOLD), null,
new TextAttributes(null, null, null, null, Font.BOLD),
HighlighterTargetArea.EXACT_RANGE);
});
RangeHighlighter[] highlighters = getEditor().getMarkupModel().getAllHighlighters();
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/MarkupModelStressTest.java
+2 -2
View File
@@ -82,8 +82,8 @@ public class MarkupModelStressTest extends AbstractEditorTest {
int bound = getEditor().getDocument().getTextLength() + 1;
int offset1 = myRandom.nextInt(bound);
int offset2 = myRandom.nextInt(bound);
getEditor().getMarkupModel().addRangeHighlighter(Math.min(offset1, offset2), Math.max(offset1, offset2), 0,
null, null, HighlighterTargetArea.EXACT_RANGE);
getEditor().getMarkupModel().addRangeHighlighter(null, Math.min(offset1, offset2), Math.max(offset1, offset2), 0,
HighlighterTargetArea.EXACT_RANGE);
}
}
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/RangeMarkerTest.java
+8 -8
View File
@@ -955,9 +955,9 @@ public class RangeMarkerTest extends LightPlatformTestCase {
MarkupModel markupModel = DocumentMarkupModel.forDocument(document, getProject(), true);
for (int i=0; i<2; i++) {
RangeMarker m = markupModel.addRangeHighlighter(1, 6, 0, null, null,HighlighterTargetArea.EXACT_RANGE);
RangeMarker m2 = markupModel.addRangeHighlighter(2, 7, 0, null, null, HighlighterTargetArea.EXACT_RANGE);
RangeMarker m3 = markupModel.addRangeHighlighter(1, 6, 0, null, null, HighlighterTargetArea.EXACT_RANGE);
RangeMarker m = markupModel.addRangeHighlighter(null, 1, 6, 0, HighlighterTargetArea.EXACT_RANGE);
RangeMarker m2 = markupModel.addRangeHighlighter(null, 2, 7, 0, HighlighterTargetArea.EXACT_RANGE);
RangeMarker m3 = markupModel.addRangeHighlighter(null, 1, 6, 0, HighlighterTargetArea.EXACT_RANGE);
markupModel.removeAllHighlighters();
assertFalse(m.isValid());
assertFalse(m2.isValid());
@@ -1042,7 +1042,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
Document document = EditorFactory.getInstance().createDocument("[xxxxxxxxxxxxxx]");
MarkupModel markupModel = DocumentMarkupModel.forDocument(document, getProject(), true);
RangeMarker m = markupModel.addRangeHighlighter(1, 6, 0, null, null, HighlighterTargetArea.EXACT_RANGE);
RangeMarker m = markupModel.addRangeHighlighter(null, 1, 6, 0, HighlighterTargetArea.EXACT_RANGE);
assertTrue(m.isValid());
markupModel.removeAllHighlighters();
assertFalse(m.isValid());
@@ -1057,9 +1057,9 @@ public class RangeMarkerTest extends LightPlatformTestCase {
final MarkupModelEx markupModel = (MarkupModelEx)DocumentMarkupModel.forDocument(document, getProject(), true);
for (int i=0; i<N-1;i++) {
markupModel.addRangeHighlighter(2*i, 2*i+1, 0, null, null, HighlighterTargetArea.EXACT_RANGE);
markupModel.addRangeHighlighter(null, 2 * i, 2 * i + 1, 0, HighlighterTargetArea.EXACT_RANGE);
}
markupModel.addRangeHighlighter(N / 2, N / 2 + 1, 0, null, null, HighlighterTargetArea.LINES_IN_RANGE);
markupModel.addRangeHighlighter(null, N / 2, N / 2 + 1, 0, HighlighterTargetArea.LINES_IN_RANGE);
PlatformTestUtil.startPerformanceTest("highlighters lookup", (int)(N*Math.log(N)/1000), () -> {
List<RangeHighlighterEx> list = new ArrayList<>();
@@ -1076,8 +1076,8 @@ public class RangeMarkerTest extends LightPlatformTestCase {
Document document = EditorFactory.getInstance().createDocument("1234567890");
final MarkupModelEx markupModel = (MarkupModelEx)DocumentMarkupModel.forDocument(document, getProject(), true);
RangeHighlighter exact = markupModel.addRangeHighlighter(3, 6, 0, null, null, HighlighterTargetArea.EXACT_RANGE);
RangeHighlighter line = markupModel.addRangeHighlighter(4, 5, 0, null, null, HighlighterTargetArea.LINES_IN_RANGE);
RangeHighlighter exact = markupModel.addRangeHighlighter(null, 3, 6, 0, HighlighterTargetArea.EXACT_RANGE);
RangeHighlighter line = markupModel.addRangeHighlighter(null, 4, 5, 0, HighlighterTargetArea.LINES_IN_RANGE);
List<RangeHighlighter> list = new ArrayList<>();
markupModel.processRangeHighlightersOverlappingWith(2, 9, new CommonProcessors.CollectProcessor<>(list));
assertEquals(Arrays.asList(line, exact), list);
platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplacementPreviewDialog.java
+1 -2
View File
@@ -63,11 +63,10 @@ public final class ReplacementPreviewDialog extends DialogWrapper {
return;
}
myHighlighter = editor.getMarkupModel().addRangeHighlighter(
EditorColors.SEARCH_RESULT_ATTRIBUTES,
start,
end,
HighlighterLayer.SELECTION - 100,
null,
EditorColors.SEARCH_RESULT_ATTRIBUTES,
HighlighterTargetArea.EXACT_RANGE
);
}
platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java
+5 -3
View File
@@ -197,9 +197,11 @@ public class UsagePreviewPanel extends UsageContextPanelBase implements DataProv
// highlight injected element in host document textrange
textRange = InjectedLanguageManager.getInstance(project).injectedToHost(psiElement, textRange);
RangeHighlighter highlighter = markupModel.addRangeHighlighter(textRange.getStartOffset(), textRange.getEndOffset(),
highlightLayer, null, EditorColors.SEARCH_RESULT_ATTRIBUTES,
HighlighterTargetArea.EXACT_RANGE);
RangeHighlighter highlighter = markupModel.addRangeHighlighter(EditorColors.SEARCH_RESULT_ATTRIBUTES,
textRange.getStartOffset(),
textRange.getEndOffset(),
highlightLayer,
HighlighterTargetArea.EXACT_RANGE);
highlighter.putUserData(IN_PREVIEW_USAGE_FLAG, Boolean.TRUE);
if (infoRange != null && findModel != null && findModel.isReplaceState()) {
RangeHighlighter boxHighlighter
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/tool/ApplyPatchChange.java
+2 -2
View File
@@ -121,8 +121,8 @@ class ApplyPatchChange {
TextRange textRange = DiffUtil.getLinesRange(document, line1, line2);
RangeHighlighter highlighter = markupModel
.addRangeHighlighter(textRange.getStartOffset(), textRange.getEndOffset(), HighlighterLayer.LAST,
null, null, HighlighterTargetArea.LINES_IN_RANGE);
.addRangeHighlighter(null, textRange.getStartOffset(), textRange.getEndOffset(), HighlighterLayer.LAST,
HighlighterTargetArea.LINES_IN_RANGE);
highlighter.setLineMarkerRenderer(new MyGutterRenderer(line1, line2, color, tooltip));
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java
+2 -2
View File
@@ -231,8 +231,8 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
}
if (!range.isEmpty() && range.intersects(lineRange)) {
myHighlighter = editor.getMarkupModel().addRangeHighlighter(
range.getStartOffset(), range.getEndOffset(), DebuggerColors.BREAKPOINT_HIGHLIGHTER_LAYER,
null, DebuggerColors.BREAKPOINT_ATTRIBUTES, HighlighterTargetArea.EXACT_RANGE);
DebuggerColors.BREAKPOINT_ATTRIBUTES, range.getStartOffset(), range.getEndOffset(), DebuggerColors.BREAKPOINT_HIGHLIGHTER_LAYER,
HighlighterTargetArea.EXACT_RANGE);
}
}
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XLineBreakpointImpl.java
+11 -7
View File
@@ -6,10 +6,14 @@ import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.LazyRangeMarkerFactory;
import com.intellij.openapi.editor.RangeMarker;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.editor.ex.MarkupModelEx;
import com.intellij.openapi.editor.ex.RangeHighlighterEx;
import com.intellij.openapi.editor.impl.DocumentMarkupModel;
import com.intellij.openapi.editor.markup.*;
import com.intellij.openapi.editor.markup.GutterDraggableObject;
import com.intellij.openapi.editor.markup.HighlighterTargetArea;
import com.intellij.openapi.editor.markup.MarkupEditorFilterFactory;
import com.intellij.openapi.editor.markup.RangeHighlighter;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.TextRange;
@@ -95,13 +99,13 @@ public final class XLineBreakpointImpl<P extends XBreakpointProperties> extends
}
// todo separate attribute key for disabled breakpoints with settings in Colors | Debugger
TextAttributes forcedAttributes = isEnabled() ? null : new TextAttributes();
TextAttributesKey textAttributesKey = isEnabled() ? DebuggerColors.BREAKPOINT_ATTRIBUTES : null;
RangeHighlighter highlighter = (RangeHighlighter)myHighlighter;
if (highlighter != null &&
(!highlighter.isValid()
|| !DocumentUtil.isValidOffset(highlighter.getStartOffset(), document)
|| !Comparing.equal(highlighter.getTextAttributes(null), forcedAttributes)
|| !Comparing.equal(highlighter.getTextAttributesKey(), textAttributesKey)
// it seems that this check is not needed - we always update line number from the highlighter
// and highlighter is removed on line and file change anyway
/*|| document.getLineNumber(highlighter.getStartOffset()) != getLine()*/)) {
@@ -116,15 +120,15 @@ public final class XLineBreakpointImpl<P extends XBreakpointProperties> extends
if (range != null && !range.isEmpty()) {
TextRange lineRange = DocumentUtil.getLineTextRange(document, getLine());
if (range.intersects(lineRange)) {
highlighter = markupModel.addRangeHighlighter(range.getStartOffset(), range.getEndOffset(),
highlighter = markupModel.addRangeHighlighter(textAttributesKey,
range.getStartOffset(),
range.getEndOffset(),
DebuggerColors.BREAKPOINT_HIGHLIGHTER_LAYER,
forcedAttributes, DebuggerColors.BREAKPOINT_ATTRIBUTES,
HighlighterTargetArea.EXACT_RANGE);
}
}
if (highlighter == null) {
highlighter = markupModel.addPersistentLineHighlighter(getLine(), DebuggerColors.BREAKPOINT_HIGHLIGHTER_LAYER,
forcedAttributes, DebuggerColors.BREAKPOINT_ATTRIBUTES);
highlighter = markupModel.addPersistentLineHighlighter(textAttributesKey, getLine(), DebuggerColors.BREAKPOINT_HIGHLIGHTER_LAYER);
}
if (highlighter == null) {
return;
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java
+3 -3
View File
@@ -191,13 +191,13 @@ public class ExecutionPointHighlighter {
TextRange lineRange = DocumentUtil.getLineTextRange(document, line);
if (!range.equals(lineRange)) {
myRangeHighlighter = markupModel
.addRangeHighlighter(range.getStartOffset(), range.getEndOffset(), DebuggerColors.EXECUTION_LINE_HIGHLIGHTERLAYER,
null, attributesKey, HighlighterTargetArea.EXACT_RANGE);
.addRangeHighlighter(attributesKey, range.getStartOffset(), range.getEndOffset(), DebuggerColors.EXECUTION_LINE_HIGHLIGHTERLAYER,
HighlighterTargetArea.EXACT_RANGE);
}
}
}
if (myRangeHighlighter == null) {
myRangeHighlighter = markupModel.addLineHighlighter(line, DebuggerColors.EXECUTION_LINE_HIGHLIGHTERLAYER, null, attributesKey);
myRangeHighlighter = markupModel.addLineHighlighter(attributesKey, line, DebuggerColors.EXECUTION_LINE_HIGHLIGHTERLAYER);
}
myRangeHighlighter.putUserData(EXECUTION_POINT_HIGHLIGHTER_TOP_FRAME_KEY, !myNotTopFrame);
myRangeHighlighter.setEditorFilter(MarkupEditorFilterFactory.createIsNotDiffFilter());
plugins/IntentionPowerPak/src/com/siyeh/ipp/modifiers/ChangeModifierIntention.java
+2 -2
View File
@@ -161,8 +161,8 @@ public class ChangeModifierIntention extends BaseElementAtCaretIntentionAction {
}
RangeHighlighter highlighter = editor.getMarkupModel()
.addRangeHighlighter(range.getStartOffset(), range.getEndOffset(), HighlighterLayer.LAST + 1,
null, EditorColors.LIVE_TEMPLATE_ATTRIBUTES, HighlighterTargetArea.EXACT_RANGE);
.addRangeHighlighter(EditorColors.LIVE_TEMPLATE_ATTRIBUTES, range.getStartOffset(), range.getEndOffset(), HighlighterLayer.LAST + 1,
HighlighterTargetArea.EXACT_RANGE);
highlighter.setGreedyToRight(true);
highlighter.setGreedyToLeft(true);
ModifierUpdater updater = new ModifierUpdater(file, document, range, getFamilyName());
plugins/coverage-common/src/com/intellij/coverage/SrcFileAnnotator.java
+1 -1
View File
@@ -471,7 +471,7 @@ public class SrcFileAnnotator implements Disposable {
final int endOffset = document.getLineEndOffset(lineNumberInCurrent);
final TextAttributesKey attributesKey = CoverageLineMarkerRenderer.getAttributesKey(line, executableLines);
final RangeHighlighter highlighter =
markupModel.addRangeHighlighter(startOffset, endOffset, HighlighterLayer.SELECTION - 1, null, attributesKey, HighlighterTargetArea.LINES_IN_RANGE);
markupModel.addRangeHighlighter(attributesKey, startOffset, endOffset, HighlighterLayer.SELECTION - 1, HighlighterTargetArea.LINES_IN_RANGE);
final Function<Integer, Integer> newToOldConverter = newLine -> {
if (editor == null) return -1;
final TIntIntHashMap oldLineMapping = getNewToOldLineMapping(date, editorBean);
plugins/devkit/devkit-core/src/testAssistant/TestDataHighlightingPass.java
-1
View File
@@ -63,7 +63,6 @@ public class TestDataHighlightingPass extends TextEditorHighlightingPass {
ind + CARET.length(),
HighlighterLayer.ADDITIONAL_SYNTAX,
CARET_ATTRIBUTES,
null,
HighlighterTargetArea.EXACT_RANGE);
highlighter.setGutterIconRenderer(ICON_RENDERER);
highlighter.putUserData(KEY, VALUE);
plugins/github/src/org/jetbrains/plugins/github/pullrequest/comment/ui/GHPREditorCommentableRangesController.kt
+1 -1
View File
@@ -42,7 +42,7 @@ class GHPREditorCommentableRangesController(commentableRanges: SingleValueModel<
val start = editor.document.getLineStartOffset(i)
val end = editor.document.getLineEndOffset(i)
editor.markupModel
.addRangeHighlighterAndChangeAttributes(start, end, HighlighterLayer.LAST, null, null, HighlighterTargetArea.EXACT_RANGE,
.addRangeHighlighterAndChangeAttributes(null, start, end, HighlighterLayer.LAST, HighlighterTargetArea.EXACT_RANGE,
false) { highlighter ->
highlighter.gutterIconRenderer = gutterIconRendererFactory.createCommentRenderer(i)
}
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/MethodOrClosureScopeChooser.java
+2 -2
View File
@@ -165,8 +165,8 @@ public final class MethodOrClosureScopeChooser {
final MarkupModel markupModel = editor.getMarkupModel();
final TextRange textRange = selectedMethod.getTextRange();
final RangeHighlighter rangeHighlighter =
markupModel.addRangeHighlighter(textRange.getStartOffset(), textRange.getEndOffset(), HighlighterLayer.SELECTION - 1,
null, attributesKey, HighlighterTargetArea.EXACT_RANGE);
markupModel.addRangeHighlighter(attributesKey, textRange.getStartOffset(), textRange.getEndOffset(), HighlighterLayer.SELECTION - 1,
HighlighterTargetArea.EXACT_RANGE);
highlighters.add(rangeHighlighter);
if (selectedMethod instanceof GrMethod) {
superMethod.setText(USE_SUPER_METHOD_OF);
xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java
+1 -1
View File
@@ -244,7 +244,7 @@ public class XmlTagTreeHighlightingPass extends TextEditorHighlightingPass {
@NotNull
private static RangeHighlighter createHighlighter(MarkupModel mm, @NotNull TextRange range, Color color) {
RangeHighlighter highlighter =
mm.addRangeHighlighter(range.getStartOffset(), range.getEndOffset(), 0, null, null, HighlighterTargetArea.LINES_IN_RANGE);
mm.addRangeHighlighter(null, range.getStartOffset(), range.getEndOffset(), 0, HighlighterTargetArea.LINES_IN_RANGE);
highlighter.setLineMarkerRenderer((__, g, r) -> {
g.setColor(color);