From 7bfbe3bf2b6e6eccd94f4cbb1734bf099d01f11e Mon Sep 17 00:00:00 2001 From: Bennie Copeland Date: Sat, 15 Jun 2024 14:30:10 +0900 Subject: [PATCH 1/2] Make use of unused filename literal --- src/FSharpLint.Core/Application/Configuration.fs | 2 +- src/FSharpLint.Core/Application/Lint.fs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FSharpLint.Core/Application/Configuration.fs b/src/FSharpLint.Core/Application/Configuration.fs index de6621336..5bd1b86d2 100644 --- a/src/FSharpLint.Core/Application/Configuration.fs +++ b/src/FSharpLint.Core/Application/Configuration.fs @@ -577,7 +577,7 @@ let loadConfig (configPath:string) = let defaultConfiguration = let assembly = typeof.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) diff --git a/src/FSharpLint.Core/Application/Lint.fs b/src/FSharpLint.Core/Application/Lint.fs index a8170f0fc..f53eef68a 100644 --- a/src/FSharpLint.Core/Application/Lint.fs +++ b/src/FSharpLint.Core/Application/Lint.fs @@ -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 -> From 047aaf7b098c8d3fa59ce7d845accf4b015c6f1d Mon Sep 17 00:00:00 2001 From: Bennie Copeland Date: Sat, 15 Jun 2024 16:23:31 +0900 Subject: [PATCH 2/2] Minor performance optimization --- src/FSharpLint.Core/Application/Lint.fs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/FSharpLint.Core/Application/Lint.fs b/src/FSharpLint.Core/Application/Lint.fs index f53eef68a..eda79c957 100644 --- a/src/FSharpLint.Core/Application/Lint.fs +++ b/src/FSharpLint.Core/Application/Lint.fs @@ -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 @@ -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 = @@ -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 } @@ -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 } @@ -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 }