bump: packages

betwixt-labs · Oct 19, 2024 · 59e5dee · 59e5dee
1 parent 3449e8a
commit 59e5dee
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/Compiler/Compiler.csproj b/Compiler/Compiler.csproj
@@ -29,9 +29,9 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
-		<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.5" />
-		<PackageReference Include="Spectre.Console" Version="0.48.0" />
-		<PackageReference Include="Spectre.Console.Json" Version="0.48.0" />
+		<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.9" />
+		<PackageReference Include="Spectre.Console" Version="0.49.1" />
+		<PackageReference Include="Spectre.Console.Json" Version="0.49.1" />
 		<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.23407.1" />
 	</ItemGroup>
 

diff --git a/Compiler/LangServer/Handlers/CompletionHandler.cs b/Compiler/LangServer/Handlers/CompletionHandler.cs
@@ -13,16 +13,16 @@ namespace Compiler.LangServer
     public sealed class CompletionHandler : ICompletionHandler
     {
         private readonly BufferManager _bufferManager;
-        private readonly DocumentSelector _documentSelector;
+        private readonly TextDocumentSelector _documentSelector;
         private readonly HashSet<string> _keywords;
         private readonly HashSet<string> _decorators;
         private readonly HashSet<string> _constants;
 
         public CompletionHandler(BufferManager bufferManager, CompilerHost compilerHost)
         {
             _bufferManager = bufferManager;
-            _documentSelector = new DocumentSelector(
-                new DocumentFilter()
+            _documentSelector = new TextDocumentSelector(
+                new TextDocumentFilter()
                 {
                     Pattern = "**/*.bop"
                 }

diff --git a/Compiler/LangServer/Handlers/HoverHandler.cs b/Compiler/LangServer/Handlers/HoverHandler.cs
@@ -33,7 +33,7 @@ public HoverHandler(BufferManager bufferManager,
 
         public HoverRegistrationOptions GetRegistrationOptions(HoverCapability capability, ClientCapabilities clientCapabilities)
         {
-            return new HoverRegistrationOptions() { DocumentSelector = DocumentSelector.ForLanguage("bebop") };
+            return new HoverRegistrationOptions() { DocumentSelector = TextDocumentSelector.ForLanguage("bebop") };
         }
 
         public Task<Hover?> Handle(HoverParams request, CancellationToken cancellationToken)

diff --git a/Compiler/LangServer/Handlers/SemanticTokenHandler.cs b/Compiler/LangServer/Handlers/SemanticTokenHandler.cs
@@ -79,7 +79,7 @@ protected override SemanticTokensRegistrationOptions CreateRegistrationOptions(S
         {
             return new SemanticTokensRegistrationOptions
             {
-                DocumentSelector = DocumentSelector.ForLanguage("bebop"),
+                DocumentSelector = TextDocumentSelector.ForLanguage("bebop"),
                 Legend = _legend,
                 Full = new SemanticTokensCapabilityRequestFull
                 {

diff --git a/Compiler/LangServer/Handlers/TextDocumentSyncHandler.cs b/Compiler/LangServer/Handlers/TextDocumentSyncHandler.cs
@@ -25,7 +25,7 @@ public sealed class TextDocumentSyncHandler : TextDocumentSyncHandlerBase
         private readonly BufferManager _bufferManager;
         private readonly BebopDiagnosticPublisher _publisher;
         private readonly BebopLangServerLogger _logger;
-        private readonly DocumentSelector _documentSelector;
+        private readonly TextDocumentSelector _documentSelector;
 
         public TextDocumentSyncKind Change { get; } = TextDocumentSyncKind.Full;
 
@@ -41,7 +41,7 @@ public TextDocumentSyncHandler(
             _bufferManager = bufferManager ?? throw new ArgumentNullException(nameof(bufferManager));
             _publisher = publisher ?? throw new ArgumentNullException(nameof(publisher));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _documentSelector = new DocumentSelector(new DocumentFilter()
+            _documentSelector = new TextDocumentSelector(new TextDocumentFilter()
             {
                 Pattern = "**/*.bop",
             });
@@ -52,7 +52,7 @@ public override TextDocumentAttributes GetTextDocumentAttributes(DocumentUri uri
             return new TextDocumentAttributes(uri, "bop");
         }
 
-        protected override TextDocumentSyncRegistrationOptions CreateRegistrationOptions(SynchronizationCapability capability, ClientCapabilities clientCapabilities)
+        protected override TextDocumentSyncRegistrationOptions CreateRegistrationOptions(TextSynchronizationCapability capability, ClientCapabilities clientCapabilities)
         {
             return new TextDocumentSyncRegistrationOptions()
             {

diff --git a/Core/Core.csproj b/Core/Core.csproj
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Errata" Version="0.11.0" />
+    <PackageReference Include="Errata" Version="0.13.0" />
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
   </ItemGroup>
 

diff --git a/Core/Meta/JsonContext.cs b/Core/Meta/JsonContext.cs
@@ -28,8 +28,8 @@ namespace Core.Meta;
 [JsonSerializable(typeof(CompilerOutput))]
 [JsonSerializable(typeof(GeneratedFile))]
 [JsonSerializable(typeof(AuxiliaryFile))]
-[JsonSerializable(typeof(SpanException))]
 [JsonSerializable(typeof(Exception))]
+[JsonSerializable(typeof(SpanException))]
 [JsonSerializable(typeof(DiagnosticLogger.Diagnostic))]
 [JsonSerializable(typeof(Span))]
 [JsonSerializable(typeof(GeneratorContext))]
@@ -80,7 +80,14 @@ public override void Write(Utf8JsonWriter writer, Exception value, JsonSerialize
         if (value.InnerException is not null)
         {
             writer.WritePropertyName("innerException");
-            JsonSerializer.Serialize(writer, value.InnerException, options);
+            if (value.InnerException is SpanException spanException)
+            {
+                JsonSerializer.Serialize(writer, spanException, JsonContext.Default.SpanException);
+            }
+            else
+            {
+                JsonSerializer.Serialize(writer, value.InnerException, JsonContext.Default.Exception);
+            }
         }
         writer.WriteEndObject();
     }