handle fall-through cases for plain text file editing (fixes #5628)

benfry · benfry · commit d3e06933bf70 · 2019-01-28T15:10:56.000-05:00
diff --git a/app/src/processing/app/syntax/JEditTextArea.java b/app/src/processing/app/syntax/JEditTextArea.java
@@ -594,8 +594,7 @@ public int lineToY(int line) {
   public int yToLine(int y) {
     FontMetrics fm = painter.getFontMetrics();
     int height = fm.getHeight();
-    return Math.max(0,Math.min(getLineCount() - 1,
-        y / height + firstLine));
+    return Math.max(0, Math.min(getLineCount() - 1, y / height + firstLine));
   }
 
 
@@ -1033,8 +1032,10 @@ public final void getText(int start, int len, Segment segment) {
     try {
       document.getText(start,len,segment);
 
-    } catch(BadLocationException bl) {
+    } catch (BadLocationException bl) {
       bl.printStackTrace();
+      System.err.format("Bad Location: %d for start %d and length %d",
+                        bl.offsetRequested(), start, len);
       segment.offset = segment.count = 0;
     }
   }
diff --git a/app/src/processing/app/syntax/TextAreaPainter.java b/app/src/processing/app/syntax/TextAreaPainter.java
@@ -604,12 +604,6 @@ public Segment getCurrentLine() {
   }
 
 
-//  /** Old paintLine() method with kooky args order, kept around for X Mode. */
-//  @Deprecated
-//  protected void paintLine(Graphics gfx, TokenMarker tokenMarker,
-//                           int line, int x) {
-//    Font defaultFont = getFont();
-//    Color defaultColor = getForeground();
   protected void paintLine(Graphics gfx, int line, int x,
                            TokenMarkerState tokenMarker) {
     currentLineIndex = line;
@@ -625,40 +619,37 @@ protected void paintLine(Graphics gfx, int line, int x,
   }
 
 
-//  protected void paintLine(Graphics gfx, int line, int x,
-//                           TokenMarker tokenMarker) {
-//    paintLine(gfx, tokenMarker, line, x);
-//  }
-
-
-//  protected void paintPlainLine(Graphics gfx, int line, Font defaultFont,
-//                                Color defaultColor, int x, int y) {
   protected void paintPlainLine(Graphics gfx, int line, int x, int y) {
-    paintHighlight(gfx,line,y);
-    textArea.getLineText(line, currentLine);
+    paintHighlight(gfx, line, y);
 
-//    gfx.setFont(plainFont);
-//    gfx.setFont(defaultFont);
-//    gfx.setColor(defaultColor);
+    // don't try to draw lines past where they exist in the document
+    // https://github.com/processing/processing/issues/5628
+    if (line < textArea.getLineCount()) {
+      textArea.getLineText(line, currentLine);
 
-    int x0 = x - textArea.getHorizontalOffset();
+      int x0 = x - textArea.getHorizontalOffset();
+      // prevent the blinking from drawing with last color used
+      // https://github.com/processing/processing/issues/5628
+      gfx.setColor(defaults.fgcolor);
+      gfx.setFont(plainFont);
 
-    y += fm.getHeight();
-    // doesn't respect fixed width like it should
+      y += fm.getHeight();
+      // doesn't respect fixed width like it should
 //    x = Utilities.drawTabbedText(currentLine, x, y, gfx, this, 0);
 //    int w = fm.charWidth(' ');
-    for (int i = 0; i < currentLine.count; i++) {
-      gfx.drawChars(currentLine.array, currentLine.offset+i, 1, x, y);
-      x = currentLine.array[currentLine.offset + i] == '\t' ?
+      for (int i = 0; i < currentLine.count; i++) {
+        gfx.drawChars(currentLine.array, currentLine.offset+i, 1, x, y);
+        x = currentLine.array[currentLine.offset + i] == '\t' ?
           x0 + (int)nextTabStop(x - x0, i) :
           x + fm.charWidth(currentLine.array[currentLine.offset+i]);
-      textArea.offsetToX(line, currentLine.offset + i);
-    }
+        //textArea.offsetToX(line, currentLine.offset + i);
+      }
 
-    // Draw characters via input method.
-    if (compositionTextPainter != null &&
+      // Draw characters via input method.
+      if (compositionTextPainter != null &&
         compositionTextPainter.hasComposedTextLayout()) {
-      compositionTextPainter.draw(gfx, defaults.lineHighlightColor);
+        compositionTextPainter.draw(gfx, defaults.lineHighlightColor);
+      }
     }
     if (defaults.eolMarkers) {
       gfx.setColor(defaults.eolMarkerColor);
@@ -667,9 +658,6 @@ protected void paintPlainLine(Graphics gfx, int line, int x, int y) {
   }
 
 
-//  protected void paintSyntaxLine(Graphics gfx, TokenMarker tokenMarker,
-//                                 int line, Font defaultFont,
-//                                 Color defaultColor, int x, int y) {
   protected void paintSyntaxLine(Graphics gfx, int line, int x, int y,
                                  TokenMarkerState tokenMarker) {
     textArea.getLineText(currentLineIndex, currentLine);
diff --git a/todo.txt b/todo.txt
@@ -1,6 +1,10 @@
 0269 (3.5.3)
+X added reference for circle(), square(), push(), pop()
+_   has the reference.zip file been fixed?
 X redo key command for Windows screwed up
 X   https://github.com/processing/processing/issues/5773
+X fix an editor problem with plain text (css, etc) files
+X   https://github.com/processing/processing/issues/5628
 
 
 contrib

Original file line number	Diff line number	Diff line change
`@@ -594,8 +594,7 @@ public int lineToY(int line) {`
`594`	`594`	`public int yToLine(int y) {`
`595`	`595`	`FontMetrics fm = painter.getFontMetrics();`
`596`	`596`	`int height = fm.getHeight();`
`597`		`- return Math.max(0,Math.min(getLineCount() - 1,`
`598`		`- y / height + firstLine));`
	`597`	`+ return Math.max(0, Math.min(getLineCount() - 1, y / height + firstLine));`
`599`	`598`	`}`
`600`	`599`
`601`	`600`
`@@ -1033,8 +1032,10 @@ public final void getText(int start, int len, Segment segment) {`
`1033`	`1032`	`try {`
`1034`	`1033`	`document.getText(start,len,segment);`
`1035`	`1034`
`1036`		`- } catch(BadLocationException bl) {`
	`1035`	`+ } catch (BadLocationException bl) {`
`1037`	`1036`	`bl.printStackTrace();`
	`1037`	`+ System.err.format("Bad Location: %d for start %d and length %d",`
	`1038`	`+ bl.offsetRequested(), start, len);`
`1038`	`1039`	`segment.offset = segment.count = 0;`
`1039`	`1040`	`}`
`1040`	`1041`	`}`