rename diagnosticHandler to diagnosticChecker, support chinese name path

CppCXY · Apr 28, 2024 · e98b178 · e98b178
1 parent 9f34a9b
commit e98b178
Show file tree

Hide file tree

Showing 22 changed files with 41 additions and 36 deletions.
diff --git a/...nostics/Handlers/DiagnosticHandlerBase.cs → ...nostics/Checkers/DiagnosticCheckerBase.cs b/...nostics/Handlers/DiagnosticHandlerBase.cs → ...nostics/Checkers/DiagnosticCheckerBase.cs
@@ -1,8 +1,8 @@
 using EmmyLua.CodeAnalysis.Compilation;
 
-namespace EmmyLua.CodeAnalysis.Diagnostics.Handlers;
+namespace EmmyLua.CodeAnalysis.Diagnostics.Checkers;
 
-public abstract class DiagnosticHandlerBase(LuaCompilation compilation, List<DiagnosticCode> codes)
+public abstract class DiagnosticCheckerBase(LuaCompilation compilation, List<DiagnosticCode> codes)
 {
     public LuaCompilation Compilation { get; } = compilation;
 

diff --git a/.../Diagnostics/Handlers/TypeCheckHandler.cs → ...lysis/Diagnostics/Checkers/TypeChecker.cs b/.../Diagnostics/Handlers/TypeCheckHandler.cs → ...lysis/Diagnostics/Checkers/TypeChecker.cs
@@ -1,8 +1,8 @@
 using EmmyLua.CodeAnalysis.Compilation;
 
-namespace EmmyLua.CodeAnalysis.Diagnostics.Handlers;
+namespace EmmyLua.CodeAnalysis.Diagnostics.Checkers;
 
-public class TypeCheckHandler(LuaCompilation compilation) : DiagnosticHandlerBase(compilation, [])
+public class TypeChecker(LuaCompilation compilation) : DiagnosticCheckerBase(compilation, [])
 {
     public override void Check(DiagnosticContext context)
     {

diff --git a/...ostics/Handlers/UndefinedGlobalHandler.cs → ...ostics/Checkers/UndefinedGlobalChecker.cs b/...ostics/Handlers/UndefinedGlobalHandler.cs → ...ostics/Checkers/UndefinedGlobalChecker.cs
@@ -2,10 +2,10 @@
 using EmmyLua.CodeAnalysis.Compilation.Type;
 using EmmyLua.CodeAnalysis.Syntax.Node.SyntaxNodes;
 
-namespace EmmyLua.CodeAnalysis.Diagnostics.Handlers;
+namespace EmmyLua.CodeAnalysis.Diagnostics.Checkers;
 
-public class UndefinedGlobalHandler(LuaCompilation compilation)
-    : DiagnosticHandlerBase(compilation,
+public class UndefinedGlobalChecker(LuaCompilation compilation)
+    : DiagnosticCheckerBase(compilation,
         [DiagnosticCode.UndefinedGlobal, DiagnosticCode.NeedImport])
 {
     public override void Check(DiagnosticContext context)

diff --git a/...sis/Diagnostics/Handlers/UnusedHandler.cs → ...sis/Diagnostics/Checkers/UnusedChecker.cs b/...sis/Diagnostics/Handlers/UnusedHandler.cs → ...sis/Diagnostics/Checkers/UnusedChecker.cs
@@ -3,9 +3,9 @@
 using EmmyLua.CodeAnalysis.Compilation.Semantic;
 using EmmyLua.CodeAnalysis.Syntax.Node.SyntaxNodes;
 
-namespace EmmyLua.CodeAnalysis.Diagnostics.Handlers;
+namespace EmmyLua.CodeAnalysis.Diagnostics.Checkers;
 
-public class UnusedHandler(LuaCompilation compilation) : DiagnosticHandlerBase(compilation, [DiagnosticCode.Unused])
+public class UnusedChecker(LuaCompilation compilation) : DiagnosticCheckerBase(compilation, [DiagnosticCode.Unused])
 {
     public override void Check(DiagnosticContext context)
     {

diff --git a/EmmyLua/CodeAnalysis/Diagnostics/LuaDiagnostics.cs b/EmmyLua/CodeAnalysis/Diagnostics/LuaDiagnostics.cs
@@ -1,16 +1,16 @@
 using EmmyLua.CodeAnalysis.Compilation;
-using EmmyLua.CodeAnalysis.Diagnostics.Handlers;
+using EmmyLua.CodeAnalysis.Diagnostics.Checkers;
 using EmmyLua.CodeAnalysis.Document;
 
 namespace EmmyLua.CodeAnalysis.Diagnostics;
 
 public class LuaDiagnostics(LuaCompilation compilation)
 {
-    private List<DiagnosticHandlerBase> Handlers { get; } = new()
+    private List<DiagnosticCheckerBase> Handlers { get; } = new()
     {
-        new UnusedHandler(compilation),
-        new UndefinedGlobalHandler(compilation),
-        new TypeCheckHandler(compilation)
+        new UnusedChecker(compilation),
+        new UndefinedGlobalChecker(compilation),
+        new TypeChecker(compilation)
     };
 
     public LuaCompilation Compilation { get; } = compilation;
@@ -44,9 +44,9 @@ public void Check(LuaDocument document)
         }
     }
 
-    public bool CanCheck(LuaDocumentId documentId, DiagnosticHandlerBase handlerBase)
+    public bool CanCheck(LuaDocumentId documentId, DiagnosticCheckerBase checkerBase)
     {
-        var codes = handlerBase.Codes;
+        var codes = checkerBase.Codes;
         return codes.Count != 0 && codes.Any(code => CanCheckCode(documentId, code));
     }
 

diff --git a/LanguageServer/CodeAction/CodeActionHandler.cs b/LanguageServer/CodeAction/CodeActionHandler.cs
@@ -26,7 +26,7 @@ protected override CodeActionRegistrationOptions CreateRegistrationOptions(CodeA
         CancellationToken cancellationToken)
     {
         var result = new List<CommandOrCodeAction>();
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         var diagnostics = request.Context.Diagnostics;
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/Completion/CompletionHandler.cs b/LanguageServer/Completion/CompletionHandler.cs
@@ -31,7 +31,7 @@ protected override CompletionRegistrationOptions CreateRegistrationOptions(Compl
 
     public override Task<CompletionList> Handle(CompletionParams request, CancellationToken cancellationToken)
     {
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         CompletionList container = new();
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/Definition/DefinitionHandler.cs b/LanguageServer/Definition/DefinitionHandler.cs
@@ -21,7 +21,7 @@ protected override DefinitionRegistrationOptions CreateRegistrationOptions(Defin
 
     public override Task<LocationOrLocationLinks?> Handle(DefinitionParams request, CancellationToken cancellationToken)
     {
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         LocationOrLocationLinks? locationLinks = null;
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/DocumentColor/ColorPresentationHandler.cs b/LanguageServer/DocumentColor/ColorPresentationHandler.cs
@@ -11,7 +11,7 @@ class ColorPresentationHandler(ServerContext context) : ColorPresentationHandler
 
     public override Task<Container<ColorPresentation>> Handle(ColorPresentationParams request, CancellationToken cancellationToken)
     {
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         Container<ColorPresentation> container = new Container<ColorPresentation>();
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/DocumentColor/DocumentColorHandler.cs b/LanguageServer/DocumentColor/DocumentColorHandler.cs
@@ -22,7 +22,7 @@ protected override DocumentColorRegistrationOptions CreateRegistrationOptions(Co
 
     public override Task<Container<ColorInformation>?> Handle(DocumentColorParams request, CancellationToken cancellationToken)
     {
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         Container<ColorInformation>? container = null;
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/DocumentLink/DocumentLinkHandler.cs b/LanguageServer/DocumentLink/DocumentLinkHandler.cs
@@ -22,7 +22,7 @@ protected override DocumentLinkRegistrationOptions CreateRegistrationOptions(Doc
 
     public override Task<DocumentLinkContainer?> Handle(DocumentLinkParams request, CancellationToken cancellationToken)
     {
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         DocumentLinkContainer? container = null;
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/DocumentRender/EmmyAnnotatorHandler.cs b/LanguageServer/DocumentRender/EmmyAnnotatorHandler.cs
@@ -13,7 +13,7 @@ public class EmmyAnnotatorHandler(ServerContext context) : IJsonRpcRequestHandle
     public Task<List<EmmyAnnotatorResponse>> Handle(EmmyAnnotatorRequestParams request, CancellationToken cancellationToken)
     {
         var documentUri = DocumentUri.From(request.uri);
-        var uri = documentUri.ToUnencodedString();
+        var uri = documentUri.ToUri().AbsoluteUri;
         var response = new List<EmmyAnnotatorResponse>();
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/DocumentSymbol/DocumentSymbolHandler.cs b/LanguageServer/DocumentSymbol/DocumentSymbolHandler.cs
@@ -24,7 +24,7 @@ protected override DocumentSymbolRegistrationOptions CreateRegistrationOptions(D
     public override Task<SymbolInformationOrDocumentSymbolContainer?> Handle(DocumentSymbolParams request,
         CancellationToken cancellationToken)
     {
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         SymbolInformationOrDocumentSymbolContainer? container = null;
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/Hover/HoverHandler.cs b/LanguageServer/Hover/HoverHandler.cs
@@ -24,7 +24,7 @@ protected override HoverRegistrationOptions CreateRegistrationOptions(HoverCapab
     public override Task<OmniSharp.Extensions.LanguageServer.Protocol.Models.Hover?> Handle(HoverParams request,
         CancellationToken cancellationToken)
     {
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         OmniSharp.Extensions.LanguageServer.Protocol.Models.Hover? hover = null;
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/InlayHint/InlayHintHandler.cs b/LanguageServer/InlayHint/InlayHintHandler.cs
@@ -25,7 +25,7 @@ protected override InlayHintRegistrationOptions CreateRegistrationOptions(InlayH
 
     public override Task<InlayHintContainer?> Handle(InlayHintParams request, CancellationToken cancellationToken)
     {
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         InlayHintContainer? inlayHintContainer = null;
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/InlineValues/InlineValuesHandler.cs b/LanguageServer/InlineValues/InlineValuesHandler.cs
@@ -22,7 +22,7 @@ protected override InlineValueRegistrationOptions CreateRegistrationOptions(Inli
 
     public override Task<Container<InlineValueBase>?> Handle(InlineValueParams request, CancellationToken cancellationToken)
     {
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         Container<InlineValueBase>? container = null;
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/References/ReferencesHandler.cs b/LanguageServer/References/ReferencesHandler.cs
@@ -20,7 +20,7 @@ protected override ReferenceRegistrationOptions CreateRegistrationOptions(Refere
 
     public override Task<LocationContainer?> Handle(ReferenceParams request, CancellationToken cancellationToken)
     {
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         LocationContainer? locationContainer = null;
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/Rename/RenameHandler.cs b/LanguageServer/Rename/RenameHandler.cs
@@ -23,7 +23,7 @@ protected override RenameRegistrationOptions CreateRegistrationOptions(RenameCap
 
     public override Task<WorkspaceEdit?> Handle(RenameParams request, CancellationToken cancellationToken)
     {
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         WorkspaceEdit? workspaceEdit = null;
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/SemanticToken/SemanticTokenHandler.cs b/LanguageServer/SemanticToken/SemanticTokenHandler.cs
@@ -26,9 +26,9 @@ protected override SemanticTokensRegistrationOptions CreateRegistrationOptions(S
     protected override Task Tokenize(SemanticTokensBuilder builder, ITextDocumentIdentifierParams identifier,
         CancellationToken cancellationToken)
     {
+        var uri = identifier.TextDocument.Uri.ToUri().AbsoluteUri;
         context.ReadyRead(() =>
         {
-            var uri = identifier.TextDocument.Uri.ToUnencodedString();
             var semanticModel = context.LuaWorkspace.Compilation.GetSemanticModel(uri);
             if (semanticModel is not null)
             {

diff --git a/LanguageServer/SignatureHelper/SignatureHelperHandler.cs b/LanguageServer/SignatureHelper/SignatureHelperHandler.cs
@@ -23,7 +23,7 @@ protected override SignatureHelpRegistrationOptions CreateRegistrationOptions(Si
 
     public override Task<SignatureHelp?> Handle(SignatureHelpParams request, CancellationToken cancellationToken)
     {
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         SignatureHelp? signatureHelp = null;
         context.ReadyRead(() =>
         {

diff --git a/LanguageServer/TextDocument/TextDocumentHandler.cs b/LanguageServer/TextDocument/TextDocumentHandler.cs
@@ -35,7 +35,7 @@ protected override TextDocumentSyncRegistrationOptions CreateRegistrationOptions
 
     public override Task<Unit> Handle(DidOpenTextDocumentParams request, CancellationToken cancellationToken)
     {
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         context.ReadyWrite(() =>
         {
             context.LuaWorkspace.UpdateDocumentByUri(uri, request.TextDocument.Text);
@@ -52,11 +52,14 @@ public override Task<Unit> Handle(DidOpenTextDocumentParams request, Cancellatio
     public override Task<Unit> Handle(DidChangeTextDocumentParams request, CancellationToken cancellationToken)
     {
         var changes = request.ContentChanges.ToList();
-        var uri = request.TextDocument.Uri.ToUnencodedString();
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         context.ReadyWrite(() =>
         {
             context.LuaWorkspace.UpdateDocumentByUri(uri, changes[0].Text);
-            PushDiagnostic(request.TextDocument, context.LuaWorkspace.Compilation.GetSemanticModel(uri)!);
+            if (context.LuaWorkspace.Compilation.GetSemanticModel(uri) is { } semanticModel)
+            {
+                PushDiagnostic(request.TextDocument, semanticModel);
+            }
         });
 
         return Unit.Task;
@@ -69,9 +72,10 @@ public override Task<Unit> Handle(DidSaveTextDocumentParams request, Cancellatio
 
     public override Task<Unit> Handle(DidCloseTextDocumentParams request, CancellationToken cancellationToken)
     {
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         context.ReadyWrite(() =>
         {
-            context.LuaWorkspace.CloseDocument(request.TextDocument.Uri.ToUnencodedString());
+            context.LuaWorkspace.CloseDocument(uri);
         });
 
         return Unit.Task;

diff --git a/LanguageServer/TypeHierarchy/TypeHierarchyHandler.cs b/LanguageServer/TypeHierarchy/TypeHierarchyHandler.cs
@@ -25,9 +25,10 @@ protected override TypeHierarchyRegistrationOptions CreateRegistrationOptions(Ty
         CancellationToken cancellationToken)
     {
         Container<TypeHierarchyItem>? result = null;
+        var uri = request.TextDocument.Uri.ToUri().AbsoluteUri;
         context.ReadyRead(() =>
         {
-            var semanticModel = context.GetSemanticModel(request.TextDocument.Uri.ToUnencodedString());
+            var semanticModel = context.GetSemanticModel(uri);
             if (semanticModel is not null)
             {
                 var node = semanticModel.Document.SyntaxTree.SyntaxRoot.NameNodeAt(request.Position.Line,