upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 22:27:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed indent highlight being on the wrong braces block when braces are highlighted

Browse Source
This commit is contained in:
bigguy345 committed 2025-12-22 01:10:24 +02:00
1 parent 292c695eb6
commit 51aca95590
1 file changed
+26 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java
+26 -4
View File
@@ -494,8 +494,8 @@ public class GuiScriptTextArea extends GuiNpcTextField {
int bracketLineIdx = -1;
// Only consider curly braces for highlighting the indent guides
boolean isCurlyBracket = false;
char bc = text.charAt(startBracket);
if (text != null && startBracket >= 0 && startBracket < text.length()) {
char bc = text.charAt(startBracket);
if (bc == '{' || bc == '}') isCurlyBracket = true;
}
for (int li = 0; li < list.size(); li++) {
@@ -506,13 +506,35 @@ public class GuiScriptTextArea extends GuiNpcTextField {
}
}
if (bracketLineIdx >= 0 && isCurlyBracket) {
// Prefer a span that directly matches the bracket character's line:
// - if the bracket is an opening '{', prefer spans where openLine == bracketLineIdx
// - if the bracket is a closing '}', prefer spans where closeLine == bracketLineIdx
// If no exact match is found, fall back to the smallest enclosing span (innermost).
int bestSize = Integer.MAX_VALUE;
boolean foundExact = false;
char bracketChar = bc; // from earlier
for (int[] span : braceSpans) {
int openLine = span[1];
int closeLine = span[2];
if (bracketLineIdx >= openLine && bracketLineIdx <= closeLine) {
highlightedOpenLine = openLine;
highlightedCloseLine = closeLine;
break;
int size = closeLine - openLine;
boolean exactMatch = (bracketChar == '{' && openLine == bracketLineIdx) || (bracketChar == '}' && closeLine == bracketLineIdx);
if (exactMatch) {
// Prefer exact matches immediately (still choose smallest exact span)
if (!foundExact || size < bestSize) {
foundExact = true;
bestSize = size;
highlightedOpenLine = openLine;
highlightedCloseLine = closeLine;
}
} else if (!foundExact) {
// keep the smallest enclosing span as a fallback
if (size < bestSize) {
bestSize = size;
highlightedOpenLine = openLine;
highlightedCloseLine = closeLine;
}
}
}
}
}