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

LineMarkerInfo API improvements

Browse Source 
Allow retrieving LineMarkerInfo from RangeHighlighter; don't fire
separate 'created' and 'changed' events when creating a new range
highlighter for line marker
This commit is contained in:
Dmitry Jemerov
2018-03-06 11:55:19 +01:00
parent dacf04677a
commit 8568d85a4e
2 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/codeInsight/daemon/LineMarkerInfo.java
+14 -15
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInsight.daemon;
@@ -25,6 +11,7 @@ import com.intellij.openapi.editor.markup.RangeHighlighter;
import com.intellij.openapi.editor.markup.SeparatorPlacement;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
@@ -39,6 +26,8 @@ import java.awt.*;
public class LineMarkerInfo<T extends PsiElement> {
private static final Logger LOG = Logger.getInstance(LineMarkerInfo.class);
public static final Key<LineMarkerInfo> LINE_MARKER_INFO = Key.create("LINE_MARKER_INFO");
protected final Icon myIcon;
private final SmartPsiElementPointer<T> elementRef;
public final int startOffset;
@@ -120,6 +109,11 @@ public class LineMarkerInfo<T extends PsiElement> {
this(element, startOffset, icon, updatePass, tooltipProvider, navHandler, GutterIconRenderer.Alignment.RIGHT);
}
@Nullable
public Icon getIcon() {
return myIcon;
}
@Nullable
public GutterIconRenderer createGutterRenderer() {
if (myIcon == null) return null;
@@ -152,6 +146,11 @@ public class LineMarkerInfo<T extends PsiElement> {
return myNavigationHandler;
}
@SuppressWarnings({"unused", "unchecked"})
public static <T extends PsiElement> LineMarkerInfo<T> fromRangeHighlighter(RangeHighlighter rangeHighlighter) {
return (LineMarkerInfo<T>) rangeHighlighter.getUserData(LINE_MARKER_INFO);
}
public static class LineMarkerGutterIconRenderer<T extends PsiElement> extends GutterIconRenderer {
private final LineMarkerInfo<T> myInfo;
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersUtil.java
+39 -38
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInsight.daemon.impl;
import com.intellij.codeInsight.daemon.LineMarkerInfo;
@@ -26,7 +12,6 @@ import com.intellij.openapi.editor.impl.DocumentMarkupModel;
import com.intellij.openapi.editor.markup.*;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.Segment;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
@@ -94,38 +79,54 @@ class LineMarkersUtil {
}
}
private static final Key<LineMarkerInfo> LINE_MARKER_INFO = Key.create("LINE_MARKER_INFO");
@NotNull
private static RangeHighlighter createOrReuseLineMarker(@NotNull LineMarkerInfo info,
@NotNull MarkupModel markupModel,
@NotNull MarkupModelEx markupModel,
@Nullable HighlightersRecycler toReuse) {
LineMarkerInfo.LineMarkerGutterIconRenderer newRenderer = (LineMarkerInfo.LineMarkerGutterIconRenderer)info.createGutterRenderer();
RangeHighlighter highlighter = toReuse == null ? null : toReuse.pickupHighlighterFromGarbageBin(info.startOffset, info.endOffset, HighlighterLayer.ADDITIONAL_SYNTAX);
boolean newHighlighter = false;
if (highlighter == null) {
highlighter = markupModel.addRangeHighlighter(info.startOffset, info.endOffset, HighlighterLayer.ADDITIONAL_SYNTAX, null, HighlighterTargetArea.LINES_IN_RANGE);
newHighlighter = true;
highlighter = markupModel.addRangeHighlighterAndChangeAttributes(
info.startOffset, info.endOffset,
HighlighterLayer.ADDITIONAL_SYNTAX, null, HighlighterTargetArea.LINES_IN_RANGE, false,
markerEx -> {
markerEx.setGutterIconRenderer(newRenderer);
markerEx.setLineSeparatorColor(info.separatorColor);
markerEx.setLineSeparatorPlacement(info.separatorPlacement);
markerEx.putUserData(LineMarkerInfo.LINE_MARKER_INFO, info);
});
MarkupEditorFilter editorFilter = info.getEditorFilter();
if (editorFilter != MarkupEditorFilter.EMPTY) {
highlighter.setEditorFilter(editorFilter);
}
}
highlighter.putUserData(LINE_MARKER_INFO, info);
LineMarkerInfo.LineMarkerGutterIconRenderer newRenderer = (LineMarkerInfo.LineMarkerGutterIconRenderer)info.createGutterRenderer();
LineMarkerInfo.LineMarkerGutterIconRenderer oldRenderer = highlighter.getGutterIconRenderer() instanceof LineMarkerInfo.LineMarkerGutterIconRenderer ? (LineMarkerInfo.LineMarkerGutterIconRenderer)highlighter.getGutterIconRenderer() : null;
boolean rendererChanged = oldRenderer == null || newRenderer == null || !newRenderer.equals(oldRenderer);
boolean lineSeparatorColorChanged = !Comparing.equal(highlighter.getLineSeparatorColor(), info.separatorColor);
boolean lineSeparatorPlacementChanged = !Comparing.equal(highlighter.getLineSeparatorPlacement(), info.separatorPlacement);
if (rendererChanged || lineSeparatorColorChanged || lineSeparatorPlacementChanged) {
((MarkupModelEx)markupModel).changeAttributesInBatch((RangeHighlighterEx)highlighter, markerEx -> {
if (rendererChanged) {
markerEx.setGutterIconRenderer(newRenderer);
}
if (lineSeparatorColorChanged) {
markerEx.setLineSeparatorColor(info.separatorColor);
}
if (lineSeparatorPlacementChanged) {
markerEx.setLineSeparatorPlacement(info.separatorPlacement);
}
});
if (!newHighlighter) {
highlighter.putUserData(LineMarkerInfo.LINE_MARKER_INFO, info);
LineMarkerInfo.LineMarkerGutterIconRenderer oldRenderer = highlighter.getGutterIconRenderer() instanceof LineMarkerInfo.LineMarkerGutterIconRenderer ? (LineMarkerInfo.LineMarkerGutterIconRenderer)highlighter.getGutterIconRenderer() : null;
boolean rendererChanged = oldRenderer == null || newRenderer == null || !newRenderer.equals(oldRenderer);
boolean lineSeparatorColorChanged = !Comparing.equal(highlighter.getLineSeparatorColor(), info.separatorColor);
boolean lineSeparatorPlacementChanged = !Comparing.equal(highlighter.getLineSeparatorPlacement(), info.separatorPlacement);
if (rendererChanged || lineSeparatorColorChanged || lineSeparatorPlacementChanged) {
markupModel.changeAttributesInBatch((RangeHighlighterEx)highlighter, markerEx -> {
if (rendererChanged) {
markerEx.setGutterIconRenderer(newRenderer);
}
if (lineSeparatorColorChanged) {
markerEx.setLineSeparatorColor(info.separatorColor);
}
if (lineSeparatorPlacementChanged) {
markerEx.setLineSeparatorPlacement(info.separatorPlacement);
}
});
}
}
info.highlighter = highlighter;
return highlighter;
@@ -149,6 +150,6 @@ class LineMarkersUtil {
}
private static LineMarkerInfo getLineMarkerInfo(@NotNull RangeHighlighter highlighter) {
return highlighter.getUserData(LINE_MARKER_INFO);
return highlighter.getUserData(LineMarkerInfo.LINE_MARKER_INFO);
}
}