C#: Adjust buildless source generator folders

tamasvajk · tamasvajk · commit 0037ad406d40 · 2024-08-20T13:43:10.000+02:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorBase.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorBase.cs
@@ -83,7 +83,7 @@ protected override IEnumerable<string> Run()
                 var targetDir = GetTemporaryWorkingDirectory(FileType.ToLowerInvariant());
 
                 return groupedFiles
-                    .SelectMany(group => sourceGenerator.RunSourceGenerator(group.Value, group.Key, references, targetDir));
+                    .SelectMany(group => sourceGenerator.RunSourceGenerator(group.Value, group.Key, references, targetDir, fileProvider.SourceDir.FullName));
             }
             catch (Exception ex)
             {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/SourceGenerators/DotnetSourceGeneratorWrapper/DotnetSourceGeneratorWrapper.cs
@@ -33,11 +33,12 @@ public DotnetSourceGeneratorWrapper(
 
         protected abstract void GenerateAnalyzerConfig(IEnumerable<string> additionalFiles, string csprojFile, string analyzerConfigPath);
 
-        public IEnumerable<string> RunSourceGenerator(IEnumerable<string> additionalFiles, string csprojFile, IEnumerable<string> references, string targetDir)
+        public IEnumerable<string> RunSourceGenerator(IEnumerable<string> additionalFiles, string csprojFile, IEnumerable<string> references, string targetDir, string sourceDir)
         {
             try
             {
-                var name = FileUtils.ComputeHash($"{csprojFile}{Environment.NewLine}{this.GetType().Name}");
+                var relativePathToCsProj = Path.GetRelativePath(sourceDir, csprojFile);
+                var name = FileUtils.ComputeHash($"{relativePathToCsProj}{Environment.NewLine}{this.GetType().Name}");
                 using var tempDir = new TemporaryDirectory(Path.Join(FileUtils.GetTemporaryWorkingDirectory(out _), "source-generator"), "source generator temporary", logger);
                 var analyzerConfigPath = Path.Combine(tempDir.DirInfo.FullName, $"{name}.txt");
                 var dllPath = Path.Combine(tempDir.DirInfo.FullName, $"{name}.dll");
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone/Files.expected b/csharp/ql/integration-tests/all-platforms/cshtml_standalone/Files.expected
@@ -1,4 +1,4 @@
 | Program.cs |
 | Views/Home/Index.cshtml |
-| _ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_test_test_Views_Home_Index_cshtml.g.cs |
 | test-db/working/implicitUsings/GlobalUsings.g.cs |
+| test-db/working/razor/EC52D77FE9BF67AD10C5C3F248392316/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/[...]_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_test_test_Views_Home_Index_cshtml.g.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone/Files.ql b/csharp/ql/integration-tests/all-platforms/cshtml_standalone/Files.ql
@@ -4,11 +4,15 @@ private string getPath(File f) {
   result = f.getRelativePath() and
   not exists(result.indexOf("_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_"))
   or
-  exists(int index |
-    index =
+  exists(int index1, int index2, string pattern |
+    pattern = "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator" and
+    index1 = f.getRelativePath().indexOf(pattern) and
+    index2 =
       f.getRelativePath()
           .indexOf("_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_") and
-    result = f.getRelativePath().substring(index, f.getRelativePath().length())
+    result =
+      f.getRelativePath().substring(0, index1 + pattern.length()) + "/[...]" +
+        f.getRelativePath().substring(index2, f.getRelativePath().length())
   )
 }
 
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/Files.expected b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/Files.expected
@@ -1,2 +1,2 @@
-| Program.cs |
-| test-db/working/implicitUsings/GlobalUsings.g.cs |
+| Program.cs:0:0:0:0 | Program.cs |
+| test-db/working/implicitUsings/GlobalUsings.g.cs:0:0:0:0 | test-db/working/implicitUsings/GlobalUsings.g.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/Files.ql b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/Files.ql
@@ -1,20 +1,5 @@
 import csharp
 
-private string getPath(File f) {
-  result = f.getRelativePath() and
-  not exists(
-    result
-        .indexOf("_semmle_code_target_codeql_csharp_integration_tests_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_")
-  )
-  or
-  exists(int index |
-    index =
-      f.getRelativePath()
-          .indexOf("_semmle_code_target_codeql_csharp_integration_tests_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_") and
-    result = f.getRelativePath().substring(index, f.getRelativePath().length())
-  )
-}
-
 from File f
 where f.fromSource() or f.getExtension() = "cshtml"
-select getPath(f)
+select f
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_net6/Files.expected b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_net6/Files.expected
@@ -1,4 +1,4 @@
 | Program.cs |
 | Views/Home/Index.cshtml |
-| _ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_net6_test_test_Views_Home_Index_cshtml.g.cs |
 | test-db/working/implicitUsings/GlobalUsings.g.cs |
+| test-db/working/razor/EC52D77FE9BF67AD10C5C3F248392316/Microsoft.NET.Sdk.Razor.SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/[...]_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_net6_test_test_Views_Home_Index_cshtml.g.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_net6/Files.ql b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_net6/Files.ql
@@ -4,11 +4,15 @@ private string getPath(File f) {
   result = f.getRelativePath() and
   not exists(result.indexOf("_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_"))
   or
-  exists(int index |
-    index =
+  exists(int index1, int index2, string pattern |
+    pattern = "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator" and
+    index1 = f.getRelativePath().indexOf(pattern) and
+    index2 =
       f.getRelativePath()
           .indexOf("_ql_csharp_ql_integration_tests_all_platforms_cshtml_standalone_") and
-    result = f.getRelativePath().substring(index, f.getRelativePath().length())
+    result =
+      f.getRelativePath().substring(0, index1 + pattern.length()) + "/[...]" +
+        f.getRelativePath().substring(index2, f.getRelativePath().length())
   )
 }
 
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_resx/Files.expected b/csharp/ql/integration-tests/all-platforms/standalone_resx/Files.expected
@@ -1,3 +1,3 @@
-| Program.cs |
-| test-db/working/implicitUsings/GlobalUsings.g.cs |
-| test-db/working/resx/[...]/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.CSharpResxGenerator/test.Designer.cs |
+| Program.cs:0:0:0:0 | Program.cs |
+| test-db/working/implicitUsings/GlobalUsings.g.cs:0:0:0:0 | test-db/working/implicitUsings/GlobalUsings.g.cs |
+| test-db/working/resx/F4FAF6D9E0C1522913E76D38E8CF4F3F/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.CSharpResxGenerator/test.Designer.cs:0:0:0:0 | test-db/working/resx/F4FAF6D9E0C1522913E76D38E8CF4F3F/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.CSharpResxGenerator/test.Designer.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_resx/Files.ql b/csharp/ql/integration-tests/all-platforms/standalone_resx/Files.ql
@@ -1,22 +1,5 @@
 import csharp
 
-private string getPath(File f) {
-  result = f.getRelativePath() and
-  not exists(
-    result
-        .indexOf("Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.CSharpResxGenerator")
-  )
-  or
-  exists(int index |
-    index =
-      f.getRelativePath()
-          .indexOf("Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.CSharpResxGenerator") and
-    result =
-      f.getRelativePath().substring(0, index - 32 - 2) + "/[...]/" +
-        f.getRelativePath().substring(index, f.getRelativePath().length())
-  )
-}
-
 from File f
 where f.fromSource()
-select getPath(f)
+select f

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ protected override IEnumerable<string> Run()`
`83`	`83`	`var targetDir = GetTemporaryWorkingDirectory(FileType.ToLowerInvariant());`
`84`	`84`
`85`	`85`	`return groupedFiles`
`86`		`- .SelectMany(group => sourceGenerator.RunSourceGenerator(group.Value, group.Key, references, targetDir));`
	`86`	`+ .SelectMany(group => sourceGenerator.RunSourceGenerator(group.Value, group.Key, references, targetDir, fileProvider.SourceDir.FullName));`
`87`	`87`	`}`
`88`	`88`	`catch (Exception ex)`
`89`	`89`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,12 @@ public DotnetSourceGeneratorWrapper(`
`33`	`33`
`34`	`34`	`protected abstract void GenerateAnalyzerConfig(IEnumerable<string> additionalFiles, string csprojFile, string analyzerConfigPath);`
`35`	`35`
`36`		`- public IEnumerable<string> RunSourceGenerator(IEnumerable<string> additionalFiles, string csprojFile, IEnumerable<string> references, string targetDir)`
	`36`	`+ public IEnumerable<string> RunSourceGenerator(IEnumerable<string> additionalFiles, string csprojFile, IEnumerable<string> references, string targetDir, string sourceDir)`
`37`	`37`	`{`
`38`	`38`	`try`
`39`	`39`	`{`
`40`		`- var name = FileUtils.ComputeHash($"{csprojFile}{Environment.NewLine}{this.GetType().Name}");`
	`40`	`+ var relativePathToCsProj = Path.GetRelativePath(sourceDir, csprojFile);`
	`41`	`+ var name = FileUtils.ComputeHash($"{relativePathToCsProj}{Environment.NewLine}{this.GetType().Name}");`
`41`	`42`	`using var tempDir = new TemporaryDirectory(Path.Join(FileUtils.GetTemporaryWorkingDirectory(out _), "source-generator"), "source generator temporary", logger);`
`42`	`43`	`var analyzerConfigPath = Path.Combine(tempDir.DirInfo.FullName, $"{name}.txt");`
`43`	`44`	`var dllPath = Path.Combine(tempDir.DirInfo.FullName, $"{name}.dll");`