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

stricter assertion: literal escaper must return valid offsets from its.getOffsetInHost() for all offsets which it was able to decode

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-10-05 18:01:43 +03:00
parent ebe6d594df
commit 8638c0d424
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectionRegistrarImpl.java
+3 -4
View File
@@ -187,12 +187,11 @@ class InjectionRegistrarImpl extends MultiHostRegistrarImpl implements MultiHost
// if there are invalid chars, adjust the range
int charsDecodedSuccessfully = outChars.length() - before;
int startOffsetInHost = textEscaper.getOffsetInHost(0, info.registeredRangeInsideHost);
assert startOffsetInHost <= relevantRange.getEndOffset() : textEscaper.getClass() +" .getOffsetInHost(0) = "+startOffsetInHost+" while its relevantRange="+relevantRange;
assert relevantRange.containsOffset(startOffsetInHost) : textEscaper.getClass() +" is inconsistent: its.getOffsetInHost(0) = "+startOffsetInHost+" while its relevantRange="+relevantRange;
int endOffsetInHost = textEscaper.getOffsetInHost(charsDecodedSuccessfully, info.registeredRangeInsideHost);
assert endOffsetInHost <= relevantRange.getEndOffset() : textEscaper.getClass() +" .getOffsetInHost(" + charsDecodedSuccessfully +
assert relevantRange.containsOffset(endOffsetInHost) : textEscaper.getClass() +" is inconsistent: its.getOffsetInHost(" + charsDecodedSuccessfully +
") = "+startOffsetInHost+" while its relevantRange="+relevantRange;
ProperTextRange successfulHostRange = new ProperTextRange(Math.max(relevantRange.getStartOffset(), startOffsetInHost),
Math.max(relevantRange.getStartOffset(), endOffsetInHost));
ProperTextRange successfulHostRange = new ProperTextRange(startOffsetInHost, endOffsetInHost);
relevantRange = relevantRange.intersection(successfulHostRange);
}
}