Fix parsing quoted empty arg in response file (#185)

microsoft · Nov 20, 2023 · 61ce5b3 · 61ce5b3
1 parent 1ceb048
commit 61ce5b3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -100,6 +100,7 @@ jobs:
         name: test-logs-${{ matrix.os }}-node${{ matrix.node-version }}-${{ matrix.configuration }}
         path: |
           out/obj/${{ matrix.configuration }}/**/*.log
+          out/obj/${{ matrix.configuration }}/**/*.rsp
           out/test/**/*.trx
 
     - name: Check formatting

diff --git a/src/NodeApi.Generator/ModuleGenerator.cs b/src/NodeApi.Generator/ModuleGenerator.cs
@@ -38,7 +38,9 @@ public class ModuleGenerator : SourceGenerator, ISourceGenerator
 
     public GeneratorExecutionContext Context { get; protected set; }
 
+#pragma warning disable IDE0060 // Unused parameter
     public void Initialize(GeneratorInitializationContext context)
+#pragma warning restore IDE0060
     {
         // Note source generators cannot be directly launched in a debugger,
         // because the generator runs at build time, not at application run-time.

diff --git a/src/NodeApi.Generator/Program.cs b/src/NodeApi.Generator/Program.cs
@@ -281,17 +281,20 @@ private static IEnumerable<string> SplitWithQuotes(string line)
     {
         StringBuilder s = new();
         bool inQuotes = false;
+        bool foundQuotes = false;
         foreach (char c in line)
         {
             if (c == '"')
             {
                 inQuotes = !inQuotes;
+                foundQuotes = true;
             }
             else if (c == ' ' && !inQuotes)
             {
-                if (s.Length > 0)
+                if (s.Length > 0 || foundQuotes)
                 {
                     yield return s.ToString();
+                    foundQuotes = false;
                     s.Clear();
                 }
             }
@@ -301,7 +304,7 @@ private static IEnumerable<string> SplitWithQuotes(string line)
             }
         }
 
-        if (s.Length > 0)
+        if (s.Length > 0 || foundQuotes)
         {
             yield return s.ToString();
         }
@@ -344,7 +347,7 @@ private static void ResolveSystemAssemblies(
         {
             if (targetingPacks.Count == 0)
             {
-                // If no targeting packs were specified, use the deafult targeting pack for .NET.
+                // If no targeting packs were specified, use the default targeting pack for .NET.
                 targetingPacks.Add("Microsoft.NETCore.App");
             }