WI #2605 Code review

TypeCobolTeam · Jan 11, 2024 · 56e95d4 · 56e95d4
1 parent ad3b2f9
commit 56e95d4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/TypeCobol.LanguageServer/TypeCobolServer.cs b/TypeCobol.LanguageServer/TypeCobolServer.cs
@@ -11,6 +11,7 @@
 using TypeCobol.Compiler.Preprocessor;
 using TypeCobol.LanguageServer.Context;
 using TypeCobol.LanguageServer.SignatureHelper;
+using TypeCobol.LanguageServer.Utilities;
 using TypeCobol.Tools;
 
 using Range = TypeCobol.LanguageServer.VsCodeProtocol.Range;
@@ -89,7 +90,7 @@ private bool Logger(string message, Uri uri)
                 {
                     type = MessageType.Log,
                     message = message,
-                    textDocument = new TextDocumentIdentifier(GetOriginalUri(uri))
+                    textDocument = new TextDocumentIdentifier(uri.GetOriginalUri())
                 };
                 this.RpcServer.SendNotification(UriLogMessageNotification.Type, uriLogMessageParams);
             }
@@ -187,7 +188,7 @@ private void MissingCopiesDetected(object fileUri, MissingCopiesEvent missingCop
             //This event can be used when a dependency have not been loaded
 
             //Send missing copies to client
-            MissingCopiesDetected(new TextDocumentIdentifier(GetOriginalUri((Uri)fileUri)), missingCopiesEvent.Copies);
+            MissingCopiesDetected(new TextDocumentIdentifier(((Uri)fileUri).GetOriginalUri()), missingCopiesEvent.Copies);
         }
 
         /// <summary>
@@ -207,7 +208,8 @@ private void DiagnosticsDetected(object fileUri, DiagnosticEvent diagnosticEvent
                     diag.Info.ReferenceText));
             }
 
-            diagParameter.uri = GetOriginalUri((Uri)fileUri);
+            diagParameter.uri = ((Uri)fileUri).GetOriginalUri();
+            //diagParameter.uri = fileUri.ToString();
             diagParameter.diagnostics = diagList.ToArray();
             this.RpcServer.SendNotification(PublishDiagnosticsNotification.Type, diagParameter);
         }
@@ -239,18 +241,6 @@ protected DocumentContext GetDocumentContextFromStringUri(string uri, Workspace.
             return null;
         }
 
-        /// <summary>
-        /// Gets the original URI (which was set by the client)
-        /// DON'T use ToString() as it returns the canonically unescaped form of the URI
-        /// (it may cause issue if the path contains some blanks which need to be escaped)
-        /// </summary>
-        /// <param name="uri"></param>
-        /// <returns></returns>
-        private static string GetOriginalUri(Uri uri)
-        {
-            return uri.OriginalString;
-        }
-
         /// <summary>
         /// Creates workspace and returns language server capabilities.
         /// </summary>

diff --git a/TypeCobol.LanguageServer/Utilities/Extensions.cs b/TypeCobol.LanguageServer/Utilities/Extensions.cs
@@ -50,5 +50,17 @@ public static string ToLanguageServerOption(this LsrTestingOptions lsrOptions)
                     return "";
             }
         }
+
+        /// <summary>
+        /// Gets the original URI (which was set by the client)
+        /// DON'T use ToString() as it returns the canonically unescaped form of the URI
+        /// (it may cause issue if the path contains some blanks which need to be escaped)
+        /// </summary>
+        /// <param name="uri"></param>
+        /// <returns></returns>
+        public static string GetOriginalUri(this Uri uri)
+        {
+            return uri.OriginalString;
+        }
     }
 }