@@ -342,7 +342,11 @@ async function run() {
342
342
const patches = (0, patch_1.parsePatches)(patch);
343
343
const ps = (0, suggestions_1.getSuggestions)(bases, patches, resolved).map((s) => {
344
344
if (s.skipReason) {
345
- core.warning(`Skipping suggestion: ${s.skipReason}`);
345
+ const line = s.startLine !== s.endLine
346
+ ? `${s.startLine}-${s.endLine}`
347
+ : `${s.startLine}`;
348
+ const location = `${s.path}:${line}`;
349
+ core.warning(`[${location}]: Skipping suggestion: ${s.skipReason}`);
346
350
return Promise.resolve();
347
351
}
348
352
else {
@@ -896,19 +900,8 @@ function getSuggestions(bases, patches, resolved) {
896
900
const adds = new hunk_1.Hunks(file.modifiedLines.filter((x) => x.added));
897
901
dels.forEach((del) => {
898
902
const line = NE.head(del).lineNumber;
899
- const location = `${file.afterName}:${line}`;
900
903
const add = adds.get(line);
901
- const mkSkipped = (message, omitLineDetails) => {
902
- const lineDetails = omitLineDetails
903
- ? []
904
- : [
905
- `Lines added in PR diff: ${JSON.stringify(baseAdds.lines())}`,
906
- `Lines deleted in Restyled diff: ${JSON.stringify(dels.lines())}`,
907
- `Lines added in Restyled diff: ${JSON.stringify(adds.lines())}`,
908
- ];
909
- const skipReason = [`[${location}] ${message}`]
910
- .concat(lineDetails)
911
- .join("\n");
904
+ const mkSkipped = (skipReason) => {
912
905
return {
913
906
path: file.afterName,
914
907
description: (patch.message || "").replace(/^\[PATCH] /, ""),
@@ -926,11 +919,11 @@ function getSuggestions(bases, patches, resolved) {
926
919
code: add ? NE.toList(add).map((x) => x.line) : [],
927
920
};
928
921
if (!baseAdds.contain(del)) {
929
- suggestions.push(mkSkipped(`Suggestions can only be made on added lines`));
922
+ suggestions.push(mkSkipped(`suggestions can only be made on added lines`));
930
923
return;
931
924
}
932
925
if (resolved.some((r) => isSameLocation(r, suggestion))) {
933
- suggestions.push(mkSkipped(`Suggestion already marked resolved`, true ));
926
+ suggestions.push(mkSkipped(`previously marked resolved`));
934
927
return;
935
928
}
936
929
suggestions.push(suggestion);
0 commit comments