Commit 9518aa4

committed

Ensure line is unfolded when highlighting for error

Fixes #8457 For some reason, getCurrentTab().getTextArea().getFoldManager().ensureOffsetNotInClosedFold(line) doesn't work here; there no documentation on what offset is. Also, getFoldForLine(line) returns null even if the line is folded (bug in rsyntaxtextarea?)

1 parent a5e866f commit 9518aa4Copy full SHA for 9518aa4

File tree

1 file changed

+13

-2

lines changed

app/src/processing/app
- Editor.java

1 file changed

+13

-2

lines changed

`‎app/src/processing/app/Editor.java‎`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,8 @@`
`82`	`82`	`import javax.swing.event.MenuListener;`
`83`	`83`	`import javax.swing.text.BadLocationException;`
`84`	`84`
	`85`	`+import org.fife.ui.rsyntaxtextarea.folding.FoldManager;`
	`86`	`+`
`85`	`87`	`import com.jcraft.jsch.JSchException;`
`86`	`88`
`87`	`89`	`import cc.arduino.CompilerProgressListener;`
`@@ -1648,8 +1650,17 @@ public void removeAllLineHighlights() {`
`1648`	`1650`	`}`
`1649`	`1651`
`1650`	`1652`	`public void addLineHighlight(int line) throws BadLocationException {`
`1651`		`- getCurrentTab().getTextArea().addLineHighlight(line, new Color(1, 0, 0, 0.2f));`
`1652`		`- getCurrentTab().getTextArea().setCaretPosition(getCurrentTab().getTextArea().getLineStartOffset(line));`
	`1653`	`+ SketchTextArea textArea = getCurrentTab().getTextArea();`
	`1654`	`+ FoldManager foldManager = textArea.getFoldManager();`
	`1655`	`+ if (foldManager.isLineHidden(line)) {`
	`1656`	`+ for (int i = 0; i < foldManager.getFoldCount(); i++) {`
	`1657`	`+ if (foldManager.getFold(i).containsLine(line)) {`
	`1658`	`+ foldManager.getFold(i).setCollapsed(false);`
	`1659`	`+ }`
	`1660`	`+ }`
	`1661`	`+ }`
	`1662`	`+ textArea.addLineHighlight(line, new Color(1, 0, 0, 0.2f));`
	`1663`	`+ textArea.setCaretPosition(textArea.getLineStartOffset(line));`
`1653`	`1664`	`}`
`1654`	`1665`
`1655`	`1666`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 9518aa4

File tree

1 file changed

1 file changed

`‎app/src/processing/app/Editor.java‎`

0 commit comments