Merge pull request #4263 from MDoerner/ParserFileHandlingFix

retailcoder · web-flow · commit 5d6357cb0cb3 · 2018-08-10T19:55:26.000-04:00
More safety around handling the temp files in the parser
diff --git a/Rubberduck.API/VBA/Parser.cs b/Rubberduck.API/VBA/Parser.cs
@@ -97,7 +97,7 @@ internal Parser(object vbe) : this()
             _state = new RubberduckParserState(_vbe, projectRepository, declarationFinderFactory, _vbeEvents);
             _state.StateChanged += _state_StateChanged;
 
-            var sourceFileHandler = _vbe.SourceFileHandler;
+            var sourceFileHandler = _vbe.TempSourceFileHandler;
             var vbeVersion = double.Parse(_vbe.Version, CultureInfo.InvariantCulture);
             var predefinedCompilationConstants = new VBAPredefinedCompilationConstants(vbeVersion);
             var typeLibProvider = new TypeLibWrapperProvider(projectRepository);
diff --git a/Rubberduck.Main/Root/RubberduckIoCInstaller.cs b/Rubberduck.Main/Root/RubberduckIoCInstaller.cs
@@ -886,7 +886,7 @@ private void RegisterConstantVbeAndAddIn(IWindsorContainer container)
             container.Register(Component.For<ICommandBars>().Instance(_vbe.CommandBars));
             container.Register(Component.For<IUiContextProvider>().Instance(UiContextProvider.Instance()).LifestyleSingleton());
             container.Register(Component.For<IVBEEvents>().Instance(VBEEvents.Initialize(_vbe)).LifestyleSingleton());
-            container.Register(Component.For<ISourceFileHandler>().Instance(_vbe.SourceFileHandler));
+            container.Register(Component.For<ITempSourceFileHandler>().Instance(_vbe.TempSourceFileHandler));
         }
 
         private void RegisterHotkeyFactory(IWindsorContainer container)
diff --git a/Rubberduck.Parsing/VBA/Parsing/ModuleParser.cs b/Rubberduck.Parsing/VBA/Parsing/ModuleParser.cs
@@ -99,7 +99,7 @@ private ModuleParseResults ParseInternal(QualifiedModuleName module, Cancellatio
 
             Logger.Trace($"ParseTaskID {taskId} begins attributes pass.");
             var (attributesParseTree, attributesTokenStream) = AttributesPassResults(module, cancellationToken);
-            var attributesRewriter = _moduleRewriterFactory.AttributesRewriter(module, attributesTokenStream ?? codePaneTokenStream);
+            var attributesRewriter = _moduleRewriterFactory.AttributesRewriter(module, attributesTokenStream);
             Logger.Trace($"ParseTaskID {taskId} finished attributes pass.");
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -153,7 +153,7 @@ private IEnumerable<CommentNode> QualifyAndUnionComments(QualifiedModuleName qua
         private (IParseTree tree, ITokenStream tokenStream) AttributesPassResults(QualifiedModuleName module, CancellationToken token)
         {
             token.ThrowIfCancellationRequested();
-            var code = _attributesSourceCodeProvider.SourceCode(module) ?? string.Empty;
+            var code = _attributesSourceCodeProvider.SourceCode(module);
             token.ThrowIfCancellationRequested();
             var attributesParseResults = _parser.Parse(module.ComponentName, module.ProjectId, code, token, CodeKind.AttributesCode);
             return attributesParseResults;
diff --git a/Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj b/Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj
@@ -82,7 +82,7 @@
     <Compile Include="SourceCodeHandling\CodePaneSourceCodeHandler.cs" />
     <Compile Include="SourceCodeHandling\ISourceCodeHandler.cs" />
     <Compile Include="SourceCodeHandling\ISourceCodeProvider.cs" />
-    <Compile Include="SourceCodeHandling\ISourceFileHandler.cs" />
+    <Compile Include="SourceCodeHandling\ITempSourceFileHandler.cs" />
     <Compile Include="CommandBarLocation.cs" />
     <Compile Include="SafeComWrappers\Abstract\HostApplicationBase.cs" />
     <Compile Include="SafeComWrappers\Abstract\ISafeComWrapper.cs" />
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/VB/Abstract/IVBComponent.cs b/Rubberduck.VBEEditor/SafeComWrappers/VB/Abstract/IVBComponent.cs
@@ -20,7 +20,7 @@ public interface IVBComponent : ISafeComWrapper, IEquatable<IVBComponent>
         IWindow DesignerWindow();
         void Activate();
         void Export(string path);
-        string ExportAsSourceFile(string folder, bool tempFile = false);
+        string ExportAsSourceFile(string folder, bool tempFile = false, bool specialCaseDocumentModules = true);
         int FileCount { get; }
         string GetFileName(short index);
         IVBProject ParentProject { get; }
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/VB/Abstract/IVBE.cs b/Rubberduck.VBEEditor/SafeComWrappers/VB/Abstract/IVBE.cs
@@ -25,6 +25,6 @@ public interface IVBE : ISafeComWrapper, IEquatable<IVBE>
 
         bool IsInDesignMode { get; }
         int ProjectsCount { get; }
-        ISourceFileHandler SourceFileHandler { get; }
+        ITempSourceFileHandler TempSourceFileHandler { get; }
     }
 }
diff --git a/Rubberduck.VBEEditor/SourceCodeHandling/CodePaneSourceCodeHandler.cs b/Rubberduck.VBEEditor/SourceCodeHandling/CodePaneSourceCodeHandler.cs
@@ -22,7 +22,7 @@ public string SourceCode(QualifiedModuleName module)
 
             using (var codeModule = component.CodeModule)
             {
-                return codeModule.Content();
+                return codeModule.Content() ?? string.Empty;
             }
         }
 
