Dave Jarvis' Repositories

git clone https://repo.autonoma.ca/repo/keenwrite.git
keenwrite / Commits / 2886b41

Fix index out of bounds.

Authordjarvis <email>
Date2016-12-29 12:01:27 GMT-0800
Commit2886b41034cd5f42e6e1317a38f0836ae7902235
Parent34ae518
Delta7 lines added, 11 lines removed, 4-line decrease
src/main/java/com/scrivenvar/editors/VariableNameInjector.java
private String extractTextChunk() {
final StyledTextArea textArea = getEditor();
- int textBegan = getInitialCaretPosition();
- final int length = textArea.getLength();
- final int remaining = length - textBegan;
- int textEnded = min( remaining, getMaxVarLength() );
+ final int textBegan = getInitialCaretPosition();
+ final int remaining = textArea.getLength() - textBegan;
+ final int textEnded = min( remaining, getMaxVarLength() );
- if( textBegan < 0 ) {
- textBegan = 0;
+ try {
+ return textArea.getText( textBegan, textEnded );
}
-
- if( textEnded >= length ) {
- textEnded = length - 1;
+ catch( final Exception e ) {
+ return textArea.getText();
}
-
- return textArea.getText( textBegan, textEnded );
}