Skip to content

Commit 743891e

Browse files
committed
fix GlslIntentTask offset
1 parent 21444a9 commit 743891e

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

jme3-core/src/com/jme3/gde/core/CopyTemplateHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class CopyTemplateHandler extends CreateFromTemplateHandler {
5454
@Override
5555
protected boolean accept(CreateDescriptor cd) {
5656
String ext = cd.getTemplate().getExt();
57-
return ext.startsWith("j3") || ext.equals("blend") || ext.equals("frag") || ext.equals("vert"); /* Add your own binary extensions here !! */
57+
return ext.startsWith("j3") || ext.equals("blend"); /* Add your own binary extensions here !! */
5858
}
5959

6060
@Override

jme3-glsl-highlighter/src/com/jme3/gde/glsl/highlighter/editor/GlslIndentTask.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,13 @@ public void reindent() throws BadLocationException {
5555
context.setCaretOffset(1);
5656
final Document doc = context.document();
5757
int indentModifier = 0;
58+
59+
int startOffset = context.startOffset();
60+
int startOffsetBounded = Math.max(startOffset - 1, 0);
5861

5962
//Check if previous line ends with a {
60-
int previousLineLength = context.startOffset() - 1 - context.lineStartOffset(context.startOffset() - 1);
61-
String previousLine = doc.getText(context.lineStartOffset(context.startOffset() - 1), previousLineLength);
63+
int previousLineLength = Math.max(startOffset - 1 - context.lineStartOffset(startOffsetBounded), 0);
64+
String previousLine = doc.getText(context.lineStartOffset(startOffsetBounded), previousLineLength);
6265

6366
//Hook other reasons for changes in indentation into this for loop
6467
for (int i = previousLineLength - 1; i >= 0; i--) {
@@ -69,8 +72,8 @@ public void reindent() throws BadLocationException {
6972
break;
7073
}
7174
}
72-
int previousLineIndent = context.lineIndent(context.lineStartOffset(context.startOffset() - 1));
73-
context.modifyIndent(context.startOffset(), previousLineIndent + indentModifier);
75+
int previousLineIndent = context.lineIndent(context.lineStartOffset(startOffsetBounded));
76+
context.modifyIndent(startOffset, previousLineIndent + indentModifier);
7477
}
7578

7679
@Override

0 commit comments

Comments
 (0)