diff --git a/Rubberduck.VBEEditor/SourceCodeHandling/ITempSourceFileHandler.cs b/Rubberduck.VBEEditor/SourceCodeHandling/ITempSourceFileHandler.cs
@@ -2,10 +2,10 @@
 
 namespace Rubberduck.VBEditor.SourceCodeHandling
 {
-    public interface ISourceFileHandler
+    public interface ITempSourceFileHandler
     {
         string Export(IVBComponent component);
-        void Import(IVBComponent component, string fileName);
+        void ImportAndCleanUp(IVBComponent component, string fileName);
 
         string Read(IVBComponent component);
     }
diff --git a/Rubberduck.VBEEditor/SourceCodeHandling/SourceFileHandlerSourceCodeHandlerAdapter.cs b/Rubberduck.VBEEditor/SourceCodeHandling/SourceFileHandlerSourceCodeHandlerAdapter.cs
@@ -7,12 +7,12 @@ namespace Rubberduck.VBEditor.SourceCodeHandling
     public class SourceFileHandlerSourceCodeHandlerAdapter : ISourceCodeHandler
     {
         private readonly IProjectsProvider _projectsProvider;
-        private readonly ISourceFileHandler _sourceFileHandler;
+        private readonly ITempSourceFileHandler _tempSourceFileHandler;
 
-        public SourceFileHandlerSourceCodeHandlerAdapter(ISourceFileHandler sourceFileHandler, IProjectsProvider projectsProvider)
+        public SourceFileHandlerSourceCodeHandlerAdapter(ITempSourceFileHandler tempSourceFileHandler, IProjectsProvider projectsProvider)
         {
             _projectsProvider = projectsProvider;
-            _sourceFileHandler = sourceFileHandler;
+            _tempSourceFileHandler = tempSourceFileHandler;
         }
 
         public string SourceCode(QualifiedModuleName module)
@@ -23,7 +23,7 @@ public string SourceCode(QualifiedModuleName module)
                 return string.Empty;
             }
 
-            return _sourceFileHandler.Read(component);
+            return _tempSourceFileHandler.Read(component) ?? string.Empty;
         }
 
         public void SubstituteCode(QualifiedModuleName module, string newCode)
