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 shellcheck line numbers #460

Merged
merged 1 commit into from
Nov 23, 2023
Merged

Fix shellcheck line numbers #460

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
9 changes: 5 additions & 4 deletions tested/languages/bash/linter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def run_shellcheck(
command=[
"shellcheck",
"-f",
"json",
"json1",
"-s",
language,
str(submission.absolute()),
Expand Down Expand Up @@ -66,6 +66,7 @@ def run_shellcheck(
),
], []
annotations = []
shellcheck_objects = shellcheck_objects.get("comments", [])

for shellcheck_object in shellcheck_objects:
if Path(shellcheck_object.get("file", submission)).name != submission.name:
Expand All @@ -79,17 +80,17 @@ def run_shellcheck(
external = f"https://github.com/koalaman/shellcheck/wiki/SC{code}"
start_row = shellcheck_object.get("line", 1)
end_row = shellcheck_object.get("endLine")
rows = end_row - start_row if end_row else None
rows = end_row + 1 - start_row if end_row else None
start_col = shellcheck_object.get("column", 1)
end_col = shellcheck_object.get("endColumn")
cols = end_col - start_col if end_col else None
annotations.append(
AnnotateCode(
row=start_row - 1 + config.source_offset,
row=start_row + config.source_offset,
rows=rows,
text=text,
externalUrl=external,
column=start_col - 1,
column=start_col,
columns=cols,
type=message_categories.get(
shellcheck_object.get("level", "warning"), Severity.WARNING
Expand Down
Loading