chore(Util): move module Uri under CSharpLanguageServer.Util

Author: razzmatazz

src/CSharpLanguageServer/Handlers/Diagnostic.fs

@@ -8,6 +8,7 @@ open Ionide.LanguageServerProtocol.JsonRpc
 open CSharpLanguageServer.Roslyn.Conversions
 open CSharpLanguageServer.State
 open CSharpLanguageServer.Types
+open CSharpLanguageServer.Util
 
 [<RequireQualifiedAccess>]
 module Diagnostic =

src/CSharpLanguageServer/Handlers/DocumentHighlight.fs

@@ -9,6 +9,7 @@ open Ionide.LanguageServerProtocol.JsonRpc
 
 open CSharpLanguageServer.State
 open CSharpLanguageServer.Roslyn.Conversions
+open CSharpLanguageServer.Util
 
 [<RequireQualifiedAccess>]
 module DocumentHighlight =

src/CSharpLanguageServer/Roslyn/Conversions.fs

@@ -10,29 +10,6 @@ open Ionide.LanguageServerProtocol.Types
 open CSharpLanguageServer.Util
 
 
-module Uri =
-    // Unescape some necessary char before passing string to Uri.
-    // Can't use Uri.UnescapeDataString here. For example, if uri is "file:///z%3a/src/c%23/ProjDir" ("%3a" is
-    // ":" and "%23" is "#"), Uri.UnescapeDataString will unescape both "%3a" and "%23". Then Uri will think
-    /// "#/ProjDir" is Fragment instead of part of LocalPath.
-    let unescape (uri: string) = uri.Replace("%3a", ":", true, null)
-
-    let toPath (uri: string) =
-        Uri.UnescapeDataString(Uri(unescape uri).LocalPath)
-
-    let fromPath (path: string) =
-        let metadataPrefix = "$metadata$/"
-
-        if path.StartsWith metadataPrefix then
-            "csharp:/metadata/" + path.Substring metadataPrefix.Length
-        else
-            Uri(path).ToString()
-
-    let toWorkspaceFolder (uri: string) : WorkspaceFolder =
-        { Uri = uri
-          Name = Uri.UnescapeDataString(Uri(unescape uri).Segments |> Array.last) }
-
-
 module Position =
     let fromLinePosition (pos: LinePosition) : Position =
         { Line = uint32 pos.Line

src/CSharpLanguageServer/Util.fs

@@ -12,6 +12,24 @@ let nonNull name (value: 'T when 'T: null) : 'T =
     else
         value
 
+module Uri =
+    // Unescape some necessary char before passing string to Uri.
+    // Can't use Uri.UnescapeDataString here. For example, if uri is "file:///z%3a/src/c%23/ProjDir" ("%3a" is
+    // ":" and "%23" is "#"), Uri.UnescapeDataString will unescape both "%3a" and "%23". Then Uri will think
+    /// "#/ProjDir" is Fragment instead of part of LocalPath.
+    let unescape (uri: string) = uri.Replace("%3a", ":", true, null)
+
+    let toPath (uri: string) =
+        Uri.UnescapeDataString(Uri(unescape uri).LocalPath)
+
+    let fromPath (path: string) =
+        let metadataPrefix = "$metadata$/"
+
+        if path.StartsWith metadataPrefix then
+            "csharp:/metadata/" + path.Substring metadataPrefix.Length
+        else
+            Uri(path).ToString()
+
 let parseFileUri s : string = Uri(s).LocalPath
 
 let tryParseFileUri s : string option =