Fix unicode character uri bug (#1143)

TylerLeonhardt · web-flow · commit 5f1253e37555 · 2020-01-08T13:19:39.000-08:00
* Handle Uris better for unicode characters

* delete commented out code

* rob's nit
diff --git a/src/PowerShellEditorServices/PowerShellEditorServices.csproj b/src/PowerShellEditorServices/PowerShellEditorServices.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.14.0" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.14.1" />
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
     <PackageReference Include="Serilog" Version="2.9.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
@@ -40,6 +40,6 @@
     <PackageReference Include="System.Security.Principal" Version="4.3.0" />
     <PackageReference Include="System.Security.Principal.Windows" Version="4.7.0" />
     <PackageReference Include="UnixConsoleEcho" Version="0.1.0" />
-    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.14.0" />
+    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.14.1" />
   </ItemGroup>
 </Project>
diff --git a/src/PowerShellEditorServices/Server/PsesLanguageServer.cs b/src/PowerShellEditorServices/Server/PsesLanguageServer.cs
@@ -101,7 +101,7 @@ public async Task StartAsync()
                             // Grab the workspace path from the parameters
                             if (request.RootUri != null)
                             {
-                                workspaceService.WorkspacePath = workspaceService.ResolveFilePath(request.RootUri.ToString());
+                                workspaceService.WorkspacePath = workspaceService.ResolveFileUri(request.RootUri).OriginalString;
                             }
 
                             // Set the working directory of the PowerShell session to the workspace path
diff --git a/src/PowerShellEditorServices/Services/PowerShellContext/EditorOperationsService.cs b/src/PowerShellEditorServices/Services/PowerShellContext/EditorOperationsService.cs
@@ -85,7 +85,7 @@ public async Task SetSelectionAsync(BufferRange selectionRange)
         public EditorContext ConvertClientEditorContext(
             ClientEditorContext clientContext)
         {
-            ScriptFile scriptFile = _workspaceService.CreateScriptFileFromFileBuffer(
+            ScriptFile scriptFile = _workspaceService.GetFileBuffer(
                 clientContext.CurrentFilePath,
                 clientContext.CurrentFileContent);
 
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeActionHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeActionHandler.cs
@@ -55,7 +55,7 @@ public void SetCapability(CodeActionCapability capability)
 
         public async Task<CommandOrCodeActionContainer> Handle(CodeActionParams request, CancellationToken cancellationToken)
         {
-            IReadOnlyDictionary<string, MarkerCorrection> corrections = await _analysisService.GetMostRecentCodeActionsForFileAsync(request.TextDocument.Uri.ToString());
+            IReadOnlyDictionary<string, MarkerCorrection> corrections = await _analysisService.GetMostRecentCodeActionsForFileAsync(request.TextDocument.Uri.OriginalString);
 
             if (corrections == null)
             {
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeLensHandlers.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeLensHandlers.cs
@@ -61,8 +61,7 @@ CodeLensRegistrationOptions IRegistration<CodeLensRegistrationOptions>.GetRegist
 
         public Task<CodeLensContainer> Handle(CodeLensParams request, CancellationToken cancellationToken)
         {
-            ScriptFile scriptFile = _workspaceService.GetFile(
-                request.TextDocument.Uri.ToString());
+            ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);
 
             CodeLens[] codeLensResults = ProvideCodeLenses(scriptFile);
 
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/CompletionHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CompletionHandler.cs
@@ -65,9 +65,7 @@ public async Task<CompletionList> Handle(CompletionParams request, CancellationT
             int cursorLine = (int) request.Position.Line + 1;
             int cursorColumn = (int) request.Position.Character + 1;
 
-            ScriptFile scriptFile =
-                _workspaceService.GetFile(
-                    request.TextDocument.Uri.ToString());
+            ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);
 
             CompletionResults completionResults =
                 await GetCompletionsInFileAsync(
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/DefinitionHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DefinitionHandler.cs
@@ -52,9 +52,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
 
         public async Task<LocationOrLocationLinks> Handle(DefinitionParams request, CancellationToken cancellationToken)
         {
-            ScriptFile scriptFile =
-                _workspaceService.GetFile(
-                    request.TextDocument.Uri.ToString());
+            ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);
 
             SymbolReference foundSymbol =
                 _symbolsService.FindSymbolAtLocation(
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentHighlightHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentHighlightHandler.cs
@@ -56,7 +56,7 @@ public Task<DocumentHighlightContainer> Handle(
             DocumentHighlightParams request,
             CancellationToken cancellationToken)
         {
-            ScriptFile scriptFile = _workspaceService.GetFile(PathUtils.FromUri(request.TextDocument.Uri));
+            ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);
 
             IReadOnlyList<SymbolReference> symbolOccurrences = _symbolsService.FindOccurrencesInFile(
                 scriptFile,
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentSymbolHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentSymbolHandler.cs
@@ -60,9 +60,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
 
         public Task<SymbolInformationOrDocumentSymbolContainer> Handle(DocumentSymbolParams request, CancellationToken cancellationToken)
         {
-            ScriptFile scriptFile =
-                _workspaceService.GetFile(
-                    request.TextDocument.Uri.ToString());
+            ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);
 
             IEnumerable<SymbolReference> foundSymbols =
                 this.ProvideDocumentSymbols(scriptFile);
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/FoldingRangeHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/FoldingRangeHandler.cs
@@ -54,7 +54,7 @@ public Task<Container<FoldingRange>> Handle(FoldingRangeRequestParam request, Ca
             // Perhaps a better option would be to parse the contents of the document as a string
             // as opposed to reading a file but the scenario of "no backing file" probably doesn't
             // warrant the extra effort.
-            if (!_workspaceService.TryGetFile(request.TextDocument.Uri.ToString(), out ScriptFile scriptFile)) { return null; }
+            if (!_workspaceService.TryGetFile(request.TextDocument.Uri, out ScriptFile scriptFile)) { return null; }
 
             var result = new List<FoldingRange>();
 
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/FormattingHandlers.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/FormattingHandlers.cs
@@ -46,7 +46,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
 
         public async Task<TextEditContainer> Handle(DocumentFormattingParams request, CancellationToken cancellationToken)
         {
-            var scriptFile = _workspaceService.GetFile(request.TextDocument.Uri.ToString());
+            var scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);
             var pssaSettings = _configurationService.CurrentSettings.CodeFormatting.GetPSSASettingsHashtable(
                 (int)request.Options.TabSize,
                 request.Options.InsertSpaces);
@@ -124,7 +124,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
 
         public async Task<TextEditContainer> Handle(DocumentRangeFormattingParams request, CancellationToken cancellationToken)
         {
-            var scriptFile = _workspaceService.GetFile(request.TextDocument.Uri.ToString());
+            var scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);
             var pssaSettings = _configurationService.CurrentSettings.CodeFormatting.GetPSSASettingsHashtable(
                 (int)request.Options.TabSize,
                 request.Options.InsertSpaces);
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/HoverHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/HoverHandler.cs
@@ -54,9 +54,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
 
         public async Task<Hover> Handle(HoverParams request, CancellationToken cancellationToken)
         {
-            ScriptFile scriptFile =
-                _workspaceService.GetFile(
-                    request.TextDocument.Uri.ToString());
+            ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);
 
             SymbolDetails symbolDetails =
                 await _symbolsService.FindSymbolDetailsAtLocationAsync(
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/ReferencesHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/ReferencesHandler.cs
@@ -48,9 +48,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
 
         public async Task<LocationContainer> Handle(ReferenceParams request, CancellationToken cancellationToken)
         {
-            ScriptFile scriptFile =
-                _workspaceService.GetFile(
-                    request.TextDocument.Uri.ToString());
+            ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);
 
             SymbolReference foundSymbol =
                 _symbolsService.FindSymbolAtLocation(
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/SignatureHelpHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/SignatureHelpHandler.cs
@@ -58,9 +58,7 @@ public SignatureHelpRegistrationOptions GetRegistrationOptions()
 
         public async Task<SignatureHelp> Handle(SignatureHelpParams request, CancellationToken cancellationToken)
         {
-            ScriptFile scriptFile =
-                _workspaceService.GetFile(
-                    request.TextDocument.Uri.ToString());
+            ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);
 
             ParameterSetSignatures parameterSets =
                 await _symbolsService.FindParameterSetsInFileAsync(
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs
@@ -51,7 +51,7 @@ public TextDocumentHandler(
 
         public Task<Unit> Handle(DidChangeTextDocumentParams notification, CancellationToken token)
         {
-            ScriptFile changedFile = _workspaceService.GetFile(notification.TextDocument.Uri.ToString());
+            ScriptFile changedFile = _workspaceService.GetFile(notification.TextDocument.Uri);
 
             // A text change notification can batch multiple change requests
             foreach (TextDocumentContentChangeEvent textChange in notification.ContentChanges)
@@ -85,7 +85,7 @@ public Task<Unit> Handle(DidOpenTextDocumentParams notification, CancellationTok
         {
             ScriptFile openedFile =
                 _workspaceService.GetFileBuffer(
-                    notification.TextDocument.Uri.ToString(),
+                    notification.TextDocument.Uri,
                     notification.TextDocument.Text);
 
             // TODO: Get all recently edited files in the workspace
@@ -106,7 +106,7 @@ TextDocumentRegistrationOptions IRegistration<TextDocumentRegistrationOptions>.G
         public Task<Unit> Handle(DidCloseTextDocumentParams notification, CancellationToken token)
         {
             // Find and close the file in the current session
-            var fileToClose = _workspaceService.GetFile(notification.TextDocument.Uri.ToString());
+            var fileToClose = _workspaceService.GetFile(notification.TextDocument.Uri);
 
             if (fileToClose != null)
             {
@@ -120,9 +120,7 @@ public Task<Unit> Handle(DidCloseTextDocumentParams notification, CancellationTo
 
         public async Task<Unit> Handle(DidSaveTextDocumentParams notification, CancellationToken token)
         {
-            ScriptFile savedFile =
-                _workspaceService.GetFile(
-                    notification.TextDocument.Uri.ToString());
+            ScriptFile savedFile = _workspaceService.GetFile(notification.TextDocument.Uri);
 
             if (savedFile != null)
             {
diff --git a/src/PowerShellEditorServices/Services/Workspace/Handlers/WorkspaceSymbolsHandler.cs b/src/PowerShellEditorServices/Services/Workspace/Handlers/WorkspaceSymbolsHandler.cs
@@ -90,15 +90,6 @@ private bool IsQueryMatch(string query, string symbolName)
             return symbolName.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0;
         }
 
-        private static string GetFileUri(string filePath)
-        {
-            // If the file isn't untitled, return a URI-style path
-            return
-                !filePath.StartsWith("untitled") && !filePath.StartsWith("inmemory")
-                    ? new Uri("file://" + filePath).AbsoluteUri
-                    : filePath;
-        }
-
         private static Range GetRangeFromScriptRegion(ScriptRegion scriptRegion)
         {
             return new Range
diff --git a/src/PowerShellEditorServices/Services/Workspace/WorkspaceService.cs b/src/PowerShellEditorServices/Services/Workspace/WorkspaceService.cs
diff --git a/src/PowerShellEditorServices/Utility/PathUtils.cs b/src/PowerShellEditorServices/Utility/PathUtils.cs
diff --git a/src/PowerShellEditorServices/Utility/VersionUtils.cs b/src/PowerShellEditorServices/Utility/VersionUtils.cs
diff --git a/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj b/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public async Task StartAsync()`
`101`	`101`	`// Grab the workspace path from the parameters`
`102`	`102`	`if (request.RootUri != null)`
`103`	`103`	`{`
`104`		`- workspaceService.WorkspacePath = workspaceService.ResolveFilePath(request.RootUri.ToString());`
	`104`	`+ workspaceService.WorkspacePath = workspaceService.ResolveFileUri(request.RootUri).OriginalString;`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`// Set the working directory of the PowerShell session to the workspace path`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public async Task SetSelectionAsync(BufferRange selectionRange)`
`85`	`85`	`public EditorContext ConvertClientEditorContext(`
`86`	`86`	`ClientEditorContext clientContext)`
`87`	`87`	`{`
`88`		`- ScriptFile scriptFile = _workspaceService.CreateScriptFileFromFileBuffer(`
	`88`	`+ ScriptFile scriptFile = _workspaceService.GetFileBuffer(`
`89`	`89`	`clientContext.CurrentFilePath,`
`90`	`90`	`clientContext.CurrentFileContent);`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void SetCapability(CodeActionCapability capability)`
`55`	`55`
`56`	`56`	`public async Task<CommandOrCodeActionContainer> Handle(CodeActionParams request, CancellationToken cancellationToken)`
`57`	`57`	`{`
`58`		`- IReadOnlyDictionary<string, MarkerCorrection> corrections = await _analysisService.GetMostRecentCodeActionsForFileAsync(request.TextDocument.Uri.ToString());`
	`58`	`+ IReadOnlyDictionary<string, MarkerCorrection> corrections = await _analysisService.GetMostRecentCodeActionsForFileAsync(request.TextDocument.Uri.OriginalString);`
`59`	`59`
`60`	`60`	`if (corrections == null)`
`61`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ CodeLensRegistrationOptions IRegistration<CodeLensRegistrationOptions>.GetRegist`
`61`	`61`
`62`	`62`	`public Task<CodeLensContainer> Handle(CodeLensParams request, CancellationToken cancellationToken)`
`63`	`63`	`{`
`64`		`- ScriptFile scriptFile = _workspaceService.GetFile(`
`65`		`- request.TextDocument.Uri.ToString());`
	`64`	`+ ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);`
`66`	`65`
`67`	`66`	`CodeLens[] codeLensResults = ProvideCodeLenses(scriptFile);`
`68`	`67`
Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()`
`52`	`52`
`53`	`53`	`public async Task<LocationOrLocationLinks> Handle(DefinitionParams request, CancellationToken cancellationToken)`
`54`	`54`	`{`
`55`		`- ScriptFile scriptFile =`
`56`		`- _workspaceService.GetFile(`
`57`		`- request.TextDocument.Uri.ToString());`
	`55`	`+ ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);`
`58`	`56`
`59`	`57`	`SymbolReference foundSymbol =`
`60`	`58`	`_symbolsService.FindSymbolAtLocation(`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public Task<DocumentHighlightContainer> Handle(`
`56`	`56`	`DocumentHighlightParams request,`
`57`	`57`	`CancellationToken cancellationToken)`
`58`	`58`	`{`
`59`		`- ScriptFile scriptFile = _workspaceService.GetFile(PathUtils.FromUri(request.TextDocument.Uri));`
	`59`	`+ ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);`
`60`	`60`
`61`	`61`	`IReadOnlyList<SymbolReference> symbolOccurrences = _symbolsService.FindOccurrencesInFile(`
`62`	`62`	`scriptFile,`
Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()`
`60`	`60`
`61`	`61`	`public Task<SymbolInformationOrDocumentSymbolContainer> Handle(DocumentSymbolParams request, CancellationToken cancellationToken)`
`62`	`62`	`{`
`63`		`- ScriptFile scriptFile =`
`64`		`- _workspaceService.GetFile(`
`65`		`- request.TextDocument.Uri.ToString());`
	`63`	`+ ScriptFile scriptFile = _workspaceService.GetFile(request.TextDocument.Uri);`
`66`	`64`
`67`	`65`	`IEnumerable<SymbolReference> foundSymbols =`
`68`	`66`	`this.ProvideDocumentSymbols(scriptFile);`