Skip to content

Draft: Implement proper rule overriding to address issue #488 #711

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Draft: Implement proper rule overriding to address issue #488 #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bfbe3b
Make use of unused filename literal
BennieCopeland Jun 15, 2024
047aaf7
Minor performance optimization
BennieCopeland Jun 15, 2024
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 src/FSharpLint.Core/Application/Configuration.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ let loadConfig (configPath:string) =
let defaultConfiguration =
let assembly = typeof<Rules.Rule>.GetTypeInfo().Assembly
let resourceName = Assembly.GetExecutingAssembly().GetManifestResourceNames()
|> Seq.find (fun n -> n.EndsWith("fsharplint.json", System.StringComparison.Ordinal))
|> Seq.find (fun n -> n.EndsWith(SettingsFileName, System.StringComparison.Ordinal))
use stream = assembly.GetManifestResourceStream(resourceName)
match stream with
| null -> failwithf "Resource '%s' not found in assembly '%s'" resourceName (assembly.FullName)
Expand Down
12 changes: 6 additions & 6 deletions src/FSharpLint.Core/Application/Lint.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ module Lint =
{ CancellationToken:CancellationToken option
ErrorReceived:Suggestion.LintWarning -> unit
ReportLinterProgress:ProjectProgress -> unit
Configuration:Configuration.Configuration }
Rules:Configuration.LoadedRules }

type Context =
{ IndentationRuleContext:Map<int,bool*int>
Expand Down Expand Up @@ -207,7 +207,7 @@ module Lint =
| Some(x) -> not x.IsCancellationRequested
| None -> true

let enabledRules = Configuration.flattenConfig lintInfo.Configuration
let enabledRules = lintInfo.Rules

let lines = String.toLines fileInfo.Text |> Array.map (fun (line, _, _) -> line)
let allRuleNames =
Expand Down Expand Up @@ -384,7 +384,7 @@ module Lint =
| ex -> Error (string ex)
| Default ->
try
Configuration.loadConfig "./fsharplint.json"
Configuration.loadConfig $"./{Configuration.SettingsFileName}"
|> Ok
with
| :? System.IO.FileNotFoundException ->
Expand All @@ -411,7 +411,7 @@ module Lint =

let parseFilesInProject files projectOptions =
let lintInformation =
{ Configuration = config
{ Rules = Configuration.flattenConfig config
CancellationToken = optionalParams.CancellationToken
ErrorReceived = warningReceived
ReportLinterProgress = projectProgress }
Expand Down Expand Up @@ -517,7 +517,7 @@ module Lint =

optionalParams.ReceivedWarning |> Option.iter (fun func -> func warning)
let lintInformation =
{ Configuration = config
{ Rules = Configuration.flattenConfig config
CancellationToken = optionalParams.CancellationToken
ErrorReceived = warningReceived
ReportLinterProgress = Option.defaultValue ignore optionalParams.ReportLinterProgress }
Expand Down Expand Up @@ -560,7 +560,7 @@ module Lint =
optionalParams.ReceivedWarning |> Option.iter (fun func -> func warning)

let lintInformation =
{ Configuration = config
{ Rules = Configuration.flattenConfig config
CancellationToken = optionalParams.CancellationToken
ErrorReceived = warningReceived
ReportLinterProgress = Option.defaultValue ignore optionalParams.ReportLinterProgress }
Expand Down
Loading