Update to latest cwtools + perf

.gitignore

@@ -18,3 +18,4 @@ nupkgs/
 .ionide
 *.user
 cwtools.local.props
+.vs/

fsharp-language-server.sln

@@ -20,6 +20,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "build", "build\build.fsproj
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpExtensions", "src\CSharpExtensions\CSharpExtensions.csproj", "{61AAD9EA-772E-4F7A-A23F-B4F24F35D4C5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Languages", "src\Languages\Languages.csproj", "{6E3C08B7-CA8C-44F7-96EA-55794326B70D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -117,10 +119,23 @@ Global
 		{61AAD9EA-772E-4F7A-A23F-B4F24F35D4C5}.Release|x64.Build.0 = Release|Any CPU
 		{61AAD9EA-772E-4F7A-A23F-B4F24F35D4C5}.Release|x86.ActiveCfg = Release|Any CPU
 		{61AAD9EA-772E-4F7A-A23F-B4F24F35D4C5}.Release|x86.Build.0 = Release|Any CPU
+		{6E3C08B7-CA8C-44F7-96EA-55794326B70D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E3C08B7-CA8C-44F7-96EA-55794326B70D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E3C08B7-CA8C-44F7-96EA-55794326B70D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6E3C08B7-CA8C-44F7-96EA-55794326B70D}.Debug|x64.Build.0 = Debug|Any CPU
+		{6E3C08B7-CA8C-44F7-96EA-55794326B70D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6E3C08B7-CA8C-44F7-96EA-55794326B70D}.Debug|x86.Build.0 = Debug|Any CPU
+		{6E3C08B7-CA8C-44F7-96EA-55794326B70D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E3C08B7-CA8C-44F7-96EA-55794326B70D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E3C08B7-CA8C-44F7-96EA-55794326B70D}.Release|x64.ActiveCfg = Release|Any CPU
+		{6E3C08B7-CA8C-44F7-96EA-55794326B70D}.Release|x64.Build.0 = Release|Any CPU
+		{6E3C08B7-CA8C-44F7-96EA-55794326B70D}.Release|x86.ActiveCfg = Release|Any CPU
+		{6E3C08B7-CA8C-44F7-96EA-55794326B70D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{D0C97655-008A-4376-87A3-FD072D076F16} = {29A9E10D-C8C7-416D-B32D-820658A129A6}
 		{AD9284CA-9934-4A4B-9C5C-AE680DFE0451} = {29A9E10D-C8C7-416D-B32D-820658A129A6}
 		{61AAD9EA-772E-4F7A-A23F-B4F24F35D4C5} = {29A9E10D-C8C7-416D-B32D-820658A129A6}
+		{6E3C08B7-CA8C-44F7-96EA-55794326B70D} = {29A9E10D-C8C7-416D-B32D-820658A129A6}
 	EndGlobalSection
 EndGlobal

fsharp-language-server.sln.DotSettings.user

@@ -1,5 +1,12 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIGame_002Ecs_002Fl_003AC_0021_003FUsers_003FQWQ_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F6ef8b49f176426ab24e37ee95734976c1f4e00_003F2b_003F96ed908c_003FIGame_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInt32_002Ecs_002Fl_003AC_0021_003FUsers_003FQWQ_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb241c378a97f4447a2e6baf64e656013e8e910_003Fd4_003Fd06428fe_003FInt32_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AJsonValue_002Ecs_002Fl_003AC_0021_003FUsers_003FQWQ_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c936219f10b3444a74503831962935cefa00_003F3b_003Faaeee25c_003FJsonValue_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AString_002ESearching_002Ecs_002Fl_003AC_0021_003FUsers_003FQWQ_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FSourcesCache_003F80a8cc7ee71130a74c9b38bc4256839ca29706631fd8358dc57bfa48703a4_003FString_002ESearching_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
   &lt;Assembly Path="C:\Users\Thomas\Git\cwtools-vscode\paket-files\git\localfilesystem\cwtools\CWTools\bin\Debug\netstandard2.0\CWTools.dll" /&gt;&#xD;
   &lt;Assembly Path="D:\Code\Project\GitProject\cwtools\CWTools\bin\Release\net9.0\CWTools.dll" /&gt;&#xD;
-&lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary>
+&lt;/AssemblyExplorer&gt;</s:String>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=src_002FLanguages_002FLangResources/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/ShowOnlyErrors/@EntryValue">False</s:Boolean></wpf:ResourceDictionary>

paket.dependencies

@@ -1,7 +1,7 @@
 source https://www.nuget.org/api/v2
 storage: none
 nuget System.Text.Encoding.CodePages #
-nuget FParsec 1.1.1 #
+nuget FParsec 2.0.0-beta2
 nuget FSharp.Data 3.0.1 #
 nuget FSharp.Collections.ParallelSeq #
 nuget DotNet.Glob #

paket.lock

@@ -3,9 +3,9 @@ NUGET
   remote: https://www.nuget.org/api/v2
     DotNet.Glob (3.1.3)
       NETStandard.Library (>= 1.6.1) - restriction: && (< net40) (< netcoreapp2.1) (>= netstandard1.1) (< netstandard2.1)
-    FParsec (1.1.1)
-      FSharp.Core (>= 4.3.4) - restriction: || (>= net45) (>= netstandard2.0)
-      System.ValueTuple (>= 4.4) - restriction: >= net45
+    FParsec (2.0.0-beta2)
+      FSharp.Core (>= 4.3.4) - restriction: >= netstandard2.0
+      System.Memory (>= 4.5.5) - restriction: && (>= netstandard2.0) (< netstandard2.1)
     FSharp.Collections.ParallelSeq (1.2)
       FSharp.Core (>= 5.0) - restriction: >= netstandard2.0
     FSharp.Core (9.0.300) - restriction: || (>= net45) (>= netstandard2.0)
@@ -119,7 +119,7 @@ NUGET
       System.Diagnostics.Contracts (>= 4.3) - restriction: || (>= net45) (>= netstandard1.6)
     System.AppContext (4.3) - restriction: || (&& (< net40) (>= net46) (< netstandard1.4)) (&& (< net40) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1))
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard1.6)) (&& (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
-    System.Buffers (4.6.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net40) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net40) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net40) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net40) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net40) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net40) (>= net46) (< netstandard1.4)) (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81))
+    System.Buffers (4.6.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net40) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net40) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net40) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net40) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net40) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net40) (>= net46) (< netstandard1.4)) (&& (>= net462) (>= netstandard2.0)) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81))
     System.Collections (4.3) - restriction: || (&& (< monoandroid) (< net40) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< net40) (>= net46) (< netstandard1.4)) (&& (< net40) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net40) (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< net40) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net40) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net40) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net40) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net40) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net40) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
