Skip to content

Fix shader template files creating empty files instead of proper template content #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neph1 merged 4 commits into from
Sep 25, 2025
Merged

Fix shader template files creating empty files instead of proper template content #682

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
551cf00
Initial plan
Copilot Sep 20, 2025
21444a9
Fix shader template files creating empty files by adding frag/vert ex…
Copilot Sep 20, 2025
743891e
fix GlslIntentTask offset
neph1 Sep 20, 2025
79a9233
use bounded value
neph1 Sep 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions jme3-glsl-highlighter/src/com/jme3/gde/glsl/highlighter/editor/GlslIndentTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,13 @@ public void reindent() throws BadLocationException {
context.setCaretOffset(1);
final Document doc = context.document();
int indentModifier = 0;

int startOffset = context.startOffset();
int startOffsetBounded = Math.max(startOffset - 1, 0);

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

//Hook other reasons for changes in indentation into this for loop
for (int i = previousLineLength - 1; i >= 0; i--) {
Expand All @@ -69,8 +72,8 @@ public void reindent() throws BadLocationException {
break;
}
}
int previousLineIndent = context.lineIndent(context.lineStartOffset(context.startOffset() - 1));
context.modifyIndent(context.startOffset(), previousLineIndent + indentModifier);
int previousLineIndent = context.lineIndent(context.lineStartOffset(startOffsetBounded));
context.modifyIndent(startOffset, previousLineIndent + indentModifier);
}

@Override
Expand Down