Merge branch 'main' into alexdenisov/move-location-extraction

Author: AlexDenisov

csharp/extractor/Semmle.Extraction.CSharp/Entities/Modifier.cs

@@ -85,6 +85,9 @@ private static void ExtractNamedTypeModifiers(Context cx, TextWriter trapFile, I
             if (nt.IsRecord)
                 HasModifier(cx, trapFile, key, Modifiers.Record);
 
+            if (nt.IsFileLocal)
+                HasModifier(cx, trapFile, key, Modifiers.File);
+
             if (nt.TypeKind == TypeKind.Struct)
             {
                 if (nt.IsReadOnly)
@@ -97,7 +100,11 @@ private static void ExtractNamedTypeModifiers(Context cx, TextWriter trapFile, I
 
         public static void ExtractModifiers(Context cx, TextWriter trapFile, IEntity key, ISymbol symbol)
         {
-            HasAccessibility(cx, trapFile, key, symbol.DeclaredAccessibility);
+            // A file scoped type has declared accessibility `internal` which we shouldn't extract.
+            // The file modifier is extracted as a source level modifier.
+            if (symbol.Kind != SymbolKind.NamedType || !((INamedTypeSymbol)symbol).IsFileLocal)
+                HasAccessibility(cx, trapFile, key, symbol.DeclaredAccessibility);
+
             if (symbol.Kind == SymbolKind.ErrorType)
                 trapFile.has_modifiers(key, Modifier.Create(cx, Accessibility.Public));
 

csharp/extractor/Semmle.Extraction.CSharp/Entities/Modifiers.cs

@@ -4,6 +4,7 @@ internal static class Modifiers
     public const string Async = "async";
     public const string Const = "const";
     public const string Extern = "extern";
+    public const string File = "file";
     public const string Internal = "internal";
     public const string New = "new";
     public const string Override = "override";

csharp/extractor/Semmle.Extraction.CSharp/SymbolExtensions.cs

@@ -282,54 +282,60 @@ private static void BuildFunctionPointerTypeId(this IFunctionPointerTypeSymbol f
         public static IEnumerable<IFieldSymbol?> GetTupleElementsMaybeNull(this INamedTypeSymbol type) =>
             type.TupleElements;
 
-        private static void BuildNamedTypeId(this INamedTypeSymbol named, Context cx, EscapingTextWriter trapFile, ISymbol symbolBeingDefined, bool constructUnderlyingTupleType)
+        private static void BuildQualifierAndName(INamedTypeSymbol named, Context cx, EscapingTextWriter trapFile, ISymbol symbolBeingDefined)
         {
-            if (!constructUnderlyingTupleType && named.IsTupleType)
+            if (named.ContainingType is not null)
             {
-                trapFile.Write('(');
-                trapFile.BuildList(",", named.GetTupleElementsMaybeNull(),
-                    (i, f) =>
-                    {
-                        if (f is null)
-                        {
-                            trapFile.Write($"null({i})");
-                        }
-                        else
-                        {
-                            trapFile.Write((f.CorrespondingTupleField ?? f).Name);
-                            trapFile.Write(":");
-                            f.Type.BuildOrWriteId(cx, trapFile, symbolBeingDefined, constructUnderlyingTupleType: false);
-                        }
-                    }
-                    );
-                trapFile.Write(")");
-                return;
+                named.ContainingType.BuildOrWriteId(cx, trapFile, symbolBeingDefined, constructUnderlyingTupleType: false);
+                trapFile.Write('.');
             }
-
-            void AddContaining()
+            else if (named.ContainingNamespace is not null)
             {
-                if (named.ContainingType is not null)
-                {
-                    named.ContainingType.BuildOrWriteId(cx, trapFile, symbolBeingDefined, constructUnderlyingTupleType: false);
-                    trapFile.Write('.');
-                }
-                else if (named.ContainingNamespace is not null)
+                if (cx.ShouldAddAssemblyTrapPrefix && named.ContainingAssembly is not null)
+                    BuildAssembly(named.ContainingAssembly, trapFile);
+                named.ContainingNamespace.BuildNamespace(cx, trapFile);
+            }
+
+            var name = named.IsFileLocal ? named.MetadataName : named.Name;
+            trapFile.Write(name);
+        }
+
+        private static void BuildTupleId(INamedTypeSymbol named, Context cx, EscapingTextWriter trapFile, ISymbol symbolBeingDefined)
+        {
+            trapFile.Write('(');
+            trapFile.BuildList(",", named.GetTupleElementsMaybeNull(),
+                (i, f) =>
                 {
-                    if (cx.ShouldAddAssemblyTrapPrefix && named.ContainingAssembly is not null)
-                        BuildAssembly(named.ContainingAssembly, trapFile);
-                    named.ContainingNamespace.BuildNamespace(cx, trapFile);
+                    if (f is null)
+                    {
+                        trapFile.Write($"null({i})");
+                    }
+                    else
+                    {
+                        trapFile.Write((f.CorrespondingTupleField ?? f).Name);
+                        trapFile.Write(":");
+                        f.Type.BuildOrWriteId(cx, trapFile, symbolBeingDefined, constructUnderlyingTupleType: false);
+                    }
                 }
+                );
+            trapFile.Write(")");
+        }
+
+        private static void BuildNamedTypeId(this INamedTypeSymbol named, Context cx, EscapingTextWriter trapFile, ISymbol symbolBeingDefined, bool constructUnderlyingTupleType)
+        {
+            if (!constructUnderlyingTupleType && named.IsTupleType)
+            {
+                BuildTupleId(named, cx, trapFile, symbolBeingDefined);
+                return;
             }
 
             if (named.TypeParameters.IsEmpty)
             {
-                AddContaining();
-                trapFile.Write(named.Name);
+                BuildQualifierAndName(named, cx, trapFile, symbolBeingDefined);
             }
             else if (named.IsReallyUnbound())
             {
-                AddContaining();
-                trapFile.Write(named.Name);
+                BuildQualifierAndName(named, cx, trapFile, symbolBeingDefined);
                 trapFile.Write("`");
                 trapFile.Write(named.TypeParameters.Length);
             }

csharp/ql/lib/change-notes/2023-02-17-filescopedtypes.md

@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* C# 11: Added extractor and library support for `file` scoped types.

csharp/ql/lib/semmle/code/csharp/Member.qll

@@ -93,6 +93,9 @@ class Modifiable extends Declaration, @modifiable {
   /** Holds if this declaration has the modifier `required`. */
   predicate isRequired() { this.hasModifier("required") }
 
+  /** Holds if this declaration is `file` local. */
+  predicate isFile() { this.hasModifier("file") }
+
   /** Holds if this declaration is `unsafe`. */
   predicate isUnsafe() {
     this.hasModifier("unsafe") or
@@ -183,6 +186,8 @@ class Member extends DotNet::Member, Modifiable, @member {
   override predicate isStatic() { Modifiable.super.isStatic() }
 
   override predicate isRequired() { Modifiable.super.isRequired() }
+
+  override predicate isFile() { Modifiable.super.isFile() }
 }
 
 private class TOverridable = @virtualizable or @callable_accessor;

csharp/ql/lib/semmle/code/dotnet/Declaration.qll

@@ -83,6 +83,9 @@ class Member extends Declaration, @dotnet_member {
   /** Holds if this member is declared `required`. */
   predicate isRequired() { none() }
 
+  /** Holds if this member is declared `file` local. */
+  predicate isFile() { none() }
+
   /**
    * Holds if this member has name `name` and is defined in type `type`
    * with namespace `namespace`.

csharp/ql/test/library-tests/csharp11/FileScoped1.cs

@@ -0,0 +1,25 @@
+file interface I1 { }
+
+file interface I2 { }
+
+file class C1 : I1 { }
+
+public class C2 { }
+
+public class C3 : I2 { }
+
+file interface IC { }
+
+file class C4<T> { }
+
+file class C5<S> : C4<S> { }
+
+file struct S1 { }
+
+file enum E1 { }
+
+file delegate void D1();
+
+file record R1 { }
+
+file record struct RS1 { }

csharp/ql/test/library-tests/csharp11/FileScoped2.cs

@@ -0,0 +1,23 @@
+file interface I1 { }
+
+public interface I2 { }
+
+file class C1 { }
+
+file class C2 : I2 { }
+
+file class IC { }
+
+file class C4<T> { }
+
+file class C5<S> : C4<S> { }
+
+file struct S1 { }
+
+file enum E1 { }
+
+file delegate void D1();
+
+file record R1 { }
+
+file record struct RS1 { }

csharp/ql/test/library-tests/csharp11/FileScoped3.cs

@@ -0,0 +1,7 @@
+namespace TestFileScoped;
+
+file interface I10 { }
+
+file class C10 { }
+
+public class C11 : I10 { }

csharp/ql/test/library-tests/csharp11/FileScoped4.cs

@@ -0,0 +1,7 @@
+namespace TestFileScoped;
+
+public interface I10 { }
+
+file class C10 { }
+
+file class C11 : I10 { }