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

diamondify

Browse Source
This commit is contained in:
Egor.Ushakov
2016-03-23 14:54:44 +03:00
parent 9d7e0e419d
commit e7fcbb015c
1 changed files with 10 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/EditorGutterComponentImpl.java
+10 -10
View File
@@ -135,15 +135,15 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
private int myTextAnnotationGuttersSize = 0;
private int myTextAnnotationExtraSize = 0;
private TIntArrayList myTextAnnotationGutterSizes = new TIntArrayList();
private ArrayList<TextAnnotationGutterProvider> myTextAnnotationGutters = new ArrayList<TextAnnotationGutterProvider>();
private final Map<TextAnnotationGutterProvider, EditorGutterAction> myProviderToListener = new HashMap<TextAnnotationGutterProvider, EditorGutterAction>();
private ArrayList<TextAnnotationGutterProvider> myTextAnnotationGutters = new ArrayList<>();
private final Map<TextAnnotationGutterProvider, EditorGutterAction> myProviderToListener = new HashMap<>();
private String myLastGutterToolTip = null;
@NotNull private TIntFunction myLineNumberConvertor;
@Nullable private TIntFunction myAdditionalLineNumberConvertor;
private TIntFunction myLineNumberAreaWidthFunction;
private boolean myShowDefaultGutterPopup = true;
@Nullable private ActionGroup myCustomGutterPopupGroup;
private TIntObjectHashMap<Color> myTextFgColors = new TIntObjectHashMap<Color>();
private TIntObjectHashMap<Color> myTextFgColors = new TIntObjectHashMap<>();
private boolean myPaintBackground = true;
private boolean myLeftFreePaintersAreaShown;
private boolean myRightFreePaintersAreaShown;
@@ -737,7 +737,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
private TIntObjectHashMap<List<GutterMark>> myLineToGutterRenderers;
private void calcLineMarkerAreaWidth() {
myLineToGutterRenderers = new TIntObjectHashMap<List<GutterMark>>();
myLineToGutterRenderers = new TIntObjectHashMap<>();
myLeftFreePaintersAreaShown = myForceLeftFreePaintersAreaShown;
myRightFreePaintersAreaShown = myForceRightFreePaintersAreaShown;
@@ -762,7 +762,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
int line = myEditor.getDocument().getLineNumber(lineStartOffset);
List<GutterMark> renderers = myLineToGutterRenderers.get(line);
if (renderers == null) {
renderers = new SmartList<GutterMark>();
renderers = new SmartList<>();
myLineToGutterRenderers.put(line, renderers);
}
@@ -1426,12 +1426,12 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
}
if (toolTip != null && !toolTip.isEmpty()) {
final Ref<Point> t = new Ref<Point>(e.getPoint());
final Ref<Point> t = new Ref<>(e.getPoint());
int line = EditorUtil.yPositionToLogicalLine(myEditor, e);
List<GutterMark> row = myLineToGutterRenderers.get(line);
Balloon.Position ballPosition = Balloon.Position.atRight;
if (row != null) {
final TreeMap<Integer, GutterMark> xPos = new TreeMap<Integer, GutterMark>();
final TreeMap<Integer, GutterMark> xPos = new TreeMap<>();
final int[] currentPos = {0};
processIconsRow(line, row, new LineGutterIconRendererProcessor() {
@Override
@@ -1445,7 +1445,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
}
});
List<Integer> xx = new ArrayList<Integer>(xPos.keySet());
List<Integer> xx = new ArrayList<>(xPos.keySet());
int posIndex = xx.indexOf(currentPos[0]);
if (xPos.size() > 1 && posIndex == 0) {
ballPosition = Balloon.Position.below;
@@ -1663,7 +1663,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
}
private void revalidateSizes() {
myTextAnnotationGutters = new ArrayList<TextAnnotationGutterProvider>();
myTextAnnotationGutters = new ArrayList<>();
myTextAnnotationGutterSizes = new TIntArrayList();
updateSize();
}
@@ -1742,7 +1742,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
if (myEditor.getMouseEventArea(e) == EditorMouseEventArea.ANNOTATIONS_AREA) {
DefaultActionGroup actionGroup = new DefaultActionGroup(EditorBundle.message("editor.annotations.action.group.name"), true);
actionGroup.add(new CloseAnnotationsAction());
final List<AnAction> addActions = new ArrayList<AnAction>();
final List<AnAction> addActions = new ArrayList<>();
final Point p = e.getPoint();
int line = EditorUtil.yPositionToLogicalLine(myEditor, p);
//if (line >= myEditor.getDocument().getLineCount()) return;