This revision includes some cosmetic changes in comments in

rcartwright · rcartwright · commit fe8313235aad · 2012-08-17T11:09:48.000Z
Indenter.java and a very small patch to fix a bug that arose in
MovingDocumentRegion.java.

The following files were modified:

M    src/edu/rice/cs/drjava/model/definitions/indent/Indenter.java
M    src/edu/rice/cs/drjava/model/MovingDocumentRegion.java


git-svn-id: file:///tmp/test-svn/trunk@5677 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/src/edu/rice/cs/drjava/model/MovingDocumentRegion.java b/drjava/src/edu/rice/cs/drjava/model/MovingDocumentRegion.java
@@ -103,7 +103,9 @@ public String value() {
           
           // Construct the matching string and compressed selection prefix and suffix strings within text
           String prefix, match, suffix;
-          if (excerptLength < startRed) { // selection not included in excerpt
+          // Added the predicate "startRed < 0" because "text.substring(startRed, endRed)" threw an 
+          // IndexOutOfBoundsException with startRed == -18. Perhaps editing text in question created this situation.
+          if (excerptLength < startRed || startRed < 0) { // selection not included in excerpt
             prefix = StringOps.compress(text.substring(0, excerptLength));
             match = " ...";
             suffix = "";
diff --git a/drjava/src/edu/rice/cs/drjava/model/definitions/indent/Indenter.java b/drjava/src/edu/rice/cs/drjava/model/definitions/indent/Indenter.java
@@ -116,6 +116,7 @@ public void buildTree(int indentLevel) {
       rule14 = new QuestionNewParenPhrase(rule15, rule16),  // is current non ) line a new phrase after open paren?
       rule23 = new QuestionNewParenPhrase(rule30, rule38),  // is current ) line a new phrase after open paren?
       rule21 = new QuestionCurrLineStartsWith(")", rule23, rule14), // does current line start with ')'?
+      
       // root of non-comment indent tree: is brace enclosing start of this line in { '(', '['}?  
       rule13 = new QuestionBraceIsParenOrBracket(rule21, rule17),   
       
