add yet another FantomasConfig property

JetBrains · May 4, 2021 · 671a500 · 671a500
1 parent 9d8eb37
commit 671a500
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/ReSharper.FSharp/src/FSharp.ExternalFormatter.Host/src/FantomasCodeFormatter.cs b/ReSharper.FSharp/src/FSharp.ExternalFormatter.Host/src/FantomasCodeFormatter.cs
@@ -37,7 +37,7 @@ private static FSharpParsingOptions Convert(RdFcsParsingOptions options) =>
         options.LightSyntax, false, options.IsExe);
 
     private FormatConfig.FormatConfig Convert(RdFantomasFormatConfig config) =>
-      new FormatConfig.FormatConfig(config.IndentSize, config.MaxLineLength, myDefaultFormatConfig.SemicolonAtEndOfLine,
+      new FormatConfig.FormatConfig(config.IndentSize, config.MaxLineLength, config.SemicolonAtEndOfLine,
         config.SpaceBeforeParameter, config.SpaceBeforeLowercaseInvocation, config.SpaceBeforeUppercaseInvocation,
         config.SpaceBeforeClassConstructor, config.SpaceBeforeMember, config.SpaceBeforeColon, config.SpaceAfterComma,
         config.SpaceBeforeSemicolon, config.SpaceAfterSemicolon, config.IndentOnTryWith, config.SpaceAroundDelimiter,

diff --git a/ReSharper.FSharp/src/FSharp.Psi.Features/src/Formatter/CodeFormatterProvider.fs b/ReSharper.FSharp/src/FSharp.Psi.Features/src/Formatter/CodeFormatterProvider.fs
@@ -39,7 +39,8 @@ type CodeFormatterProvider(solution: ISolution, externalFormatterFactory: Extern
              settings.MaxValueBindingWidth, settings.MaxFunctionBindingWidth,
              settings.MultilineBlockBracketsOnSameColumn, settings.NewlineBetweenTypeDefinitionAndMembers,
              settings.KeepIfThenInSameLine, settings.MaxElmishWidth, settings.SingleArgumentWebMode,
-             settings.AlignFunctionSignatureToIndentation, settings.AlternativeLongMemberDefinitions)
+             settings.AlignFunctionSignatureToIndentation, settings.AlternativeLongMemberDefinitions,
+             settings.SemicolonAtEndOfLine)
 
     let convertParsingOptions (options: FSharpParsingOptions) =
         let lightSyntax =

diff --git a/rider-fsharp/protocol/src/kotlin/model/RdFSharpExternalFormatterModel.kt b/rider-fsharp/protocol/src/kotlin/model/RdFSharpExternalFormatterModel.kt
@@ -51,6 +51,7 @@ object RdFSharpExternalFormatterModel : Root() {
         field("singleArgumentWebMode", bool)
         field("alignFunctionSignatureToIndentation", bool)
         field("alternativeLongMemberDefinitions", bool)
+        field("semicolonAtEndOfLine", bool)
     }
 
     private val rdFormatArgs = basestruct {