Skip to content
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

fix: parse error serialisation #420

Merged
merged 1 commit into from
Aug 29, 2024
+22 −9
Merged

fix: parse error serialisation #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion groovy/src/main/com/nvuillam/CodeNarcServer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ class CodeNarcServer {
WRITER.writeValue(out, response)
}
} catch (Exception e) {
LOGGER.error('Write response {}', e)
LOGGER.error('Write response', e)
} finally {
if (requestKey) {
threads.remove(requestKey)
Expand Down
21 changes: 17 additions & 4 deletions groovy/src/main/com/nvuillam/Request.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ class Request {
* @param fileList the list of files to parse
* @return the map of files to errors
*/
private Map<String, List<Error>> parseFiles(List<String> fileList) {
Map<String, List<Error>> parseErrors = [:]
private Map<String, List<String>> parseFiles(List<String> fileList) {
Map<String, List<String>> parseErrors = [:]
LOGGER.debug('parseFiles: parse={}, fileList={}', parse, fileList)
if (parse) {
fileList.each { file ->
Expand Down Expand Up @@ -210,8 +210,21 @@ class Request {
return files
}

// Try to parse file to get compilation errors
private List<Error> parseFile(File file) {
// Try to parse file to get compilation errors as strings.
private List<String> parseFile(File file) {
List<String> errors = []
for (err in parseFileErrors(file)) {
StringWriter out = new StringWriter();
PrintWriter writer = new PrintWriter(out);
err.write(writer)
errors << out.toString()
}

return errors
}

// Try to parse file to get compilation errors.
private List<Error> parseFileErrors(File file) {
try {
// We don't use GroovyShell.parse as it calls InvokerHelper.createScript
// which fails for files which contain a class which only have non-zero
Expand Down
2 changes: 1 addition & 1 deletion groovy/src/main/com/nvuillam/Response.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Response {
String errorMessage
String errorDtl
String exceptionType
Map<String, List<Error>> parseErrors
Map<String, List<String>> parseErrors

// Lint result.
@JsonRawValue
Expand Down
Binary file modified lib/java/CodeNarcServer.jar
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions test/lint-api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ describe("Lint with API", () => {
assert(linter.status === 1, `Linter status is 1 (${linter.status} returned)`);
assert(linter.outputString.includes("warning"), "Output string contains warning");
assert(Object.keys(linter.lintResult.files).length === 2, "Files array contains 2 files");
assert(linter.lintResult.summary.totalFoundErrorNumber === 4, "Error found");
assert(linter.lintResult.summary.totalFoundErrorNumber === 5, "Error found");
assert(linter.lintResult.summary.totalFoundWarningNumber === 6, "Warnings found");
assert(linter.lintResult.summary.totalFoundInfoNumber === 65, "Infos found");
checkCodeNarcCallsCounter(1);
Expand Down Expand Up @@ -354,7 +354,7 @@ describe("Lint with API", () => {
assert(linter.status === 1, `Linter status is 1 (${linter.status} returned)`);
assert(linter.outputString.includes("warning"), "Output string contains warning");
assert(Object.keys(linter.lintResult.files).length === 2, "Files array contains 2 files");
assert(linter.lintResult.summary.totalFoundErrorNumber === 4, "Error found");
assert(linter.lintResult.summary.totalFoundErrorNumber === 5, "Error found");
assert(linter.lintResult.summary.totalFoundWarningNumber === 6, "Warnings found");
assert(linter.lintResult.summary.totalFoundInfoNumber === 65, "Infos found");
checkCodeNarcCallsCounter(1);
Expand All @@ -372,7 +372,7 @@ describe("Lint with API", () => {
assert(linter.status === 1, `Linter status is 1 (${linter.status} returned)`);
assert(linter.outputString.includes("warning"), "Output string contains warning");
assert(Object.keys(linter.lintResult.files).length === 12, `Expected 2 files got ${Object.keys(linter.lintResult.files).length}`);
assert(linter.lintResult.summary.totalFoundErrorNumber === 12, `Expected 12 errors to ${linter.lintResult.summary.totalFoundErrorNumber}`);
assert(linter.lintResult.summary.totalFoundErrorNumber === 19, `Expected 19 errors to ${linter.lintResult.summary.totalFoundErrorNumber}`);
assert(linter.lintResult.summary.totalFoundWarningNumber === 333, `Expected 333 warnings to ${linter.lintResult.summary.totalFoundWarningNumber}`);
assert(linter.lintResult.summary.totalFoundInfoNumber === 1649, `Expected 1649 infos to ${linter.lintResult.summary.totalFoundInfoNumber}`);
checkCodeNarcCallsCounter(1);
Expand Down
Loading