Further rename Stroupstrup to Stroustrup. (#2262)

fsprojects · May 16, 2022 · 24741a3 · 24741a3
1 parent 9703198
commit 24741a3
Show file tree

Hide file tree

Showing 27 changed files with 54 additions and 54 deletions.
diff --git a/src/Fantomas.Core.Tests/Fantomas.Core.Tests.fsproj b/src/Fantomas.Core.Tests/Fantomas.Core.Tests.fsproj
@@ -90,28 +90,28 @@
     <Compile Include="SingleExprTests.fs" />
     <Compile Include="KeepMaxEmptyLinesTests.fs" />
     <Compile Include="IgnoreFileTests.fs" />
-    <Compile Include="Stroupstrup\SynBindingValueExpressionTests.fs" />
-    <Compile Include="Stroupstrup\SynBindingFunctionExpressionTests.fs" />
-    <Compile Include="Stroupstrup\SynBindingFunctionLongPatternExpressionTests.fs" />
-    <Compile Include="Stroupstrup\SynBindingFunctionWithReturnTypeExpressionTests.fs" />
-    <Compile Include="Stroupstrup\LetOrUseBangExpressionTests.fs" />
-    <Compile Include="Stroupstrup\YieldOrReturnExpressionTests.fs" />
-    <Compile Include="Stroupstrup\YieldOrReturnBangExpressionTests.fs" />
-    <Compile Include="Stroupstrup\SynExprAndBangExpressionTests.fs" />
-    <Compile Include="Stroupstrup\LongIdentSetExpressionTests.fs" />
-    <Compile Include="Stroupstrup\DotIndexedSetExpressionTests.fs" />
-    <Compile Include="Stroupstrup\SetExpressionTests.fs" />
-    <Compile Include="Stroupstrup\DotSetExpressionTests.fs" />
-    <Compile Include="Stroupstrup\LambdaExpressionTests.fs" />
-    <Compile Include="Stroupstrup\MultiLineLambdaClosingNewlineExpressionTests.fs" />
-    <Compile Include="Stroupstrup\SynMatchClauseExpressionTests.fs" />
-    <Compile Include="Stroupstrup\KeepIndentInBranchExpressionTests.fs" />
-    <Compile Include="Stroupstrup\SynTypeDefnSimpleReprRecordTests.fs" />
-    <Compile Include="Stroupstrup\SynTypeDefnSigReprSimpleTests.fs" />
-    <Compile Include="Stroupstrup\NamedArgumentExpressionTests.fs" />
-    <Compile Include="Stroupstrup\ElmishTests.fs" />
-    <Compile Include="Stroupstrup\FunctionApplicationSingleListTests.fs" />
-    <Compile Include="Stroupstrup\FunctionApplicationDualListTests.fs" />
+    <Compile Include="Stroustrup\SynBindingValueExpressionTests.fs" />
+    <Compile Include="Stroustrup\SynBindingFunctionExpressionTests.fs" />
+    <Compile Include="Stroustrup\SynBindingFunctionLongPatternExpressionTests.fs" />
+    <Compile Include="Stroustrup\SynBindingFunctionWithReturnTypeExpressionTests.fs" />
+    <Compile Include="Stroustrup\LetOrUseBangExpressionTests.fs" />
+    <Compile Include="Stroustrup\YieldOrReturnExpressionTests.fs" />
+    <Compile Include="Stroustrup\YieldOrReturnBangExpressionTests.fs" />
+    <Compile Include="Stroustrup\SynExprAndBangExpressionTests.fs" />
+    <Compile Include="Stroustrup\LongIdentSetExpressionTests.fs" />
+    <Compile Include="Stroustrup\DotIndexedSetExpressionTests.fs" />
+    <Compile Include="Stroustrup\SetExpressionTests.fs" />
+    <Compile Include="Stroustrup\DotSetExpressionTests.fs" />
+    <Compile Include="Stroustrup\LambdaExpressionTests.fs" />
+    <Compile Include="Stroustrup\MultiLineLambdaClosingNewlineExpressionTests.fs" />
+    <Compile Include="Stroustrup\SynMatchClauseExpressionTests.fs" />
+    <Compile Include="Stroustrup\KeepIndentInBranchExpressionTests.fs" />
+    <Compile Include="Stroustrup\SynTypeDefnSimpleReprRecordTests.fs" />
+    <Compile Include="Stroustrup\SynTypeDefnSigReprSimpleTests.fs" />
+    <Compile Include="Stroustrup\NamedArgumentExpressionTests.fs" />
+    <Compile Include="Stroustrup\ElmishTests.fs" />
+    <Compile Include="Stroustrup\FunctionApplicationSingleListTests.fs" />
+    <Compile Include="Stroustrup\FunctionApplicationDualListTests.fs" />
     <Compile Include="IdentTests.fs" />
     <Compile Include="RecordDeclarationsWithXMLDocTests.fs" />
   </ItemGroup>

diff --git a/src/Fantomas.Core.Tests/FormatConfigEditorConfigurationFileTests.fs b/src/Fantomas.Core.Tests/FormatConfigEditorConfigurationFileTests.fs
@@ -465,7 +465,7 @@ insert_final_newline = false
     Assert.IsFalse config.InsertFinalNewline
 
 [<Test>]
-let ``Stroupstrup style`` () =
+let ``Stroustrup style`` () =
     let rootDir = tempName ()
 
     let editorConfig =

diff --git a/...roupstrup/DotIndexedSetExpressionTests.fs → ...troustrup/DotIndexedSetExpressionTests.fs b/...roupstrup/DotIndexedSetExpressionTests.fs → ...troustrup/DotIndexedSetExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.DotIndexedSetExpressionTests
+module Fantomas.Core.Tests.Stroustrup.DotIndexedSetExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...ests/Stroupstrup/DotSetExpressionTests.fs → ...Tests/Stroustrup/DotSetExpressionTests.fs b/...ests/Stroupstrup/DotSetExpressionTests.fs → ...Tests/Stroustrup/DotSetExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.DotSetExpressionTests
+module Fantomas.Core.Tests.Stroustrup.DotSetExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...mas.Core.Tests/Stroupstrup/ElmishTests.fs → ...omas.Core.Tests/Stroustrup/ElmishTests.fs b/...mas.Core.Tests/Stroupstrup/ElmishTests.fs → ...omas.Core.Tests/Stroustrup/ElmishTests.fs
diff --git a/...strup/FunctionApplicationDualListTests.fs → ...strup/FunctionApplicationDualListTests.fs b/...strup/FunctionApplicationDualListTests.fs → ...strup/FunctionApplicationDualListTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.FunctionApplicationDualListTests
+module Fantomas.Core.Tests.Stroustrup.FunctionApplicationDualListTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...rup/FunctionApplicationSingleListTests.fs → ...rup/FunctionApplicationSingleListTests.fs b/...rup/FunctionApplicationSingleListTests.fs → ...rup/FunctionApplicationSingleListTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.FunctionApplicationSingleListTests
+module Fantomas.Core.Tests.Stroustrup.FunctionApplicationSingleListTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...trup/KeepIndentInBranchExpressionTests.fs → ...trup/KeepIndentInBranchExpressionTests.fs b/...trup/KeepIndentInBranchExpressionTests.fs → ...trup/KeepIndentInBranchExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.KeepIndentInBranchExpressionTests
+module Fantomas.Core.Tests.Stroustrup.KeepIndentInBranchExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...ests/Stroupstrup/LambdaExpressionTests.fs → ...Tests/Stroustrup/LambdaExpressionTests.fs b/...ests/Stroupstrup/LambdaExpressionTests.fs → ...Tests/Stroustrup/LambdaExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.LambdaExpressionTests
+module Fantomas.Core.Tests.Stroustrup.LambdaExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...troupstrup/LetOrUseBangExpressionTests.fs → ...Stroustrup/LetOrUseBangExpressionTests.fs b/...troupstrup/LetOrUseBangExpressionTests.fs → ...Stroustrup/LetOrUseBangExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.LetOrUseBangExpressionTests
+module Fantomas.Core.Tests.Stroustrup.LetOrUseBangExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...troupstrup/LongIdentSetExpressionTests.fs → ...Stroustrup/LongIdentSetExpressionTests.fs b/...troupstrup/LongIdentSetExpressionTests.fs → ...Stroustrup/LongIdentSetExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.LongIdentSetExpressionTests
+module Fantomas.Core.Tests.Stroustrup.LongIdentSetExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...ineLambdaClosingNewlineExpressionTests.fs → ...ineLambdaClosingNewlineExpressionTests.fs b/...ineLambdaClosingNewlineExpressionTests.fs → ...ineLambdaClosingNewlineExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.MultiLineLambdaClosingNewlineExpressionTests
+module Fantomas.Core.Tests.Stroustrup.MultiLineLambdaClosingNewlineExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...roupstrup/NamedArgumentExpressionTests.fs → ...troustrup/NamedArgumentExpressionTests.fs b/...roupstrup/NamedArgumentExpressionTests.fs → ...troustrup/NamedArgumentExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.NamedArgumentExpressionTests
+module Fantomas.Core.Tests.Stroustrup.NamedArgumentExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...e.Tests/Stroupstrup/SetExpressionTests.fs → ...re.Tests/Stroustrup/SetExpressionTests.fs b/...e.Tests/Stroupstrup/SetExpressionTests.fs → ...re.Tests/Stroustrup/SetExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.SetExpressionTests
+module Fantomas.Core.Tests.Stroustrup.SetExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...trup/SynBindingFunctionExpressionTests.fs → ...trup/SynBindingFunctionExpressionTests.fs b/...trup/SynBindingFunctionExpressionTests.fs → ...trup/SynBindingFunctionExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.SynBindingFunctionExpressionTests
+module Fantomas.Core.Tests.Stroustrup.SynBindingFunctionExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...dingFunctionLongPatternExpressionTests.fs → ...dingFunctionLongPatternExpressionTests.fs b/...dingFunctionLongPatternExpressionTests.fs → ...dingFunctionLongPatternExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.SynBindingFunctionLongPatternExpressionTests
+module Fantomas.Core.Tests.Stroustrup.SynBindingFunctionLongPatternExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...gFunctionWithReturnTypeExpressionTests.fs → ...gFunctionWithReturnTypeExpressionTests.fs b/...gFunctionWithReturnTypeExpressionTests.fs → ...gFunctionWithReturnTypeExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.SynBindingFunctionWithReturnTypeExpressionTests
+module Fantomas.Core.Tests.Stroustrup.SynBindingFunctionWithReturnTypeExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...upstrup/SynBindingValueExpressionTests.fs → ...oustrup/SynBindingValueExpressionTests.fs b/...upstrup/SynBindingValueExpressionTests.fs → ...oustrup/SynBindingValueExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.SynBindingValueExpressionTests
+module Fantomas.Core.Tests.Stroustrup.SynBindingValueExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...oupstrup/SynExprAndBangExpressionTests.fs → ...roustrup/SynExprAndBangExpressionTests.fs b/...oupstrup/SynExprAndBangExpressionTests.fs → ...roustrup/SynExprAndBangExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.SynExprAndBangExpressionTests
+module Fantomas.Core.Tests.Stroustrup.SynExprAndBangExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...oupstrup/SynMatchClauseExpressionTests.fs → ...roustrup/SynMatchClauseExpressionTests.fs b/...oupstrup/SynMatchClauseExpressionTests.fs → ...roustrup/SynMatchClauseExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.SynMatchClauseExpressionTests
+module Fantomas.Core.Tests.Stroustrup.SynMatchClauseExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...oupstrup/SynTypeDefnSigReprSimpleTests.fs → ...roustrup/SynTypeDefnSigReprSimpleTests.fs b/...oupstrup/SynTypeDefnSigReprSimpleTests.fs → ...roustrup/SynTypeDefnSigReprSimpleTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.SynTypeDefnSigReprSimpleTests
+module Fantomas.Core.Tests.Stroustrup.SynTypeDefnSigReprSimpleTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...strup/SynTypeDefnSimpleReprRecordTests.fs → ...strup/SynTypeDefnSimpleReprRecordTests.fs b/...strup/SynTypeDefnSimpleReprRecordTests.fs → ...strup/SynTypeDefnSimpleReprRecordTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.SynTypeDefnSimpleReprRecordTests
+module Fantomas.Core.Tests.Stroustrup.SynTypeDefnSimpleReprRecordTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...strup/YieldOrReturnBangExpressionTests.fs → ...strup/YieldOrReturnBangExpressionTests.fs b/...strup/YieldOrReturnBangExpressionTests.fs → ...strup/YieldOrReturnBangExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.YieldOrReturnBangExpressionTests
+module Fantomas.Core.Tests.Stroustrup.YieldOrReturnBangExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/...roupstrup/YieldOrReturnExpressionTests.fs → ...troustrup/YieldOrReturnExpressionTests.fs b/...roupstrup/YieldOrReturnExpressionTests.fs → ...troustrup/YieldOrReturnExpressionTests.fs
@@ -1,4 +1,4 @@
-module Fantomas.Core.Tests.Stroupstrup.YieldOrReturnExpressionTests
+module Fantomas.Core.Tests.Stroustrup.YieldOrReturnExpressionTests
 
 open NUnit.Framework
 open FsUnit

diff --git a/src/Fantomas.Core/CodePrinter.fs b/src/Fantomas.Core/CodePrinter.fs
@@ -2032,7 +2032,7 @@ and genExpr astContext synExpr ctx =
                 +> sepNln
                 +> (fun ctx ->
                     let hasMultipleClausesWhereOneHasRagnarok =
-                        hasMultipleClausesWhereOneHasStroupstrup ctx.Config.ExperimentalStroustrupStyle cs
+                        hasMultipleClausesWhereOneHasStroustrup ctx.Config.ExperimentalStroustrupStyle cs
 
                     col sepNln cs (genClause astContext true hasMultipleClausesWhereOneHasRagnarok) ctx)
             )