@@ -40,9 +40,14 @@ public void SubstituteCode(QualifiedModuleName module, string newCode)
                 return;
             }
 
-            var file = _sourceFileHandler.Export(component);
-            File.WriteAllText(file, newCode);
-            _sourceFileHandler.Import(component, file);
+            var fileName = _tempSourceFileHandler.Export(component);
+            if (fileName == null || !File.Exists(fileName))
+            {
+                return;
+            }
+            File.WriteAllText(fileName, newCode);
+            _tempSourceFileHandler.ImportAndCleanUp(component, fileName);
+
         }
     }
 }
diff --git a/Rubberduck.VBEditor.VB6/ExternalFileTempSourceFileHandlerEmulator.cs b/Rubberduck.VBEditor.VB6/ExternalFileTempSourceFileHandlerEmulator.cs
@@ -1,37 +1,32 @@
 ﻿using System.IO;
 using System.Text;
-using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VBEditor.SourceCodeHandling;
 
 namespace Rubberduck.VBEditor.VB6
 {
-    public class SourceFileHandler : ISourceFileHandler
+    public class ExternalFileTempSourceFileHandlerEmulator : ITempSourceFileHandler
     {
         public string Export(IVBComponent component)
         {
             // VB6 source code is already external, and should be in the first associated file.
             return component.GetFileName(1);            
         }
 
-        public void Import(IVBComponent component, string fileName)
+        public void ImportAndCleanUp(IVBComponent component, string fileName)
         {
             // VB6 source code can be written directly in-place, without needing to import it, hence no-op.
         }
 
         public string Read(IVBComponent component)
         {
             var fileName = Export(component);
-            if (fileName == null)
+            if (fileName == null || !File.Exists(fileName))
             {
                 return null;
             }
 
-            var encoding = component.QualifiedModuleName.ComponentType == ComponentType.Document
-                ? Encoding.UTF8
-                : Encoding.Default;
-
-            return File.ReadAllText(fileName, encoding);
+            return File.ReadAllText(fileName, Encoding.Default);
         }        
     }
 }
diff --git a/Rubberduck.VBEditor.VB6/Rubberduck.VBEditor.VB6.csproj b/Rubberduck.VBEditor.VB6/Rubberduck.VBEditor.VB6.csproj
@@ -62,6 +62,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ExternalFileTempSourceFileHandlerEmulator.cs" />
     <Compile Include="Providers\VB6AddInProvider.cs" />
     <Compile Include="SafeComWrappers\Office\CommandBar.cs" />
     <Compile Include="SafeComWrappers\Office\CommandBarButton.cs" />
@@ -93,7 +94,6 @@
     <Compile Include="SafeComWrappers\VB\VBProjects.cs" />
     <Compile Include="SafeComWrappers\VB\Window.cs" />
     <Compile Include="SafeComWrappers\VB\Windows.cs" />
-    <Compile Include="SourceFileHandler.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Rubberduck.VBEEditor\Rubberduck.VBEditor.csproj">
diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBComponent.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBComponent.cs
@@ -124,7 +124,8 @@ public bool HasDesigner
         /// </summary>
         /// <param name="folder">Destination folder for the resulting source file.</param>
         /// <param name="tempFile">True if a unique temp file name should be generated. WARNING: filenames generated with this flag are not persisted.</param>
-        public string ExportAsSourceFile(string folder, bool tempFile = false)
+        /// <param name="specialCaseDocumentModules">If reimpot of a document file is required later, it has to receive special treatment.</param>
+        public string ExportAsSourceFile(string folder, bool tempFile = false, bool specialCaseDocumentModules = true)
         {
             throw new NotSupportedException("Export as source file is not supported in VB6");
         }
diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBE.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBE.cs
@@ -17,12 +17,12 @@ public class VBE : SafeComWrapper<VB.VBE>, IVBE
         public VBE(VB.VBE target, bool rewrapping = false)
             : base(target, rewrapping)
         {
-            SourceFileHandler = new SourceFileHandler();
+            TempSourceFileHandler = new ExternalFileTempSourceFileHandlerEmulator();
         }
 
         public VBEKind Kind => VBEKind.Standalone;
         public object HardReference => Target;
-        public ISourceFileHandler SourceFileHandler { get; }
+        public ITempSourceFileHandler TempSourceFileHandler { get; }
 
         public string Version => IsWrappingNullReference ? string.Empty : Target.Version;
 
diff --git a/Rubberduck.VBEditor.VBA/Rubberduck.VBEditor.VBA.csproj b/Rubberduck.VBEditor.VBA/Rubberduck.VBEditor.VBA.csproj
@@ -174,7 +174,7 @@
     <Compile Include="SafeComWrappers\VB\VBProjects.cs" />
     <Compile Include="SafeComWrappers\VB\Window.cs" />
     <Compile Include="SafeComWrappers\VB\Windows.cs" />
-    <Compile Include="SourceFileHandler.cs" />
+    <Compile Include="TempSourceFileHandler.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Rubberduck.Resources\Rubberduck.Resources.csproj">
diff --git a/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/VBComponent.cs b/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/VBComponent.cs
@@ -96,7 +96,8 @@ public bool HasDesigner
         /// </summary>
         /// <param name="folder">Destination folder for the resulting source file.</param>
         /// <param name="tempFile">True if a unique temp file name should be generated. WARNING: filenames generated with this flag are not persisted.</param>
