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

some range validity assertions (EA-36548)

Browse Source
This commit is contained in:
peter
2012-06-20 19:33:06 +02:00
parent 99880d3fe7
commit 2c595e64ee
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
+5
View File
@@ -341,8 +341,11 @@ public class TemplateState implements Disposable {
mySegments.addSegment(segmentOffset, segmentOffset);
}
LOG.assertTrue(myTemplateRange.isValid());
calcResults(false);
LOG.assertTrue(myTemplateRange.isValid());
calcResults(false); //Fixed SCR #[vk500] : all variables should be recalced twice on start.
LOG.assertTrue(myTemplateRange.isValid());
doReformat(null);
int nextVariableNumber = getNextVariableNumber(-1);
@@ -377,6 +380,7 @@ public class TemplateState implements Disposable {
public void run() {
IntArrayList indices = initEmptyVariables();
mySegments.setSegmentsGreedy(false);
LOG.assertTrue(myTemplateRange.isValid());
reformat(finalRangeMarker);
mySegments.setSegmentsGreedy(true);
restoreEmptyVariables(indices);
@@ -984,6 +988,7 @@ public class TemplateState implements Disposable {
// and reformat wouldn't be able to fix them
if (myTemplate.isToIndent()) {
if (!myTemplateIndented) {
LOG.assertTrue(myTemplateRange.isValid());
smartIndent(myTemplateRange.getStartOffset(), myTemplateRange.getEndOffset());
myTemplateIndented = true;
}