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

Improve sarif #155

Merged
merged 4 commits into from
Nov 13, 2023
Merged

Improve sarif #155

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8d8b9c
Use relative path in physical location.
nojaf Nov 13, 2023
28f76ef
Add changelog entry.
nojaf Nov 13, 2023
c45be72
Update fsdocs-tool
nojaf Nov 13, 2023
b74859f
Merge branch 'master' into improve-sarif
nojaf Nov 13, 2023
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 .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]
},
"fsdocs-tool": {
"version": "20.0.0-alpha-006",
"version": "20.0.0-alpha-009",
"commands": [
"fsdocs"
]
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
* [--project value should be tested if path exists](https://github.com/ionide/FSharp.Analyzers.SDK/issues/141) (thanks @dawedawe!)
* [Provide better DX when project cracking failed](https://github.com/ionide/FSharp.Analyzers.SDK/issues/126) (thanks @dawedawe!)
* [Hint is mapped as note in sarif export](https://github.com/ionide/FSharp.Analyzers.SDK/pull/148) (thanks @nojaf!)
* [Sarif file should not report absolute file paths](https://github.com/ionide/FSharp.Analyzers.SDK/issues/154) (thanks @nojaf!)

## [0.19.0] - 2023-11-08

Expand Down
8 changes: 5 additions & 3 deletions src/FSharp.Analyzers.Cli/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@ let printMessages (msgs: AnalyzerMessage list) =

let writeReport (results: AnalyzerMessage list option) (report: string) =
try
let pwd = Directory.GetCurrentDirectory() |> Uri

// Construct full path to ensure path separators are normalized.
let report = Path.GetFullPath report
// Ensure the parent directory exists
Expand Down Expand Up @@ -315,15 +317,15 @@ let writeReport (results: AnalyzerMessage list option) (report: string) =

physicalLocation.ArtifactLocation <-
let al = ArtifactLocation()
al.Uri <- Uri(analyzerResult.Message.Range.FileName)
al.Uri <- pwd.MakeRelativeUri(Uri(analyzerResult.Message.Range.FileName))
al

physicalLocation.Region <-
let r = Region()
r.StartLine <- analyzerResult.Message.Range.StartLine
r.StartColumn <- analyzerResult.Message.Range.StartColumn
r.StartColumn <- analyzerResult.Message.Range.StartColumn + 1
r.EndLine <- analyzerResult.Message.Range.EndLine
r.EndColumn <- analyzerResult.Message.Range.EndColumn
r.EndColumn <- analyzerResult.Message.Range.EndColumn + 1
r

let location: Location = Location()
Expand Down