PR Feedback

Author: davidwengier

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/CreateComponentCodeActionResolver.cs

@@ -39,12 +39,7 @@ internal class CreateComponentCodeActionResolver(LanguageServerFeatureOptions la
         }
 
         var codeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-
-        // VS Code in Windows expects path to start with '/'
-        var updatedPath = _languageServerFeatureOptions.ReturnCodeActionAndRenamePathsWithPrefixedSlash && !actionParams.Path.StartsWith("/")
-            ? '/' + actionParams.Path
-            : actionParams.Path;
-        var newComponentUri = LspFactory.CreateFilePathUri(updatedPath);
+        var newComponentUri = LspFactory.CreateFilePathUri(actionParams.Path, _languageServerFeatureOptions);
 
         using var documentChanges = new PooledArrayBuilder<SumType<TextDocumentEdit, CreateFile, RenameFile, DeleteFile>>();
         documentChanges.Add(new CreateFile() { DocumentUri = new(newComponentUri) });

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCodeBehindCodeActionResolver.cs

@@ -41,13 +41,7 @@ internal class ExtractToCodeBehindCodeActionResolver(
 
         var path = FilePathNormalizer.Normalize(documentContext.Uri.GetAbsoluteOrUNCPath());
         var codeBehindPath = FileUtilities.GenerateUniquePath(path, $"{Path.GetExtension(path)}.cs");
-
-        // VS Code in Windows expects path to start with '/'
-        var updatedCodeBehindPath = _languageServerFeatureOptions.ReturnCodeActionAndRenamePathsWithPrefixedSlash && !codeBehindPath.StartsWith("/")
-            ? $"/{codeBehindPath}"
-            : codeBehindPath;
-
-        var codeBehindUri = LspFactory.CreateFilePathUri(updatedCodeBehindPath);
+        var codeBehindUri = LspFactory.CreateFilePathUri(codeBehindPath, _languageServerFeatureOptions);
 
         var text = await documentContext.GetSourceTextAsync(cancellationToken).ConfigureAwait(false);
 

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToComponentCodeActionResolver.cs

@@ -50,13 +50,7 @@ internal class ExtractToComponentCodeActionResolver(
         var templatePath = Path.Combine(directoryName, "Component.razor");
         var componentPath = FileUtilities.GenerateUniquePath(templatePath, ".razor");
         var componentName = Path.GetFileNameWithoutExtension(componentPath);
-
-        // VS Code in Windows expects path to start with '/'
-        componentPath = _languageServerFeatureOptions.ReturnCodeActionAndRenamePathsWithPrefixedSlash && !componentPath.StartsWith('/')
-            ? $"/{componentPath}"
-            : componentPath;
-
-        var newComponentUri = new DocumentUri(LspFactory.CreateFilePathUri(componentPath));
+        var newComponentUri = new DocumentUri(LspFactory.CreateFilePathUri(componentPath, _languageServerFeatureOptions));
 
         using var _ = StringBuilderPool.GetPooledObject(out var builder);
 

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCssCodeActionProvider.cs

@@ -65,14 +65,14 @@ public Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(RazorCodeAct
             return SpecializedTasks.EmptyImmutableArray<RazorVSInternalCodeAction>();
         }
 
-        if (textLiteral.LiteralTokens.All(t => t.IsWhitespace()))
+        if (textLiteral.LiteralTokens.All(static t => t.IsWhitespace()))
         {
             // If the text literal is all whitespace, we don't want to offer the action.
             return SpecializedTasks.EmptyImmutableArray<RazorVSInternalCodeAction>();
         }
 
         // If there are diagnostics, we can't trust the tree to be what we expect.
-        if (markupElement.GetDiagnostics().Any(d => d.Severity == RazorDiagnosticSeverity.Error))
+        if (markupElement.GetDiagnostics().Any(static d => d.Severity == RazorDiagnosticSeverity.Error))
         {
             return SpecializedTasks.EmptyImmutableArray<RazorVSInternalCodeAction>();
         }

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCssCodeActionResolver.cs

@@ -38,13 +38,7 @@ internal class ExtractToCssCodeActionResolver(
         var codeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
 
         var cssFilePath = $"{FilePathNormalizer.Normalize(documentContext.Uri.GetAbsoluteOrUNCPath())}.css";
-
-        // VS Code in Windows expects path to start with '/'
-        cssFilePath = _languageServerFeatureOptions.ReturnCodeActionAndRenamePathsWithPrefixedSlash && !cssFilePath.StartsWith("/")
-            ? $"/{cssFilePath}"
-            : cssFilePath;
-
-        var cssFileUri = LspFactory.CreateFilePathUri(cssFilePath);
+        var cssFileUri = LspFactory.CreateFilePathUri(cssFilePath, _languageServerFeatureOptions);
 
         var text = await documentContext.GetSourceTextAsync(cancellationToken).ConfigureAwait(false);
 
@@ -97,7 +91,7 @@ internal class ExtractToCssCodeActionResolver(
 
     private void GetLastLineNumberAndLength(string cssFilePath, out int lastLineNumber, out int lastLineLength)
     {
-        using var stream = _fileSystem.ReadStream(cssFilePath);
+        using var stream = _fileSystem.OpenReadStream(cssFilePath);
         GetLastLineNumberAndLength(stream, bufferSize: 4096, out lastLineNumber, out lastLineLength);
     }
 
@@ -107,38 +101,35 @@ private static void GetLastLineNumberAndLength(Stream stream, int bufferSize, ou
         lastLineLength = 0;
 
         using var _ = ArrayPool<char>.Shared.GetPooledArray(bufferSize, out var buffer);
-        using (var reader = new StreamReader(stream))
-        {
-            var currLineLength = 0;
-            var currLineNumber = 0;
+        using var reader = new StreamReader(stream);
+
+        var currLineLength = 0;
+        var currLineNumber = 0;
 
-            int charsRead;
-            while ((charsRead = reader.Read(buffer, 0, buffer.Length)) > 0)
+        int charsRead;
+        while ((charsRead = reader.Read(buffer, 0, buffer.Length)) > 0)
+        {
+            var chunk = buffer.AsSpan(0, charsRead);
+            while (true)
             {
-                var chunk = buffer.AsSpan()[..charsRead];
-                while (true)
+                // Since we're only concerned with the last line length, we don't need to worry about \r\n. Strictly speaking,
+                // we're incorrectly counting the \r in the line length, but since the last line can't end with a \n (since that
+                // starts a new line) it doesn't actually change the output of the method.
+                var index = chunk.IndexOf('\n');
+                if (index == -1)
                 {
-                    // Since we're only concerned with the last line length, we don't need to worry about \r\n. Strictly speaking,
-                    // we're incorrectly counting the \r in the line length, but since the last line can't end with a \n (since that
-                    // starts a new line) it doesn't actually change the output of the method.
-                    var index = chunk.IndexOf('\n');
-                    if (index == -1)
-                    {
-                        currLineLength += chunk.Length;
-                        break;
-                    }
-                    else
-                    {
-                        currLineNumber++;
-                        currLineLength = 0;
-                        chunk = chunk[(index + 1)..];
-                    }
+                    currLineLength += chunk.Length;
+                    break;
                 }
-            }
 
-            lastLineNumber = currLineNumber;
-            lastLineLength = currLineLength;
+                currLineNumber++;
+                currLineLength = 0;
+                chunk = chunk[(index + 1)..];
+            }
         }
+
+        lastLineNumber = currLineNumber;
+        lastLineLength = currLineLength;
     }
 
     internal readonly struct TestAccessor

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspFactory.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Roslyn.LanguageServer.Protocol;
@@ -205,6 +206,16 @@ public static TextEdit CreateTextEdit(LinePosition position, string newText)
     public static TextEdit CreateTextEdit((int line, int character) position, string newText)
         => CreateTextEdit(CreateZeroWidthRange(position), newText);
 
+    public static Uri CreateFilePathUri(string filePath, LanguageServerFeatureOptions options)
+    {
+        // VS Code in Windows expects path to start with '/'
+        var updateFilePath = options.ReturnCodeActionAndRenamePathsWithPrefixedSlash && !filePath.StartsWith('/')
+            ? $"/{filePath}"
+            : filePath;
+
+        return CreateFilePathUri(updateFilePath);
+    }
+
     public static Uri CreateFilePathUri(string filePath)
     {
         var builder = new UriBuilder

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/FileSystem.cs

@@ -20,6 +20,6 @@ public bool FileExists(string filePath)
     public string ReadFile(string filePath)
         => File.ReadAllText(filePath);
 
-    public Stream ReadStream(string filePath)
+    public Stream OpenReadStream(string filePath)
         => new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete);
 }

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/IFileSystem.cs

@@ -16,5 +16,5 @@ internal interface IFileSystem
 
     string ReadFile(string filePath);
 
-    Stream ReadStream(string filePath);
+    Stream OpenReadStream(string filePath);
 }

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Rename/RenameService.cs

@@ -136,19 +136,10 @@ private static ImmutableArray<IDocumentSnapshot> GetAllDocumentSnapshots(string
     private RenameFile GetFileRenameForComponent(IDocumentSnapshot documentSnapshot, string newPath)
         => new RenameFile
         {
-            OldDocumentUri = BuildUri(documentSnapshot.FilePath),
-            NewDocumentUri = BuildUri(newPath),
+            OldDocumentUri = new(LspFactory.CreateFilePathUri(documentSnapshot.FilePath, _languageServerFeatureOptions)),
+            NewDocumentUri = new(LspFactory.CreateFilePathUri(newPath, _languageServerFeatureOptions)),
         };
 
-    private DocumentUri BuildUri(string filePath)
-    {
-        // VS Code in Windows expects path to start with '/'
-        var updatedPath = _languageServerFeatureOptions.ReturnCodeActionAndRenamePathsWithPrefixedSlash && !filePath.StartsWith("/")
-                    ? '/' + filePath
-                    : filePath;
-        return new(LspFactory.CreateFilePathUri(updatedPath));
-    }
-
     private static string MakeNewPath(string originalPath, string newName)
     {
         var newFileName = $"{newName}{Path.GetExtension(originalPath)}";
@@ -171,7 +162,7 @@ private async Task AddEditsForCodeDocumentAsync(
         var codeDocument = await documentSnapshot.GetGeneratedOutputAsync(cancellationToken).ConfigureAwait(false);
 
         // VS Code in Windows expects path to start with '/'
-        var uri = BuildUri(documentSnapshot.FilePath);
+        var uri = new DocumentUri(LspFactory.CreateFilePathUri(documentSnapshot.FilePath, _languageServerFeatureOptions));
 
         AddEditsForCodeDocument(documentChanges, originTagHelpers, newName, uri, codeDocument);
     }

src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RemoteFileSystem.cs

@@ -19,8 +19,8 @@ public bool FileExists(string filePath)
     public string ReadFile(string filePath)
         => _fileSystem.ReadFile(filePath);
 
-    public Stream ReadStream(string filePath)
-        => _fileSystem.ReadStream(filePath);
+    public Stream OpenReadStream(string filePath)
+        => _fileSystem.OpenReadStream(filePath);
 
     public IEnumerable<string> GetDirectories(string workspaceDirectory)
         => _fileSystem.GetDirectories(workspaceDirectory);