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

Add exclusion config for parens analyzer #1363

Merged
merged 1 commit into from
Mar 2, 2025
+18 −1
Merged

Add exclusion config for parens analyzer #1363

Show file tree
Hide file tree
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
11 changes: 11 additions & 0 deletions src/FsAutoComplete/LspHelpers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,7 @@ type FSharpConfigDto =
SimplifyNameAnalyzer: bool option
SimplifyNameAnalyzerExclusions: string array option
UnnecessaryParenthesesAnalyzer: bool option
UnnecessaryParenthesesAnalyzerExclusions: string array option
ResolveNamespaces: bool option
EnableReferenceCodeLens: bool option
EnableAnalyzers: bool option
Expand Down Expand Up @@ -867,6 +868,7 @@ type FSharpConfig =
SimplifyNameAnalyzer: bool
SimplifyNameAnalyzerExclusions: Regex array
UnnecessaryParenthesesAnalyzer: bool
UnnecessaryParenthesesAnalyzerExclusions: Regex array
ResolveNamespaces: bool
EnableReferenceCodeLens: bool
EnableAnalyzers: bool
Expand Down Expand Up @@ -922,6 +924,7 @@ type FSharpConfig =
SimplifyNameAnalyzer = false
SimplifyNameAnalyzerExclusions = [||]
UnnecessaryParenthesesAnalyzer = true
UnnecessaryParenthesesAnalyzerExclusions = [||]
ResolveNamespaces = false
EnableReferenceCodeLens = false
EnableAnalyzers = false
Expand Down Expand Up @@ -975,6 +978,9 @@ type FSharpConfig =
defaultArg dto.SimplifyNameAnalyzerExclusions [||]
|> Array.choose tryCreateRegex
UnnecessaryParenthesesAnalyzer = defaultArg dto.UnnecessaryParenthesesAnalyzer true
UnnecessaryParenthesesAnalyzerExclusions =
defaultArg dto.UnnecessaryParenthesesAnalyzerExclusions [||]
|> Array.choose tryCreateRegex
ResolveNamespaces = defaultArg dto.ResolveNamespaces false
EnableReferenceCodeLens = defaultArg dto.EnableReferenceCodeLens false
EnableAnalyzers = defaultArg dto.EnableAnalyzers false
Expand Down Expand Up @@ -1086,6 +1092,11 @@ type FSharpConfig =
(dto.SimplifyNameAnalyzerExclusions |> Option.map (Array.choose tryCreateRegex))
x.SimplifyNameAnalyzerExclusions
UnnecessaryParenthesesAnalyzer = defaultArg dto.UnnecessaryParenthesesAnalyzer x.UnnecessaryParenthesesAnalyzer
UnnecessaryParenthesesAnalyzerExclusions =
defaultArg
(dto.UnnecessaryParenthesesAnalyzerExclusions
|> Option.map (Array.choose tryCreateRegex))
x.UnnecessaryParenthesesAnalyzerExclusions
ResolveNamespaces = defaultArg dto.ResolveNamespaces x.ResolveNamespaces
EnableReferenceCodeLens = defaultArg dto.EnableReferenceCodeLens x.EnableReferenceCodeLens
EnableAnalyzers = defaultArg dto.EnableAnalyzers x.EnableAnalyzers
Expand Down
2 changes: 2 additions & 0 deletions src/FsAutoComplete/LspHelpers.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ type FSharpConfigDto =
SimplifyNameAnalyzer: bool option
SimplifyNameAnalyzerExclusions: string array option
UnnecessaryParenthesesAnalyzer: bool option
UnnecessaryParenthesesAnalyzerExclusions: string array option
ResolveNamespaces: bool option
EnableReferenceCodeLens: bool option
EnableAnalyzers: bool option
Expand Down Expand Up @@ -409,6 +410,7 @@ type FSharpConfig =
SimplifyNameAnalyzer: bool
SimplifyNameAnalyzerExclusions: System.Text.RegularExpressions.Regex array
UnnecessaryParenthesesAnalyzer: bool
UnnecessaryParenthesesAnalyzerExclusions: System.Text.RegularExpressions.Regex array
ResolveNamespaces: bool
EnableReferenceCodeLens: bool
EnableAnalyzers: bool
Expand Down
5 changes: 4 additions & 1 deletion src/FsAutoComplete/LspServers/AdaptiveServerState.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,10 @@ type AdaptiveState
&& isNotExcluded config.SimplifyNameAnalyzerExclusions
then
checkSimplifiedNames
if config.UnnecessaryParenthesesAnalyzer then
if
config.UnnecessaryParenthesesAnalyzer
&& isNotExcluded config.UnnecessaryParenthesesAnalyzerExclusions
then
checkUnnecessaryParentheses ]

async {
Expand Down
1 change: 1 addition & 0 deletions test/FsAutoComplete.Tests.Lsp/Helpers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ let defaultConfigDto: FSharpConfigDto =
SimplifyNameAnalyzer = None
SimplifyNameAnalyzerExclusions = None
UnnecessaryParenthesesAnalyzer = None
UnnecessaryParenthesesAnalyzerExclusions = None
ResolveNamespaces = None
EnableReferenceCodeLens = None
EnableAnalyzers = None
Expand Down
Loading