Set file path for text only conversion - fixes #589

Author: GrahamTheCoder

CHANGELOG.md

@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 
 ### Vsix
-
+* Fix file extension and location of single converted file [#589](https://github.com/icsharpcode/CodeConverter/issues/589)
 
 ### VB -> C#
 

CodeConverter/Shared/CompilationOptionsExtensions.cs

@@ -11,7 +11,12 @@ internal static class CompilationOptionsExtensions
     {
         public static Document AddDocumentFromTree(this Project project, SyntaxTree tree)
         {
-            return project.AddDocument("CodeToConvert", tree.GetRoot(), filePath: Path.Combine(Path.GetTempPath(), "TempCodeToConvert.txt"));
+            return project.AddDocument("CodeToConvert", tree.GetRoot(), filePath: string.IsNullOrEmpty(tree.FilePath) ? TempFilePath(tree.Options.Language) : tree.FilePath);
+        }
+
+        private static string TempFilePath(string optionsLanguage)
+        {
+            return Path.Combine(Path.GetTempPath(), "TempCodeToConvert." + optionsLanguage == LanguageNames.CSharp ? "cs" : "vb");
         }
 
         public static async Task<Project> CreateProjectAsync(this CompilationOptions options, IEnumerable<MetadataReference> references, ParseOptions parseOptions, string singleDocumentAssemblyName = "ProjectToBeConverted")

CodeConverter/Shared/ProjectConversion.cs

@@ -46,6 +46,7 @@ private ProjectConversion(IProjectContentsConverter projectContentsConverter, IE
 
             var languageConversion = new TLanguageConversion { ConversionOptions = conversionOptions };
             var syntaxTree = languageConversion.MakeFullCompilationUnit(text, out var textSpan);
+            if (conversionOptions.SourceFilePath != null) syntaxTree = syntaxTree.WithFilePath(conversionOptions.SourceFilePath);
             if (textSpan.HasValue) conversionOptions.SelectedTextSpan = textSpan.Value;
             var document = await languageConversion.CreateProjectDocumentFromTreeAsync(syntaxTree, conversionOptions.References);
             return await ConvertSingleAsync<TLanguageConversion>(document, conversionOptions, progress, cancellationToken);

CodeConverter/Shared/TextConversionOptions.cs

@@ -7,12 +7,14 @@ public class TextConversionOptions : SingleConversionOptions
     {
         private readonly ConversionOptions _conversionOptions;
 
-        public TextConversionOptions(IReadOnlyCollection<PortableExecutableReference> references)
+        public TextConversionOptions(IReadOnlyCollection<PortableExecutableReference> references, string sourceFilePath = null)
         {
             References = references;
+            SourceFilePath = sourceFilePath;
             _conversionOptions = new ConversionOptions();
         }
 
         public IReadOnlyCollection<PortableExecutableReference> References { get; }
+        public string SourceFilePath { get; }
     }
 }

Vsix/CodeConversion.cs

@@ -219,14 +219,15 @@ private async Task<string> GetConversionSummaryAsync(IReadOnlyCollection<string>
             var documentId = _visualStudioWorkspace.CurrentSolution.GetDocumentIdsWithFilePath(documentPath).SingleOrDefault();
             if (documentId == null) {
                 //If document doesn't belong to any project
-                return await ConvertTextOnlyAsync<TLanguageConversion>(documentPath, selected, cancellationToken);
+                await _outputWindow.WriteToOutputWindowAsync("File is not part of a compiling project, using best effort text conversion (less accurate).");
+                return await ConvertFileTextAsync<TLanguageConversion>(documentPath, selected, cancellationToken);
             }
             var document = _visualStudioWorkspace.CurrentSolution.GetDocument(documentId);
             var selectedTextSpan = new TextSpan(selected.Start, selected.Length);
             return await ProjectConversion.ConvertSingleAsync<TLanguageConversion>(document, new SingleConversionOptions {SelectedTextSpan = selectedTextSpan}, CreateOutputWindowProgress(), cancellationToken);
         }
 
-        private async Task<ConversionResult> ConvertTextOnlyAsync<TLanguageConversion>(string documentPath, Span selected, CancellationToken cancellationToken)
+        private async Task<ConversionResult> ConvertFileTextAsync<TLanguageConversion>(string documentPath, Span selected, CancellationToken cancellationToken)
             where TLanguageConversion : ILanguageConversion, new()
         {
             var documentText = File.ReadAllText(documentPath);
@@ -235,7 +236,7 @@ private async Task<ConversionResult> ConvertTextOnlyAsync<TLanguageConversion>(s
                 documentText = documentText.Substring(selected.Start, selected.Length);
             }
 
-            var convertTextOnly = await ProjectConversion.ConvertTextAsync<TLanguageConversion>(documentText, new TextConversionOptions(DefaultReferences.NetStandard2), CreateOutputWindowProgress(), cancellationToken);
+            var convertTextOnly = await ProjectConversion.ConvertTextAsync<TLanguageConversion>(documentText, new TextConversionOptions(DefaultReferences.NetStandard2, documentPath), CreateOutputWindowProgress(), cancellationToken);
             convertTextOnly.SourcePathOrNull = documentPath;
             return convertTextOnly;
         }