hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 02:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

C#: Adjust 'fromSource' to hold only on files passed to the compiler as a source file

Browse Source
This commit is contained in:
Tamas Vajk
2021-04-22 10:18:31 +02:00
parent a7cc9f98ef
commit 1dab1590ea
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
csharp/extractor/Semmle.Extraction.CSharp/Entities/File.cs
View File

@@ -17,14 +17,15 @@ namespace Semmle.Extraction.CSharp.Entities
public override void Populate(TextWriter trapFile)
{
trapFile.files(this, TransformedPath.Value, TransformedPath.NameWithoutExtension, TransformedPath.Extension);
var trees = Context.Compilation.SyntaxTrees.Where(t => t.FilePath == originalPath);
var isSource = trees.Any();
trapFile.files(this, TransformedPath.Value, TransformedPath.NameWithoutExtension, TransformedPath.Extension, isSource ? FileSourceKind.FromSource : FileSourceKind.Unknown);
if (TransformedPath.ParentDirectory is PathTransformer.ITransformedPath dir)
trapFile.containerparent(Extraction.Entities.Folder.Create(Context, dir), this);
var trees = Context.Compilation.SyntaxTrees.Where(t => t.FilePath == originalPath);
if (trees.Any())
if (isSource)
{
foreach (var text in trees.Select(tree => tree.GetText()))
{

2
csharp/extractor/Semmle.Extraction/Entities/GeneratedFile.cs
View File

@@ -10,7 +10,7 @@ namespace Semmle.Extraction.Entities
public override void Populate(TextWriter trapFile)
{
trapFile.files(this, "", "", "");
trapFile.files(this, "", "", "", FileSourceKind.Unknown);
}
public override void WriteId(TextWriter trapFile)

9
csharp/extractor/Semmle.Extraction/FileSourceKind.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Semmle.Extraction
{
public enum FileSourceKind
{
Unknown = 0,
FromSource = 1,
FromLibrary = 2
}
}

4
csharp/extractor/Semmle.Extraction/Tuples.cs
View File

@@ -18,9 +18,9 @@ namespace Semmle.Extraction
trapFile.WriteTuple("extractor_messages", error, (int)severity, origin, errorMessage, entityText, location, stackTrace);
}
public static void files(this System.IO.TextWriter trapFile, File file, string fullName, string name, string extension)
public static void files(this System.IO.TextWriter trapFile, File file, string fullName, string name, string extension, FileSourceKind kind)
{
trapFile.WriteTuple("files", file, fullName, name, extension, 0);
trapFile.WriteTuple("files", file, fullName, name, extension, (int)kind);
}
internal static void folders(this System.IO.TextWriter trapFile, Folder folder, string path, string name)

2
csharp/ql/src/semmle/code/csharp/File.qll
View File

@@ -192,7 +192,7 @@ class File extends Container, @file {
override string getURL() { result = "file://" + this.getAbsolutePath() + ":0:0:0:0" }
/** Holds if this file contains source code. */
predicate fromSource() { this.getNumberOfLinesOfCode() > 0 }
predicate fromSource() { files(this, _, _, _, 1) }
/** Holds if this file is a library. */
predicate fromLibrary() {