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

End offset of highlightInfo processing in updateHighlightersByTyping shouldn't depend on a document change length

Browse Source
This commit is contained in:
Alexander.Kirsanov
2016-09-06 18:05:43 +03:00
parent 12c7bcc090
commit 65fe6ddae9
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java
+11 -15
View File
@@ -439,28 +439,24 @@ public class UpdateHighlightersUtil {
assertMarkupConsistent(markup, project);
final int start = e.getOffset() - 1;
final int end = start + Math.max(e.getOldLength(), e.getNewLength());
final int end = start + e.getOldLength();
final List<HighlightInfo> toRemove = new ArrayList<>();
DaemonCodeAnalyzerEx.processHighlights(document, project, null, start, end, info -> {
if (!info.needUpdateOnTyping()) return true;
RangeHighlighter highlighter = info.highlighter;
boolean remove = false;
if (info.needUpdateOnTyping()) {
int highlighterStart = highlighter.getStartOffset();
int highlighterEnd = highlighter.getEndOffset();
if (info.isAfterEndOfLine()) {
if (highlighterStart < document.getTextLength()) {
highlighterStart += 1;
}
if (highlighterEnd < document.getTextLength()) {
highlighterEnd += 1;
}
int highlighterStart = highlighter.getStartOffset();
int highlighterEnd = highlighter.getEndOffset();
if (info.isAfterEndOfLine()) {
if (highlighterStart < document.getTextLength()) {
highlighterStart += 1;
}
if (!highlighter.isValid() || start < highlighterEnd && highlighterStart <= end) {
remove = true;
if (highlighterEnd < document.getTextLength()) {
highlighterEnd += 1;
}
}
if (remove) {
if (!highlighter.isValid() || start < highlighterEnd && highlighterStart <= end) {
toRemove.add(info);
}
return true;