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

rename field for clarity

Browse Source 
GitOrigin-RevId: 0581e7cb69bdc2c100c08cd2396513e82c02b5c7
This commit is contained in:
Alexey Kudravtsev
2024-09-30 17:53:45 +00:00
committed by intellij-monorepo-bot
parent b238ba6e1e
commit 77000cdb9f
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+7 -10
View File
@@ -44,10 +44,7 @@ import com.intellij.openapi.editor.impl.stickyLines.VisualStickyLines;
import com.intellij.openapi.editor.impl.stickyLines.ui.StickyLineShadowPainter;
import com.intellij.openapi.editor.impl.stickyLines.ui.StickyLinesPanel;
import com.intellij.openapi.editor.impl.view.EditorView;
import com.intellij.openapi.editor.markup.GutterDraggableObject;
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.editor.markup.*;
import com.intellij.openapi.editor.state.ObservableStateListener;
import com.intellij.openapi.editor.toolbar.floating.EditorFloatingToolbar;
import com.intellij.openapi.fileEditor.FileDocumentManager;
@@ -231,7 +228,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
private @NotNull EditorColorsScheme myScheme;
private final @NotNull SelectionModelImpl mySelectionModel;
private final @NotNull EditorMarkupModelImpl myMarkupModel;
private final @NotNull EditorFilteringMarkupModelEx myDocumentMarkupModel;
private final @NotNull EditorFilteringMarkupModelEx myEditorFilteringMarkupModel;
private final @NotNull MarkupModelListener myMarkupModelListener;
private final @NotNull List<HighlighterListener> myHighlighterListeners = ContainerUtil.createLockFreeCopyOnWriteList();
@@ -386,7 +383,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
mySelectionModel = new SelectionModelImpl(this);
myMarkupModel = new EditorMarkupModelImpl(this);
myDocumentMarkupModel = new EditorFilteringMarkupModelEx(this, documentMarkup);
myEditorFilteringMarkupModel = new EditorFilteringMarkupModelEx(this, documentMarkup);
myFoldingModel = new FoldingModelImpl(this);
myCaretModel = new CaretModelImpl(this);
myScrollingModel = new ScrollingModelImpl(this);
@@ -493,7 +490,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
}
}, myCaretModel);
myDocumentMarkupModel.addMarkupModelListener(myCaretModel, myMarkupModelListener);
myEditorFilteringMarkupModel.addMarkupModelListener(myCaretModel, myMarkupModelListener);
myMarkupModel.addMarkupModelListener(myCaretModel, myMarkupModelListener);
myDocument.addDocumentListener(myFoldingModel, myCaretModel);
myDocument.addDocumentListener(myCaretModel, myCaretModel);
@@ -978,7 +975,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
@Override
public @NotNull MarkupModelEx getFilteredDocumentMarkupModel() {
return myDocumentMarkupModel;
return myEditorFilteringMarkupModel;
}
@Override
@@ -3863,7 +3860,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
return;
}
for (RangeHighlighter highlighter : myDocumentMarkupModel.getDelegate().getAllHighlighters()) {
for (RangeHighlighter highlighter : myEditorFilteringMarkupModel.getDelegate().getAllHighlighters()) {
boolean oldAvailable = oldFilter.test(highlighter);
boolean newAvailable = myHighlightingFilter.test(highlighter);
if (oldAvailable != newAvailable) {
@@ -5947,7 +5944,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
private @Nullable StickyLinesManager createStickyLinesPanel() {
if (myProject != null && myKind == EditorKind.MAIN_EDITOR && !isMirrored()) {
StickyLinesModel stickyModel = StickyLinesModel.getModel(myDocumentMarkupModel.getDelegate());
StickyLinesModel stickyModel = StickyLinesModel.getModel(myEditorFilteringMarkupModel.getDelegate());
VisualStickyLines visualStickyLines = new VisualStickyLines(this, stickyModel);
StickyLineShadowPainter shadowPainter = new StickyLineShadowPainter();
StickyLinesPanel stickyPanel = new StickyLinesPanel(this, shadowPainter, visualStickyLines);