C#: Change constructor visibility to protected in abstract classes

tamasvajk · tamasvajk · commit 397be7e98ffb · 2020-10-13T13:27:46.000+02:00
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs
@@ -146,7 +146,7 @@ void FindFiles(string dir, int depth, int maxDepth, IList<(string, int)> results
         /// solution file and tools.
         /// </summary>
         /// <param name="options">The command line options.</param>
-        public Autobuilder(IBuildActions actions, AutobuildOptions options)
+        protected Autobuilder(IBuildActions actions, AutobuildOptions options)
         {
             Actions = actions;
             Options = options;
diff --git a/csharp/extractor/Semmle.Extraction.CIL.Driver/Program.cs b/csharp/extractor/Semmle.Extraction.CIL.Driver/Program.cs
@@ -39,7 +39,7 @@ static void Main(string[] args)
 
             var options = new ExtractorOptions(args);
             var layout = new Layout();
-            var logger = new ConsoleLogger(options.Verbosity);
+            using var logger = new ConsoleLogger(options.Verbosity);
 
             var actions = options.
                 AssembliesToExtract.Select(asm => asm.filename).
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Context.cs b/csharp/extractor/Semmle.Extraction.CIL/Context.cs
@@ -125,7 +125,7 @@ public abstract class GenericContext
     {
         public Context cx;
 
-        public GenericContext(Context cx)
+        protected GenericContext(Context cx)
         {
             this.cx = cx;
         }
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Type.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Type.cs
@@ -963,7 +963,7 @@ abstract class TypeParameter : Type, ITypeParameter
     {
         protected readonly GenericContext gc;
 
-        public TypeParameter(GenericContext gc) : base(gc.cx)
+        protected TypeParameter(GenericContext gc) : base(gc.cx)
         {
             this.gc = gc;
         }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
@@ -9,7 +9,7 @@ namespace Semmle.Extraction.CSharp.Entities
 {
     public abstract class Method : CachedSymbol<IMethodSymbol>, IExpressionParentEntity, IStatementParentEntity
     {
-        public Method(Context cx, IMethodSymbol init)
+        protected Method(Context cx, IMethodSymbol init)
             : base(cx, init) { }
 
         protected void PopulateParameters()
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Symbol.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Symbol.cs
@@ -11,7 +11,7 @@ namespace Semmle.Extraction.CSharp.Entities
 {
     public abstract class CachedSymbol<T> : CachedEntity<T> where T : ISymbol
     {
-        public CachedSymbol(Context cx, T init)
+        protected CachedSymbol(Context cx, T init)
             : base(cx, init) { }
 
         public virtual Type ContainingType => symbol.ContainingType != null ? Type.Create(Context, symbol.ContainingType) : null;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
@@ -33,7 +33,7 @@ public AnnotatedType(Type t, NullableAnnotation n)
 
     public abstract class Type : CachedSymbol<ITypeSymbol>
     {
-        public Type(Context cx, ITypeSymbol init)
+        protected Type(Context cx, ITypeSymbol init)
             : base(cx, init) { }
 
         public virtual AnnotatedType ElementType => default(AnnotatedType);
@@ -336,7 +336,7 @@ public override bool Equals(object obj)
 
     abstract class Type<T> : Type where T : ITypeSymbol
     {
-        public Type(Context cx, T init)
+        protected Type(Context cx, T init)
             : base(cx, init) { }
 
         public new T symbol => (T)base.symbol;
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Location.cs b/csharp/extractor/Semmle.Extraction/Entities/Location.cs
@@ -3,7 +3,7 @@ namespace Semmle.Extraction.Entities
 {
     public abstract class Location : CachedEntity<Microsoft.CodeAnalysis.Location?>
     {
-        public Location(Context cx, Microsoft.CodeAnalysis.Location? init)
+        protected Location(Context cx, Microsoft.CodeAnalysis.Location? init)
             : base(cx, init) { }
 
         public static Location Create(Context cx, Microsoft.CodeAnalysis.Location? loc) =>
diff --git a/csharp/extractor/Semmle.Extraction/FreshEntity.cs b/csharp/extractor/Semmle.Extraction/FreshEntity.cs
@@ -9,7 +9,7 @@ public abstract class FreshEntity : IEntity
     {
         protected readonly Context cx;
 
-        public FreshEntity(Context cx)
+        protected FreshEntity(Context cx)
         {
             this.cx = cx;
             cx.AddFreshLabel(this);
diff --git a/csharp/extractor/Semmle.Extraction/Symbol.cs b/csharp/extractor/Semmle.Extraction/Symbol.cs
@@ -9,7 +9,7 @@ namespace Semmle.Extraction
     /// <typeparam name="Initializer">The type of the symbol.</typeparam>
     public abstract class CachedEntity<Initializer> : ICachedEntity
     {
-        public CachedEntity(Context context, Initializer init)
+        protected CachedEntity(Context context, Initializer init)
         {
             Context = context;
             symbol = init;

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ void FindFiles(string dir, int depth, int maxDepth, IList<(string, int)> results`
`146`	`146`	`/// solution file and tools.`
`147`	`147`	`/// </summary>`
`148`	`148`	`/// <param name="options">The command line options.</param>`
`149`		`- public Autobuilder(IBuildActions actions, AutobuildOptions options)`
	`149`	`+ protected Autobuilder(IBuildActions actions, AutobuildOptions options)`
`150`	`150`	`{`
`151`	`151`	`Actions = actions;`
`152`	`152`	`Options = options;`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public abstract class GenericContext`
`125`	`125`	`{`
`126`	`126`	`public Context cx;`
`127`	`127`
`128`		`- public GenericContext(Context cx)`
	`128`	`+ protected GenericContext(Context cx)`
`129`	`129`	`{`
`130`	`130`	`this.cx = cx;`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -963,7 +963,7 @@ abstract class TypeParameter : Type, ITypeParameter`
`963`	`963`	`{`
`964`	`964`	`protected readonly GenericContext gc;`
`965`	`965`
`966`		`- public TypeParameter(GenericContext gc) : base(gc.cx)`
	`966`	`+ protected TypeParameter(GenericContext gc) : base(gc.cx)`
`967`	`967`	`{`
`968`	`968`	`this.gc = gc;`
`969`	`969`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Semmle.Extraction.CSharp.Entities`
`9`	`9`	`{`
`10`	`10`	`public abstract class Method : CachedSymbol<IMethodSymbol>, IExpressionParentEntity, IStatementParentEntity`
`11`	`11`	`{`
`12`		`- public Method(Context cx, IMethodSymbol init)`
	`12`	`+ protected Method(Context cx, IMethodSymbol init)`
`13`	`13`	`: base(cx, init) { }`
`14`	`14`
`15`	`15`	`protected void PopulateParameters()`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace Semmle.Extraction.CSharp.Entities`
`11`	`11`	`{`
`12`	`12`	`public abstract class CachedSymbol<T> : CachedEntity<T> where T : ISymbol`
`13`	`13`	`{`
`14`		`- public CachedSymbol(Context cx, T init)`
	`14`	`+ protected CachedSymbol(Context cx, T init)`
`15`	`15`	`: base(cx, init) { }`
`16`	`16`
`17`	`17`	`public virtual Type ContainingType => symbol.ContainingType != null ? Type.Create(Context, symbol.ContainingType) : null;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public AnnotatedType(Type t, NullableAnnotation n)`
`33`	`33`
`34`	`34`	`public abstract class Type : CachedSymbol<ITypeSymbol>`
`35`	`35`	`{`
`36`		`- public Type(Context cx, ITypeSymbol init)`
	`36`	`+ protected Type(Context cx, ITypeSymbol init)`
`37`	`37`	`: base(cx, init) { }`
`38`	`38`
`39`	`39`	`public virtual AnnotatedType ElementType => default(AnnotatedType);`
`@@ -336,7 +336,7 @@ public override bool Equals(object obj)`
`336`	`336`
`337`	`337`	`abstract class Type<T> : Type where T : ITypeSymbol`
`338`	`338`	`{`
`339`		`- public Type(Context cx, T init)`
	`339`	`+ protected Type(Context cx, T init)`
`340`	`340`	`: base(cx, init) { }`
`341`	`341`
`342`	`342`	`public new T symbol => (T)base.symbol;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ namespace Semmle.Extraction.Entities`
`3`	`3`	`{`
`4`	`4`	`public abstract class Location : CachedEntity<Microsoft.CodeAnalysis.Location?>`
`5`	`5`	`{`
`6`		`- public Location(Context cx, Microsoft.CodeAnalysis.Location? init)`
	`6`	`+ protected Location(Context cx, Microsoft.CodeAnalysis.Location? init)`
`7`	`7`	`: base(cx, init) { }`
`8`	`8`
`9`	`9`	`public static Location Create(Context cx, Microsoft.CodeAnalysis.Location? loc) =>`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public abstract class FreshEntity : IEntity`
`9`	`9`	`{`
`10`	`10`	`protected readonly Context cx;`
`11`	`11`
`12`		`- public FreshEntity(Context cx)`
	`12`	`+ protected FreshEntity(Context cx)`
`13`	`13`	`{`
`14`	`14`	`this.cx = cx;`
`15`	`15`	`cx.AddFreshLabel(this);`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Semmle.Extraction`
`9`	`9`	`/// <typeparam name="Initializer">The type of the symbol.</typeparam>`
`10`	`10`	`public abstract class CachedEntity<Initializer> : ICachedEntity`
`11`	`11`	`{`
`12`		`- public CachedEntity(Context context, Initializer init)`
	`12`	`+ protected CachedEntity(Context context, Initializer init)`
`13`	`13`	`{`
`14`	`14`	`Context = context;`
`15`	`15`	`symbol = init;`