Fixed missing comma on path update

seesharper · seesharper · commit 9614c6273b82 · 2019-06-20T22:07:23.000+02:00
diff --git a/src/Dotnet.Script.Core/Scaffolder.cs b/src/Dotnet.Script.Core/Scaffolder.cs
@@ -174,7 +174,7 @@ private void CreateLaunchConfiguration(string currentWorkingDirectory)
                 }
                 else
                 {
-                    string pattern = @"^(\s*"")(.*dotnet-script.dll)("").*$";
+                    string pattern = @"^(\s*"")(.*dotnet-script.dll)(""\s*,).*$";
                     if (Regex.IsMatch(launchFileContent, pattern, RegexOptions.Multiline))
                     {
                         var newLaunchFileContent = Regex.Replace(launchFileContent, pattern, $"$1{dotnetScriptPath}$3", RegexOptions.Multiline);
diff --git a/src/Dotnet.Script.Tests/ScaffoldingTests.cs b/src/Dotnet.Script.Tests/ScaffoldingTests.cs
@@ -5,7 +5,6 @@
 using System;
 using System.IO;
 using System.Reflection;
-using System.Text.RegularExpressions;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -172,7 +171,7 @@ public void ShouldUpdatePathToDotnetScript()
                 var pathToLaunchConfiguration = Path.Combine(scriptFolder.Path, ".vscode/launch.json");
                 var config = JObject.Parse(File.ReadAllText(pathToLaunchConfiguration));
 
-                config.SelectToken("configurations[0].args[1]").Replace("InvalidPath/dotnet-script.dll,");
+                config.SelectToken("configurations[0].args[1]").Replace("InvalidPath/dotnet-script.dll");
 
                 File.WriteAllText(pathToLaunchConfiguration, config.ToString());
 

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ private void CreateLaunchConfiguration(string currentWorkingDirectory)`
`174`	`174`	`}`
`175`	`175`	`else`
`176`	`176`	`{`
`177`		`- string pattern = @"^(\s"")(.dotnet-script.dll)("").*$";`
	`177`	`+ string pattern = @"^(\s"")(.dotnet-script.dll)(""\s,).$";`
`178`	`178`	`if (Regex.IsMatch(launchFileContent, pattern, RegexOptions.Multiline))`
`179`	`179`	`{`
`180`	`180`	`var newLaunchFileContent = Regex.Replace(launchFileContent, pattern, $"$1{dotnetScriptPath}$3", RegexOptions.Multiline);`