Fix option parsing (#162)

jaredpar · Oct 11, 2024 · 39d24c8 · 39d24c8
1 parent 943e5e0
commit 39d24c8
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/src/Basic.CompilerLog.UnitTests/ExportUtilTests.cs b/src/Basic.CompilerLog.UnitTests/ExportUtilTests.cs
@@ -287,6 +287,43 @@ public void ExportUnixPaths()
         Assert.Contains(args[1], lines);
     }
 
+    [Fact]
+    public void ExportWithUnsafeOption()
+    {
+        RunDotNet("new console --name example --output .");
+
+        var projectFileContent = """
+            <Project Sdk="Microsoft.NET.Sdk">
+              <PropertyGroup>
+                <OutputType>Exe</OutputType>
+                <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+                <TargetFramework>net8.0</TargetFramework>
+                <ImplicitUsings>enable</ImplicitUsings>
+                <Nullable>enable</Nullable>
+              </PropertyGroup>
+            </Project>
+            """;
+        File.WriteAllText(Path.Combine(RootDirectory, "example.csproj"), projectFileContent, DefaultEncoding);
+
+        var codeContent = """
+            unsafe class C { }
+            """;
+        File.WriteAllText(Path.Combine(RootDirectory, "Code.cs"), codeContent, DefaultEncoding);
+
+        RunDotNet("build -bl -nr:false");
+
+        var binlog = Path.Combine(RootDirectory, "msbuild.binlog");
+        var complog = Path.Combine(RootDirectory, "msbuild.complog");
+        var result = CompilerLogUtil.TryConvertBinaryLog(binlog, complog);
+        Assert.True(result.Succeeded);
+
+        TestExport(
+            compilerLogFilePath: complog,
+            expectedCount: 1,
+            includeAnalyzers: false,
+            runBuild: true);
+    }
+
     private void EmbedLineCore(string contentFilePath)
     {
         RunDotNet($"new console --name example --output .");

diff --git a/src/Basic.CompilerLog.Util/ExportUtil.cs b/src/Basic.CompilerLog.Util/ExportUtil.cs
@@ -424,7 +424,18 @@ private static string MaybeQuoteArgument(string arg)
 
     private static bool IsOption(ReadOnlySpan<char> str) => OptionsRegex.IsMatch(str);
 
-    private const string OptionRegexContent = @"^/[a-z0-9]+:";
+    /// <summary>
+    /// Options start with a slash, then contain a colon and continue with a path,
+    /// or end with +/- or nothing. Examples:
+    /// <list type="bullet">
+    /// <item><c>/ref:...</c></item>
+    /// <item><c>/unsafe+</c></item>
+    /// <item><c>/checked-</c></item>
+    /// <item><c>/noconfig</c></item>
+    /// </list>
+    /// </summary>
+    /* lang=regex */
+    private const string OptionRegexContent = @"^/[a-z0-9]+(:|[+-]?$)";
 
 #if NET
     [GeneratedRegex(OptionRegexContent, RegexOptions.IgnoreCase)]