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

One more portion of API migration

Browse Source 
GitOrigin-RevId: 704c03377a28da2d483ede45438c22c70f681ba5
This commit is contained in:
Alexander.Kirsanov
2020-05-19 16:09:37 +00:00
committed by intellij-monorepo-bot
parent 9e845508b1
commit 124f82fa61
5 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/hints/BlackListPanel.kt
+1 -2
View File
@@ -145,7 +145,6 @@ private fun createBlacklistEditorField(text: String): EditorTextField {
}
private fun highlightErrorLines(lines: List<Int>, editor: Editor) {
val attributes = editor.colorsScheme.getAttributes(ERRORS_ATTRIBUTES)
val document = editor.document
val totalLines = document.lineCount
@@ -153,7 +152,7 @@ private fun highlightErrorLines(lines: List<Int>, editor: Editor) {
model.removeAllHighlighters()
lines.stream()
.filter { current -> current < totalLines }
.forEach { line -> model.addLineHighlighter(line!!, HighlighterLayer.ERROR, attributes) }
.forEach { line -> model.addLineHighlighter(ERRORS_ATTRIBUTES, line!!, HighlighterLayer.ERROR) }
}
private fun getBlacklistExplanationHTML(language: Language): String {
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
+3 -6
View File
@@ -26,7 +26,7 @@ import com.intellij.openapi.diagnostic.Attachment;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.colors.EditorColors;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.editor.event.CaretEvent;
import com.intellij.openapi.editor.event.CaretListener;
import com.intellij.openapi.editor.event.DocumentEvent;
@@ -35,7 +35,6 @@ import com.intellij.openapi.editor.ex.DocumentEx;
import com.intellij.openapi.editor.markup.HighlighterLayer;
import com.intellij.openapi.editor.markup.HighlighterTargetArea;
import com.intellij.openapi.editor.markup.RangeHighlighter;
import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.fileEditor.impl.text.AsyncEditorLoader;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.project.DumbService;
@@ -1218,14 +1217,12 @@ public final class TemplateState implements Disposable {
}
private RangeHighlighter getSegmentHighlighter(int segmentNumber, boolean isSelected, boolean isEnd) {
final TextAttributes lvAttr = EditorColorsManager.getInstance().getGlobalScheme().getAttributes(EditorColors.LIVE_TEMPLATE_ATTRIBUTES);
TextAttributes attributes = isSelected ? lvAttr : new TextAttributes();
TextAttributes endAttributes = new TextAttributes();
TextAttributesKey attributesKey = isSelected && !isEnd ? EditorColors.LIVE_TEMPLATE_ATTRIBUTES : null;
int start = mySegments.getSegmentStart(segmentNumber);
int end = mySegments.getSegmentEnd(segmentNumber);
RangeHighlighter segmentHighlighter = myEditor.getMarkupModel()
.addRangeHighlighter(start, end, HighlighterLayer.LAST + 1, isEnd ? endAttributes : attributes, HighlighterTargetArea.EXACT_RANGE);
.addRangeHighlighter(attributesKey, start, end, HighlighterLayer.LAST + 1, HighlighterTargetArea.EXACT_RANGE);
segmentHighlighter.setGreedyToLeft(true);
segmentHighlighter.setGreedyToRight(true);
return segmentHighlighter;
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java
+3 -6
View File
@@ -27,14 +27,12 @@ import com.intellij.openapi.components.StoragePathMacros;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.EditorFactory;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.event.*;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.ex.util.EditorUtil;
import com.intellij.openapi.editor.impl.EditorImpl;
import com.intellij.openapi.editor.markup.GutterIconRenderer;
import com.intellij.openapi.editor.markup.RangeHighlighter;
import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.fileEditor.FileDocumentManagerListener;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.FileEditorManagerListener;
@@ -420,11 +418,10 @@ public class XDebuggerManagerImpl extends XDebuggerManager implements Persistent
return;
}
TextAttributes attributes = EditorColorsManager.getInstance().getGlobalScheme().getAttributes(DebuggerColors.NOT_TOP_FRAME_ATTRIBUTES);
Editor editor = e.getEditor();
myCurrentHighlighter = editor.getMarkupModel().addLineHighlighter(lineNumber,
DebuggerColors.EXECUTION_LINE_HIGHLIGHTERLAYER,
attributes);
myCurrentHighlighter = editor.getMarkupModel().addLineHighlighter(DebuggerColors.NOT_TOP_FRAME_ATTRIBUTES,
lineNumber,
DebuggerColors.EXECUTION_LINE_HIGHLIGHTERLAYER);
HintHint hint = new HintHint(e.getMouseEvent()).setAwtTooltip(true).setPreferredPosition(Balloon.Position.above);
String text = UIUtil.removeMnemonic(ActionsBundle.actionText(XDebuggerActions.RUN_TO_CURSOR));
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerSmartStepIntoHandler.java
+2 -2
View File
@@ -357,11 +357,11 @@ public class XDebuggerSmartStepIntoHandler extends XDebuggerSuspendedActionHandl
setCurrentVariantHighlighterAttributes(DebuggerColors.SMART_STEP_INTO_SELECTION);
}
private void setCurrentVariantHighlighterAttributes(TextAttributesKey attributes) {
private void setCurrentVariantHighlighterAttributes(TextAttributesKey attributesKey) {
int index = myVariants.indexOf(myCurrentVariant);
if (index != -1) {
((RangeHighlighterEx)myHighlighters.get(index))
.setTextAttributes(EditorColorsManager.getInstance().getGlobalScheme().getAttributes(attributes));
.setTextAttributesKey(attributesKey);
}
}
xml/dom-impl/src/com/intellij/util/xml/ui/EditorTextFieldControl.java
+2 -7
View File
@@ -7,15 +7,13 @@ import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.colors.CodeInsightColors;
import com.intellij.openapi.editor.event.DocumentEvent;
import com.intellij.openapi.editor.event.DocumentListener;
import com.intellij.openapi.editor.markup.EffectType;
import com.intellij.openapi.editor.markup.MarkupModel;
import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.ui.EditorTextField;
import com.intellij.ui.SimpleTextAttributes;
import com.intellij.util.xml.DomElement;
import com.intellij.util.xml.highlighting.DomElementAnnotationsManager;
import com.intellij.util.xml.highlighting.DomElementProblemDescriptor;
@@ -145,10 +143,7 @@ public abstract class EditorTextFieldControl<T extends JComponent> extends BaseM
final MarkupModel markupModel = editor.getMarkupModel();
markupModel.removeAllHighlighters();
if (!errorProblems.isEmpty() && editor.getDocument().getLineCount() > 0) {
final TextAttributes attributes = SimpleTextAttributes.ERROR_ATTRIBUTES.toTextAttributes();
attributes.setEffectType(EffectType.WAVE_UNDERSCORE);
attributes.setEffectColor(attributes.getForegroundColor());
markupModel.addLineHighlighter(0, 0, attributes);
markupModel.addLineHighlighter(CodeInsightColors.ERRORS_ATTRIBUTES, 0, 0);
editor.getContentComponent().setToolTipText(errorProblems.get(0).getDescriptionTemplate());
}
}