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

notnull

Browse Source
This commit is contained in:
Alexey Kudravtsev
2014-04-24 14:43:27 +04:00
parent 6dd81f8196
commit edb88b8b2a
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-ex/src/com/intellij/injected/editor/MarkupModelWindow.java
+3 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2014 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.
@@ -62,6 +62,7 @@ public class MarkupModelWindow extends UserDataHolderBase implements MarkupModel
return myHostModel.addRangeHighlighter(hostRange.getStartOffset(), hostRange.getEndOffset(), layer, textAttributes, targetArea);
}
@NotNull
@Override
public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(int startOffset,
int endOffset,
@@ -172,7 +173,7 @@ public class MarkupModelWindow extends UserDataHolderBase implements MarkupModel
}
@Override
public void addRangeHighlighter(RangeHighlighterEx marker, int start, int end, boolean greedyToLeft, boolean greedyToRight, int layer) {
public void addRangeHighlighter(@NotNull RangeHighlighterEx marker, int start, int end, boolean greedyToLeft, boolean greedyToRight, int layer) {
}
}
platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/MarkupModelEx.java
+3 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2014 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.
@@ -43,7 +43,7 @@ public interface MarkupModelEx extends MarkupModel {
boolean containsHighlighter(@NotNull RangeHighlighter highlighter);
void addRangeHighlighter(RangeHighlighterEx marker,
void addRangeHighlighter(@NotNull RangeHighlighterEx marker,
int start,
int end,
boolean greedyToLeft,
@@ -61,6 +61,7 @@ public interface MarkupModelEx extends MarkupModel {
DisposableIterator<RangeHighlighterEx> overlappingIterator(int startOffset, int endOffset);
// optimization: creates highlighter and fires only one event: highlighterCreated
@NotNull
RangeHighlighterEx addRangeHighlighterAndChangeAttributes(int startOffset,
int endOffset,
int layer,
platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/EmptyMarkupModel.java
+3 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2014 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.
@@ -59,6 +59,7 @@ public class EmptyMarkupModel implements MarkupModelEx {
throw new ProcessCanceledException();
}
@NotNull
@Override
public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(int startOffset,
int endOffset,
@@ -164,7 +165,7 @@ public class EmptyMarkupModel implements MarkupModelEx {
}
@Override
public void addRangeHighlighter(RangeHighlighterEx marker, int start, int end, boolean greedyToLeft, boolean greedyToRight, int layer) {
public void addRangeHighlighter(@NotNull RangeHighlighterEx marker, int start, int end, boolean greedyToLeft, boolean greedyToRight, int layer) {
}
}
platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java
+3 -1
View File
@@ -105,6 +105,7 @@ public class MarkupModelImpl extends UserDataHolderBase implements MarkupModelEx
return myCachedHighlighters;
}
@NotNull
@Override
public RangeHighlighterEx addRangeHighlighterAndChangeAttributes(int startOffset,
int endOffset,
@@ -119,6 +120,7 @@ public class MarkupModelImpl extends UserDataHolderBase implements MarkupModelEx
false), changeAttributesAction);
}
@NotNull
private RangeHighlighterEx addRangeHighlighter(@NotNull RangeHighlighterImpl highlighter,
@Nullable Consumer<RangeHighlighterEx> changeAttributesAction) {
ApplicationManager.getApplication().assertIsDispatchThread();
@@ -141,7 +143,7 @@ public class MarkupModelImpl extends UserDataHolderBase implements MarkupModelEx
}
@Override
public void addRangeHighlighter(RangeHighlighterEx marker,
public void addRangeHighlighter(@NotNull RangeHighlighterEx marker,
int start,
int end,
boolean greedyToLeft,