ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 23:28:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3563 from laytan/fix-duplicate-suggestions

Browse Source 
fix duplicate suggestions and add missing newline
This commit is contained in:
Jeroen van Rijn
2024-05-09 20:20:18 +02:00
committed by GitHub
parent 1604f37cb8 98827c867d
commit 41bd8cf714
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_expr.cpp
+1 -1
View File
@@ -6201,7 +6201,7 @@ gb_internal bool evaluate_where_clauses(CheckerContext *ctx, Ast *call_expr, Sco
error(c, "Prefer to separate 'where' clauses with a comma rather than '&&'"); error(c, "Prefer to separate 'where' clauses with a comma rather than '&&'");
gbString x = expr_to_string(c->BinaryExpr.left); gbString x = expr_to_string(c->BinaryExpr.left);
gbString y = expr_to_string(c->BinaryExpr.right); gbString y = expr_to_string(c->BinaryExpr.right);
error_line("\tSuggestion: '%s, %s'", x, y); error_line("\tSuggestion: '%s, %s'\n", x, y);
gb_string_free(y); gb_string_free(y);
gb_string_free(x); gb_string_free(x);
} }
src/error.cpp
+6 -2
View File
@@ -719,9 +719,13 @@ gb_internal void print_all_errors(void) {
} }
} }
if (it.str.len-it.pos > 0) { // Merge additional text (suggestions for example) into the previous error.
array_add_elems(&prev_ev->msg, it.str.text+it.pos, it.str.len-it.pos); String current = {prev_ev->msg.data, prev_ev->msg.count};
String addition = {it.str.text+it.pos, it.str.len-it.pos};
if (addition.len > 0 && !string_contains_string(current, addition)) {
array_add_elems(&prev_ev->msg, addition.text, addition.len);
} }
array_free(&ev.msg); array_free(&ev.msg);
array_ordered_remove(&global_error_collector.error_values, i); array_ordered_remove(&global_error_collector.error_values, i);
} else { } else {