@@ -4612,7 +4612,7 @@ and genClauses astContext cs (ctx: Context) =
     col
         sepNln
         cs
-        (genClause astContext true (hasMultipleClausesWhereOneHasStroupstrup ctx.Config.ExperimentalStroustrupStyle cs))
+        (genClause astContext true (hasMultipleClausesWhereOneHasStroustrup ctx.Config.ExperimentalStroustrupStyle cs))
         ctx
 
 /// Each multiline member definition has a pre and post new line.
@@ -5500,7 +5500,7 @@ and genKeepIndentMatch
     +> sepNln
     +> (fun ctx ->
         let hasMultipleClausesWhereOneHasRagnarok =
-            hasMultipleClausesWhereOneHasStroupstrup ctx.Config.ExperimentalStroustrupStyle clauses
+            hasMultipleClausesWhereOneHasStroustrup ctx.Config.ExperimentalStroustrupStyle clauses
 
         coli
             sepNln

diff --git a/src/Fantomas.Core/Context.fs b/src/Fantomas.Core/Context.fs
@@ -1280,7 +1280,7 @@ let internal addExtraNewlineIfLeadingWasMultiline leading sepNlnConsideringTrivi
 
 let internal autoIndentAndNlnExpressUnlessRagnarok (f: SynExpr -> Context -> Context) (e: SynExpr) (ctx: Context) =
     match e with
-    | SourceParser.StroupstrupStyleExpr ctx.Config.ExperimentalStroustrupStyle e -> f e ctx
+    | SourceParser.StroustrupStyleExpr ctx.Config.ExperimentalStroustrupStyle e -> f e ctx
     | _ -> (indent +> sepNln +> f e +> unindent) ctx
 
 let internal autoIndentAndNlnIfExpressionExceedsPageWidthUnlessRagnarok
@@ -1289,7 +1289,7 @@ let internal autoIndentAndNlnIfExpressionExceedsPageWidthUnlessRagnarok
     (ctx: Context)
     =
     match e with
-    | SourceParser.StroupstrupStyleExpr ctx.Config.ExperimentalStroustrupStyle e -> f e ctx
+    | SourceParser.StroustrupStyleExpr ctx.Config.ExperimentalStroustrupStyle e -> f e ctx
     | _ -> autoIndentAndNlnIfExpressionExceedsPageWidth (f e) ctx
 
 type internal ColMultilineItem =

diff --git a/src/Fantomas.Core/SourceParser.fs b/src/Fantomas.Core/SourceParser.fs
@@ -1801,8 +1801,8 @@ let (|KeepIndentIfThenElse|_|) (e: SynExpr) =
             None
     | _ -> None
 
-let (|StroupstrupStyleExpr|_|) (isStroupstrupStyleEnabled: bool) (e: SynExpr) =
-    if not isStroupstrupStyleEnabled then
+let (|StroustrupStyleExpr|_|) (isStroustrupStyleEnabled: bool) (e: SynExpr) =
+    if not isStroustrupStyleEnabled then
         None
     else
         match e with
@@ -1815,12 +1815,12 @@ let (|StroupstrupStyleExpr|_|) (isStroupstrupStyleEnabled: bool) (e: SynExpr) =
         | ArrayOrList _ -> Some e
         | _ -> None
 
-let hasMultipleClausesWhereOneHasStroupstrup isStroupstrupStyleEnabled (cs: SynMatchClause list) : bool =
-    isStroupstrupStyleEnabled
+let hasMultipleClausesWhereOneHasStroustrup isStroustrupStyleEnabled (cs: SynMatchClause list) : bool =
+    isStroustrupStyleEnabled
     && List.moreThanOne cs
     && List.exists
         (fun (SynMatchClause (resultExpr = e)) ->
             match e with
-            | StroupstrupStyleExpr isStroupstrupStyleEnabled _ -> true
+            | StroustrupStyleExpr isStroustrupStyleEnabled _ -> true
             | _ -> false)
         cs