From 0c179d280f43860a2f19ef338e804fac02aa4b23 Mon Sep 17 00:00:00 2001 From: A Pottinger Date: Tue, 21 Jun 2022 08:50:50 -0700 Subject: [PATCH] Fix #444 by removing old regex parsing. It looks like there's still some left over regex parsing to check for missing braces from before the new preproc. The new preproc will catch the error and testing makes it look like this old regex check is not triggering anyway outside of comments (which is an issue reported in #444). --- .../processing/mode/java/ErrorChecker.java | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/java/src/processing/mode/java/ErrorChecker.java b/java/src/processing/mode/java/ErrorChecker.java index 982f41e6f..44f9f1944 100644 --- a/java/src/processing/mode/java/ErrorChecker.java +++ b/java/src/processing/mode/java/ErrorChecker.java @@ -101,11 +101,6 @@ class ErrorChecker { problems.addAll(curlyQuoteProblems); } - if (problems.isEmpty()) { // Check for missing braces - List missingBraceProblems = checkForMissingBraces(ps); - problems.addAll(missingBraceProblems); - } - if (problems.isEmpty()) { AtomicReference searchClassPath = new AtomicReference<>(null); @@ -283,52 +278,6 @@ class ErrorChecker { } - static private List checkForMissingBraces(PreprocSketch ps) { - List problems = new ArrayList<>(0); - for (int tabIndex = 0; tabIndex < ps.tabStartOffsets.length; tabIndex++) { - int tabStartOffset = ps.tabStartOffsets[tabIndex]; - int tabEndOffset = (tabIndex < ps.tabStartOffsets.length - 1) ? - ps.tabStartOffsets[tabIndex + 1] : ps.scrubbedPdeCode.length(); - int[] braceResult = SourceUtil.checkForMissingBraces(ps.scrubbedPdeCode, tabStartOffset, tabEndOffset); - if (braceResult[0] != 0) { - JavaProblem problem = - new JavaProblem(braceResult[0] < 0 - ? Language.interpolate("editor.status.missing.left_curly_bracket") - : Language.interpolate("editor.status.missing.right_curly_bracket"), - JavaProblem.ERROR, tabIndex, braceResult[1]); - problem.setPDEOffsets(braceResult[3], braceResult[3] + 1); - problems.add(problem); - } - } - - if (problems.isEmpty()) { - return problems; - } - - int problemTabIndex = problems.get(0).getTabIndex(); - - IProblem missingBraceProblem = - Arrays.stream(ps.compilationUnit.getProblems()) - .filter(ErrorChecker::isMissingBraceProblem) - // Ignore if it is at the end of file - .filter(p -> p.getSourceEnd() + 1 < ps.javaCode.length()) - // Ignore if the tab number does not match our detected tab number - .filter(p -> problemTabIndex == ps.mapJavaToSketch(p).tabIndex) - .findFirst() - .orElse(null); - - // Prefer ECJ problem, shows location more accurately - if (missingBraceProblem != null) { - JavaProblem p = convertIProblem(missingBraceProblem, ps); - if (p != null) { - problems.clear(); - problems.add(p); - } - } - return problems; - } - - static public String[] getImportSuggestions(ClassPath cp, String className) { className = className.replace("[", "\\[").replace("]", "\\]"); RegExpResourceFilter filter = new RegExpResourceFilter(