mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-18 21:59:05 +00:00
Drawn all unclosed/missing
braces in RED
This commit is contained in:
1 parent
af0553ba0d
commit
49a5159810
2 files changed
+94
-2
No files matched your search
@@ -331,10 +331,12 @@ public class GuiScriptTextArea extends GuiNpcTextField {
|
||||
}
|
||||
|
||||
List<JavaTextContainer.LineData> list = new ArrayList<>(container.lines);
|
||||
|
||||
|
||||
// Build brace spans: {origDepth, open line, close line, adjustedDepth}
|
||||
List<int[]> braceSpans = BracketMatcher.computeBraceSpans(text, list);
|
||||
|
||||
// Always highlight unmatched braces (positions in text)
|
||||
List<Integer> unmatchedBraces = BracketMatcher.findUnmatchedBracePositions(text);
|
||||
|
||||
// Determine which exact brace span (openLine/closeLine) should be highlighted based on bracket under caret
|
||||
int highlightedOpenLine = -1;
|
||||
int highlightedCloseLine = -1;
|
||||
@@ -432,6 +434,18 @@ public class GuiScriptTextArea extends GuiNpcTextField {
|
||||
drawRect(x + LINE_NUMBER_GUTTER_WIDTH + 1 + s, posY, x + LINE_NUMBER_GUTTER_WIDTH + 1 + e, posY + container.lineHeight + 0, 0x9900cc00);
|
||||
}
|
||||
}
|
||||
|
||||
// Highlight unmatched braces in this line (always red)
|
||||
if (unmatchedBraces != null && !unmatchedBraces.isEmpty()) {
|
||||
for (int ubPos : unmatchedBraces) {
|
||||
if (ubPos >= data.start && ubPos < data.end) {
|
||||
int rel = ubPos - data.start;
|
||||
int s = ClientProxy.Font.width(line.substring(0, rel));
|
||||
int e = ClientProxy.Font.width(line.substring(0, rel + 1)) + 1;
|
||||
drawRect(x + LINE_NUMBER_GUTTER_WIDTH + 1 + s, posY, x + LINE_NUMBER_GUTTER_WIDTH + 1 + e, posY + container.lineHeight, 0xffcc0000);
|
||||
}
|
||||
}
|
||||
}
|
||||
//Highlight words
|
||||
if (highlightedWord != null) {
|
||||
Matcher m = container.regexWord.matcher(line);
|
||||
|
||||
@@ -52,6 +52,84 @@ public class BracketMatcher {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find all unmatched brace positions (both opens and closes) in the text.
|
||||
* Returns a list of character indices into the text for braces that have no matching pair.
|
||||
*/
|
||||
public static List<Integer> findUnmatchedBracePositions(String text) {
|
||||
List<Integer> unmatched = new ArrayList<>();
|
||||
if (text == null || text.isEmpty()) return unmatched;
|
||||
|
||||
List<int[]> stack = new ArrayList<>(); // {char, pos}
|
||||
|
||||
boolean inLineComment = false;
|
||||
boolean inBlockComment = false;
|
||||
boolean inString = false;
|
||||
boolean escape = false;
|
||||
char stringDelimiter = 0;
|
||||
|
||||
for (int pos = 0; pos < text.length(); pos++) {
|
||||
char c = text.charAt(pos);
|
||||
char next = pos + 1 < text.length() ? text.charAt(pos + 1) : 0;
|
||||
|
||||
if (inString) {
|
||||
if (escape) { escape = false; }
|
||||
else if (c == '\\') { escape = true; }
|
||||
else if (c == stringDelimiter) { inString = false; }
|
||||
else if (c == '\n') { inString = false; }
|
||||
continue;
|
||||
}
|
||||
|
||||
if (inBlockComment) {
|
||||
if (c == '*' && next == '/') { inBlockComment = false; pos++; }
|
||||
continue;
|
||||
}
|
||||
|
||||
if (inLineComment) {
|
||||
if (c == '\n') { inLineComment = false; }
|
||||
continue;
|
||||
}
|
||||
|
||||
if (c == '/' && next == '/') { inLineComment = true; pos++; continue; }
|
||||
if (c == '/' && next == '*') { inBlockComment = true; pos++; continue; }
|
||||
|
||||
if (c == '"' || c == '\'') {
|
||||
inString = true;
|
||||
stringDelimiter = c;
|
||||
escape = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (c == '{' || c == '[' || c == '(') {
|
||||
stack.add(new int[]{c, pos});
|
||||
} else if (c == '}' || c == ']' || c == ')') {
|
||||
if (!stack.isEmpty()) {
|
||||
int[] top = stack.get(stack.size() - 1);
|
||||
char topc = (char) top[0];
|
||||
char expectOpen = (c == '}') ? '{' : (c == ']') ? '[' : '(';
|
||||
if (topc == expectOpen) {
|
||||
stack.remove(stack.size() - 1);
|
||||
continue;
|
||||
} else {
|
||||
// mismatched: mark this close as unmatched
|
||||
unmatched.add(pos);
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
// closing with no opens
|
||||
unmatched.add(pos);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// any remaining opens on stack are unmatched
|
||||
for (int[] open : stack) {
|
||||
unmatched.add(open[1]);
|
||||
}
|
||||
|
||||
return unmatched;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find closing bracket, returns offset from start or 0 if not found
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user