@@ -239,7 +239,7 @@ NUGET
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.Runtime.Extensions (>= 4.3) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Threading (>= 4.3) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Memory (4.6.3) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
+    System.Memory (4.6.3) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0)) (&& (>= netstandard2.0) (< netstandard2.1))
       System.Buffers (>= 4.6.1) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
       System.Numerics.Vectors (>= 4.6.1) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
       System.Runtime.CompilerServices.Unsafe (>= 6.1.2) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
@@ -284,7 +284,7 @@ NUGET
       System.Net.Primitives (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Threading.Tasks (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Numerics.Vectors (4.6.1) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
+    System.Numerics.Vectors (4.6.1) - restriction: || (&& (>= net462) (>= netstandard2.0)) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
     System.ObjectModel (4.3) - restriction: || (&& (< net40) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net40) (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< net40) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net40) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net40) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net40) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net40) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net40) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1))
       System.Collections (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
@@ -490,7 +490,6 @@ NUGET
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.ValueTuple (4.6.1) - restriction: >= net45
     System.Xml.ReaderWriter (4.3.1) - restriction: || (&& (< monoandroid) (< net40) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net40) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net40) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net40) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net40) (>= net46) (< netstandard1.4)) (&& (< net40) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net40) (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< net40) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< net40) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net40) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81))
       System.Collections (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
@@ -701,4 +700,4 @@ GROUP git
 
 GIT
   remote: https://www.github.com/cwtools/cwtools
-     (7909efe640f3bd368b614a6576fa6fc1495fe0ee)
+     (ba88942d2a84beaa046fbfeb5c10b6d457354981)

src/LSP/DocumentStore.fs

@@ -39,6 +39,7 @@ module DocumentStoreUtils =
 
 open DocumentStoreUtils
 
+[<Sealed>]
 type DocumentStore() =
     /// All open documents, organized by absolute path
     let activeDocuments = Dictionary<string, Version>()

src/LSP/LanguageServer.fs

@@ -220,14 +220,14 @@ type RealClient(send: BinaryWriter) =
         member this.ApplyWorkspaceEdit(p: ApplyWorkspaceEditParams) : Async<JsonValue> =
             async {
                 let json = serializeApplyWorkspaceEdit p
-                let id = Random().Next()
+                let id = Random.Shared.Next()
                 return! requestClient (send, id, "workspace/applyEdit", json)
             }
 
         member this.CustomRequest(method: string, json: string) : Async<JsonValue> =
             async {
                 // let jsonString = json.ToString(JsonSaveOptions.DisableFormatting)
-                let id = Random().Next()
+                let id = Random.Shared.Next()
                 return! requestClient (send, id, method, json)
             }