-        public string ExportAsSourceFile(string folder, bool tempFile = false)
+        /// <param name="specialCaseDocumentModules">If reimpot of a document file is required later, it has to receive special treatment.</param>
+        public string ExportAsSourceFile(string folder, bool tempFile = false, bool specialCaseDocumentModules = true)
         {
             var fullPath = tempFile
                 ? Path.Combine(folder, Path.GetRandomFileName())
@@ -107,7 +108,14 @@ public string ExportAsSourceFile(string folder, bool tempFile = false)
                     ExportUserFormModule(fullPath);
                     break;
                 case ComponentType.Document:
-                    ExportDocumentModule(fullPath);
+                    if(specialCaseDocumentModules)
+                    {
+                        ExportDocumentModule(fullPath);
+                    }
+                    else
+                    {
+                        Export(fullPath);
+                    }
                     break;
                 default:
                     Export(fullPath);
diff --git a/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/VBE.cs b/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/VBE.cs
@@ -19,12 +19,12 @@ public class VBE : SafeComWrapper<VB.VBE>, IVBE
         public VBE(VB.VBE target, bool rewrapping = false)
             : base(target, rewrapping)
         {
-            SourceFileHandler = new SourceFileHandler();
+            TempSourceFileHandler = new TempSourceFileHandler();
         }
 
         public VBEKind Kind => VBEKind.Hosted;
         public object HardReference => Target;
-        public ISourceFileHandler SourceFileHandler { get; }
+        public ITempSourceFileHandler TempSourceFileHandler { get; }
 
         public string Version => IsWrappingNullReference ? string.Empty : Target.Version;
 
diff --git a/Rubberduck.VBEditor.VBA/TempSourceFileHandler.cs b/Rubberduck.VBEditor.VBA/TempSourceFileHandler.cs
@@ -1,49 +1,58 @@
 ﻿using System.IO;
 using System.Text;
 using Rubberduck.Resources;
-using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VBEditor.SourceCodeHandling;
 
 namespace Rubberduck.VBEditor.VBA
 {
-    public class SourceFileHandler : ISourceFileHandler
+    public class TempSourceFileHandler : ITempSourceFileHandler
     {
         public string Export(IVBComponent component)
         {
             if (!Directory.Exists(ApplicationConstants.RUBBERDUCK_TEMP_PATH))
             {
                 Directory.CreateDirectory(ApplicationConstants.RUBBERDUCK_TEMP_PATH);
             }
-            var fileName = component.ExportAsSourceFile(ApplicationConstants.RUBBERDUCK_TEMP_PATH);
+            var fileName = component.ExportAsSourceFile(ApplicationConstants.RUBBERDUCK_TEMP_PATH, true, false);
 
             return File.Exists(fileName) 
                 ? fileName 
-                : null; // a document component without any code wouldn't be exported (file would be empty anyway).            
+                : null;         
         }
 
-        public void Import(IVBComponent component, string fileName)
+        public void ImportAndCleanUp(IVBComponent component, string fileName)
         {
+            if (fileName == null || !File.Exists(fileName))
+            {
+                return;
+            }
+
             using (var components = component.Collection)
             {
                 components.Remove(component);
                 components.ImportSourceFile(fileName);
             }
+
+            try
+            {
+                File.Delete(fileName);
+            }
+            catch
+            {
+                // Meh.
+            }
         }
 
         public string Read(IVBComponent component)
         {
             var fileName = Export(component);
-            if (fileName == null)
+            if (fileName == null || !File.Exists(fileName))
             {
                 return null;
             }
 
-            var encoding = component.QualifiedModuleName.ComponentType == ComponentType.Document
-                ? Encoding.UTF8
-                : Encoding.Default;
-
-            var code = File.ReadAllText(fileName, encoding);
+            var code = File.ReadAllText(fileName, Encoding.Default);
             try
             {
                 File.Delete(fileName);
diff --git a/RubberduckTests/IoCContainer/IoCRegistrationTests.cs b/RubberduckTests/IoCContainer/IoCRegistrationTests.cs
@@ -18,8 +18,8 @@ public void RegistrationOfRubberduckIoCContainerWithSC_NoException()
         {
             var vbeBuilder = new MockVbeBuilder();
             var ideMock = vbeBuilder.Build();
-            var sourceFileHandler = new Mock<ISourceFileHandler>().Object;
-            ideMock.Setup(m => m.SourceFileHandler).Returns(() => sourceFileHandler);
+            var sourceFileHandler = new Mock<ITempSourceFileHandler>().Object;
+            ideMock.Setup(m => m.TempSourceFileHandler).Returns(() => sourceFileHandler);
             var ide = ideMock.Object;
             var addInBuilder = new MockAddInBuilder();
             var addin = addInBuilder.Build().Object;
@@ -46,8 +46,8 @@ public void RegistrationOfRubberduckIoCContainerWithoutSC_NoException()
         {
             var vbeBuilder = new MockVbeBuilder();
             var ideMock = vbeBuilder.Build();
-            var sourceFileHandler = new Mock<ISourceFileHandler>().Object;
-            ideMock.Setup(m => m.SourceFileHandler).Returns(() => sourceFileHandler);
+            var sourceFileHandler = new Mock<ITempSourceFileHandler>().Object;
+            ideMock.Setup(m => m.TempSourceFileHandler).Returns(() => sourceFileHandler);
             var ide = ideMock.Object;
             var addInBuilder = new MockAddInBuilder();
             var addin = addInBuilder.Build().Object;
diff --git a/RubberduckTests/IoCContainer/IoCResolvingTests.cs b/RubberduckTests/IoCContainer/IoCResolvingTests.cs
@@ -22,8 +22,8 @@ public void ResolveInspections_NoException()
         {
             var vbeBuilder = new MockVbeBuilder();
             var ideMock = vbeBuilder.Build();
-            var sourceFileHandler = new Mock<ISourceFileHandler>().Object;
-            ideMock.Setup(m => m.SourceFileHandler).Returns(() => sourceFileHandler);
+            var sourceFileHandler = new Mock<ITempSourceFileHandler>().Object;
+            ideMock.Setup(m => m.TempSourceFileHandler).Returns(() => sourceFileHandler);
             var ide = ideMock.Object;
             var addInBuilder = new MockAddInBuilder();
             var addin = addInBuilder.Build().Object;
@@ -63,8 +63,8 @@ public void ResolveRubberduckParserState_NoException()
         {
             var vbeBuilder = new MockVbeBuilder();
             var ideMock = vbeBuilder.Build();
-            var sourceFileHandler = new Mock<ISourceFileHandler>().Object;
-            ideMock.Setup(m => m.SourceFileHandler).Returns(() => sourceFileHandler);
+            var sourceFileHandler = new Mock<ITempSourceFileHandler>().Object;
+            ideMock.Setup(m => m.TempSourceFileHandler).Returns(() => sourceFileHandler);
             var ide = ideMock.Object;
             var addInBuilder = new MockAddInBuilder();
             var addin = addInBuilder.Build().Object;

Original file line number	Diff line number	Diff line change
`@@ -886,7 +886,7 @@ private void RegisterConstantVbeAndAddIn(IWindsorContainer container)`
`886`	`886`	`container.Register(Component.For<ICommandBars>().Instance(_vbe.CommandBars));`
`887`	`887`	`container.Register(Component.For<IUiContextProvider>().Instance(UiContextProvider.Instance()).LifestyleSingleton());`
`888`	`888`	`container.Register(Component.For<IVBEEvents>().Instance(VBEEvents.Initialize(_vbe)).LifestyleSingleton());`
`889`		`- container.Register(Component.For<ISourceFileHandler>().Instance(_vbe.SourceFileHandler));`
	`889`	`+ container.Register(Component.For<ITempSourceFileHandler>().Instance(_vbe.TempSourceFileHandler));`
`890`	`890`	`}`
`891`	`891`
`892`	`892`	`private void RegisterHotkeyFactory(IWindsorContainer container)`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ public interface IVBE : ISafeComWrapper, IEquatable<IVBE>`
`25`	`25`
`26`	`26`	`bool IsInDesignMode { get; }`
`27`	`27`	`int ProjectsCount { get; }`
`28`		`- ISourceFileHandler SourceFileHandler { get; }`
	`28`	`+ ITempSourceFileHandler TempSourceFileHandler { get; }`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public string SourceCode(QualifiedModuleName module)`
`22`	`22`
`23`	`23`	`using (var codeModule = component.CodeModule)`
`24`	`24`	`{`
`25`		`- return codeModule.Content();`
	`25`	`+ return codeModule.Content() ?? string.Empty;`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace Rubberduck.VBEditor.SourceCodeHandling`
`4`	`4`	`{`
`5`		`- public interface ISourceFileHandler`
	`5`	`+ public interface ITempSourceFileHandler`
`6`	`6`	`{`
`7`	`7`	`string Export(IVBComponent component);`
`8`		`- void Import(IVBComponent component, string fileName);`
	`8`	`+ void ImportAndCleanUp(IVBComponent component, string fileName);`
`9`	`9`
`10`	`10`	`string Read(IVBComponent component);`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ namespace Rubberduck.VBEditor.SourceCodeHandling`
`7`	`7`	`public class SourceFileHandlerSourceCodeHandlerAdapter : ISourceCodeHandler`
`8`	`8`	`{`
`9`	`9`	`private readonly IProjectsProvider _projectsProvider;`
`10`		`- private readonly ISourceFileHandler _sourceFileHandler;`
	`10`	`+ private readonly ITempSourceFileHandler _tempSourceFileHandler;`
`11`	`11`
`12`		`- public SourceFileHandlerSourceCodeHandlerAdapter(ISourceFileHandler sourceFileHandler, IProjectsProvider projectsProvider)`
	`12`	`+ public SourceFileHandlerSourceCodeHandlerAdapter(ITempSourceFileHandler tempSourceFileHandler, IProjectsProvider projectsProvider)`
`13`	`13`	`{`
`14`	`14`	`_projectsProvider = projectsProvider;`
`15`		`- _sourceFileHandler = sourceFileHandler;`
	`15`	`+ _tempSourceFileHandler = tempSourceFileHandler;`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public string SourceCode(QualifiedModuleName module)`
`@@ -23,7 +23,7 @@ public string SourceCode(QualifiedModuleName module)`
`23`	`23`	`return string.Empty;`
`24`	`24`	`}`
`25`	`25`
`26`		`- return _sourceFileHandler.Read(component);`
	`26`	`+ return _tempSourceFileHandler.Read(component) ?? string.Empty;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public void SubstituteCode(QualifiedModuleName module, string newCode)`
`@@ -40,9 +40,14 @@ public void SubstituteCode(QualifiedModuleName module, string newCode)`
`40`	`40`	`return;`
`41`	`41`	`}`
`42`	`42`
`43`		`- var file = _sourceFileHandler.Export(component);`
`44`		`- File.WriteAllText(file, newCode);`
`45`		`- _sourceFileHandler.Import(component, file);`
	`43`	`+ var fileName = _tempSourceFileHandler.Export(component);`
	`44`	`+ if (fileName == null \|\| !File.Exists(fileName))`
	`45`	`+ {`
	`46`	`+ return;`
	`47`	`+ }`
	`48`	`+ File.WriteAllText(fileName, newCode);`
	`49`	`+ _tempSourceFileHandler.ImportAndCleanUp(component, fileName);`
	`50`	`+`
`46`	`51`	`}`
`47`	`52`	`}`
`48`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,37 +1,32 @@`
`1`	`1`	`using System.IO;`
`2`	`2`	`using System.Text;`
`3`		`-using Rubberduck.VBEditor.SafeComWrappers;`
`4`	`3`	`using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
`5`	`4`	`using Rubberduck.VBEditor.SourceCodeHandling;`
`6`	`5`
`7`	`6`	`namespace Rubberduck.VBEditor.VB6`
`8`	`7`	`{`
`9`		`- public class SourceFileHandler : ISourceFileHandler`
	`8`	`+ public class ExternalFileTempSourceFileHandlerEmulator : ITempSourceFileHandler`
`10`	`9`	`{`
`11`	`10`	`public string Export(IVBComponent component)`
`12`	`11`	`{`
`13`	`12`	`// VB6 source code is already external, and should be in the first associated file.`
`14`	`13`	`return component.GetFileName(1);`
`15`	`14`	`}`
`16`	`15`
`17`		`- public void Import(IVBComponent component, string fileName)`
	`16`	`+ public void ImportAndCleanUp(IVBComponent component, string fileName)`
`18`	`17`	`{`
`19`	`18`	`// VB6 source code can be written directly in-place, without needing to import it, hence no-op.`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`public string Read(IVBComponent component)`
`23`	`22`	`{`
`24`	`23`	`var fileName = Export(component);`
`25`		`- if (fileName == null)`
	`24`	`+ if (fileName == null \|\| !File.Exists(fileName))`
`26`	`25`	`{`
`27`	`26`	`return null;`
`28`	`27`	`}`
`29`	`28`
`30`		`- var encoding = component.QualifiedModuleName.ComponentType == ComponentType.Document`
`31`		`- ? Encoding.UTF8`
`32`		`- : Encoding.Default;`
`33`		`-`
`34`		`- return File.ReadAllText(fileName, encoding);`
	`29`	`+ return File.ReadAllText(fileName, Encoding.Default);`
`35`	`30`	`}`
`36`	`31`	`}`
`37`	`32`	`}`