C#: Fix modifier orders

tamasvajk · tamasvajk · commit d5382f2cfdaa · 2020-10-13T14:45:37.000+02:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs
@@ -78,7 +78,7 @@ public override void Populate(TextWriter trapFile)
             }
         }
 
-        public new static Accessor Create(Context cx, IMethodSymbol symbol) =>
+        public static new Accessor Create(Context cx, IMethodSymbol symbol) =>
             AccessorFactory.Instance.CreateEntityFromSymbol(cx, symbol);
 
         private class AccessorFactory : ICachedEntityFactory<IMethodSymbol, Accessor>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
@@ -97,7 +97,7 @@ private ConstructorDeclarationSyntax Syntax
             }
         }
 
-        public new static Constructor Create(Context cx, IMethodSymbol constructor)
+        public static new Constructor Create(Context cx, IMethodSymbol constructor)
         {
             if (constructor == null)
                 return null;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Conversion.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Conversion.cs
@@ -10,7 +10,7 @@ internal class Conversion : UserOperator
         private Conversion(Context cx, IMethodSymbol init)
             : base(cx, init) { }
 
-        public new static Conversion Create(Context cx, IMethodSymbol symbol) =>
+        public static new Conversion Create(Context cx, IMethodSymbol symbol) =>
             ConversionFactory.Instance.CreateEntityFromSymbol(cx, symbol);
 
         public override Microsoft.CodeAnalysis.Location ReportingLocation
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Destructor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Destructor.cs
@@ -23,7 +23,7 @@ public override void Populate(TextWriter trapFile)
             return symbol.OriginalDefinition == null || SymbolEqualityComparer.Default.Equals(symbol.OriginalDefinition, symbol) ? original : Create(cx, symbol.OriginalDefinition);
         }
 
-        public new static Destructor Create(Context cx, IMethodSymbol symbol) =>
+        public static new Destructor Create(Context cx, IMethodSymbol symbol) =>
             DestructorFactory.Instance.CreateEntityFromSymbol(cx, symbol);
 
         private class DestructorFactory : ICachedEntityFactory<IMethodSymbol, Destructor>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs
@@ -52,7 +52,7 @@ public override void Populate(TextWriter trapFile)
             Overrides(trapFile);
         }
 
-        public new static EventAccessor Create(Context cx, IMethodSymbol symbol) =>
+        public static new EventAccessor Create(Context cx, IMethodSymbol symbol) =>
             EventAccessorFactory.Instance.CreateEntityFromSymbol(cx, symbol);
 
         private class EventAccessorFactory : ICachedEntityFactory<IMethodSymbol, EventAccessor>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs
@@ -53,7 +53,7 @@ public override void Populate(TextWriter trapFile)
             ExtractCompilerGenerated(trapFile);
         }
 
-        public new static OrdinaryMethod Create(Context cx, IMethodSymbol method) => OrdinaryMethodFactory.Instance.CreateEntityFromSymbol(cx, method);
+        public static new OrdinaryMethod Create(Context cx, IMethodSymbol method) => OrdinaryMethodFactory.Instance.CreateEntityFromSymbol(cx, method);
 
         private class OrdinaryMethodFactory : ICachedEntityFactory<IMethodSymbol, OrdinaryMethod>
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
@@ -298,10 +298,10 @@ private class DelegateTypeParameter : Parameter
             private DelegateTypeParameter(Context cx, IParameterSymbol init, IEntity parent, Parameter original)
                 : base(cx, init, parent, original) { }
 
-            new public static DelegateTypeParameter Create(Context cx, IParameterSymbol param, IEntity parent, Parameter original = null) =>
-                // We need to use a different cache key than `param` to avoid mixing up
-                // `DelegateTypeParameter`s and `Parameter`s
-                DelegateTypeParameterFactory.Instance.CreateEntity(cx, (typeof(DelegateTypeParameter), new SymbolEqualityWrapper(param)), (param, parent, original));
+            public static new DelegateTypeParameter Create(Context cx, IParameterSymbol param, IEntity parent, Parameter original = null) =>
+               // We need to use a different cache key than `param` to avoid mixing up
+               // `DelegateTypeParameter`s and `Parameter`s
+               DelegateTypeParameterFactory.Instance.CreateEntity(cx, (typeof(DelegateTypeParameter), new SymbolEqualityWrapper(param)), (param, parent, original));
 
             private class DelegateTypeParameterFactory : ICachedEntityFactory<(IParameterSymbol, IEntity, Parameter), DelegateTypeParameter>
             {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs
@@ -183,7 +183,7 @@ public static string OperatorSymbol(Context cx, string methodName)
             return result;
         }
 
-        public new static UserOperator Create(Context cx, IMethodSymbol symbol) => UserOperatorFactory.Instance.CreateEntityFromSymbol(cx, symbol);
+        public static new UserOperator Create(Context cx, IMethodSymbol symbol) => UserOperatorFactory.Instance.CreateEntityFromSymbol(cx, symbol);
 
         private class UserOperatorFactory : ICachedEntityFactory<IMethodSymbol, UserOperator>
         {
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Assembly.cs b/csharp/extractor/Semmle.Extraction/Entities/Assembly.cs
@@ -49,7 +49,7 @@ public override bool Equals(object? obj)
             return false;
         }
 
-        public new static Location Create(Context cx, Microsoft.CodeAnalysis.Location loc) => AssemblyConstructorFactory.Instance.CreateEntity(cx, loc, loc);
+        public static new Location Create(Context cx, Microsoft.CodeAnalysis.Location loc) => AssemblyConstructorFactory.Instance.CreateEntity(cx, loc, loc);
 
         private class AssemblyConstructorFactory : ICachedEntityFactory<Microsoft.CodeAnalysis.Location?, Assembly>
         {
diff --git a/csharp/extractor/Semmle.Extraction/Entities/SourceLocation.cs b/csharp/extractor/Semmle.Extraction/Entities/SourceLocation.cs
@@ -24,7 +24,7 @@ protected NonGeneratedSourceLocation(Context cx, Microsoft.CodeAnalysis.Location
             FileEntity = File.Create(Context, Position.Path);
         }
 
-        public new static Location Create(Context cx, Microsoft.CodeAnalysis.Location loc) => SourceLocationFactory.Instance.CreateEntity(cx, loc, loc);
+        public static new Location Create(Context cx, Microsoft.CodeAnalysis.Location loc) => SourceLocationFactory.Instance.CreateEntity(cx, loc, loc);
 
         public override void Populate(TextWriter trapFile)
         {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public override void Populate(TextWriter trapFile)`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`		`- public new static Accessor Create(Context cx, IMethodSymbol symbol) =>`
	`81`	`+ public static new Accessor Create(Context cx, IMethodSymbol symbol) =>`
`82`	`82`	`AccessorFactory.Instance.CreateEntityFromSymbol(cx, symbol);`
`83`	`83`
`84`	`84`	`private class AccessorFactory : ICachedEntityFactory<IMethodSymbol, Accessor>`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ private ConstructorDeclarationSyntax Syntax`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`		`- public new static Constructor Create(Context cx, IMethodSymbol constructor)`
	`100`	`+ public static new Constructor Create(Context cx, IMethodSymbol constructor)`
`101`	`101`	`{`
`102`	`102`	`if (constructor == null)`
`103`	`103`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public override void Populate(TextWriter trapFile)`
`23`	`23`	`return symbol.OriginalDefinition == null \|\| SymbolEqualityComparer.Default.Equals(symbol.OriginalDefinition, symbol) ? original : Create(cx, symbol.OriginalDefinition);`
`24`	`24`	`}`
`25`	`25`
`26`		`- public new static Destructor Create(Context cx, IMethodSymbol symbol) =>`
	`26`	`+ public static new Destructor Create(Context cx, IMethodSymbol symbol) =>`
`27`	`27`	`DestructorFactory.Instance.CreateEntityFromSymbol(cx, symbol);`
`28`	`28`
`29`	`29`	`private class DestructorFactory : ICachedEntityFactory<IMethodSymbol, Destructor>`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public override void Populate(TextWriter trapFile)`
`52`	`52`	`Overrides(trapFile);`
`53`	`53`	`}`
`54`	`54`
`55`		`- public new static EventAccessor Create(Context cx, IMethodSymbol symbol) =>`
	`55`	`+ public static new EventAccessor Create(Context cx, IMethodSymbol symbol) =>`
`56`	`56`	`EventAccessorFactory.Instance.CreateEntityFromSymbol(cx, symbol);`
`57`	`57`
`58`	`58`	`private class EventAccessorFactory : ICachedEntityFactory<IMethodSymbol, EventAccessor>`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public override void Populate(TextWriter trapFile)`
`53`	`53`	`ExtractCompilerGenerated(trapFile);`
`54`	`54`	`}`
`55`	`55`
`56`		`- public new static OrdinaryMethod Create(Context cx, IMethodSymbol method) => OrdinaryMethodFactory.Instance.CreateEntityFromSymbol(cx, method);`
	`56`	`+ public static new OrdinaryMethod Create(Context cx, IMethodSymbol method) => OrdinaryMethodFactory.Instance.CreateEntityFromSymbol(cx, method);`
`57`	`57`
`58`	`58`	`private class OrdinaryMethodFactory : ICachedEntityFactory<IMethodSymbol, OrdinaryMethod>`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public static string OperatorSymbol(Context cx, string methodName)`
`183`	`183`	`return result;`
`184`	`184`	`}`
`185`	`185`
`186`		`- public new static UserOperator Create(Context cx, IMethodSymbol symbol) => UserOperatorFactory.Instance.CreateEntityFromSymbol(cx, symbol);`
	`186`	`+ public static new UserOperator Create(Context cx, IMethodSymbol symbol) => UserOperatorFactory.Instance.CreateEntityFromSymbol(cx, symbol);`
`187`	`187`
`188`	`188`	`private class UserOperatorFactory : ICachedEntityFactory<IMethodSymbol, UserOperator>`
`189`	`189`	`{`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public override bool Equals(object? obj)`
`49`	`49`	`return false;`
`50`	`50`	`}`
`51`	`51`
`52`		`- public new static Location Create(Context cx, Microsoft.CodeAnalysis.Location loc) => AssemblyConstructorFactory.Instance.CreateEntity(cx, loc, loc);`
	`52`	`+ public static new Location Create(Context cx, Microsoft.CodeAnalysis.Location loc) => AssemblyConstructorFactory.Instance.CreateEntity(cx, loc, loc);`
`53`	`53`
`54`	`54`	`private class AssemblyConstructorFactory : ICachedEntityFactory<Microsoft.CodeAnalysis.Location?, Assembly>`
`55`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected NonGeneratedSourceLocation(Context cx, Microsoft.CodeAnalysis.Location`
`24`	`24`	`FileEntity = File.Create(Context, Position.Path);`
`25`	`25`	`}`
`26`	`26`
`27`		`- public new static Location Create(Context cx, Microsoft.CodeAnalysis.Location loc) => SourceLocationFactory.Instance.CreateEntity(cx, loc, loc);`
	`27`	`+ public static new Location Create(Context cx, Microsoft.CodeAnalysis.Location loc) => SourceLocationFactory.Instance.CreateEntity(cx, loc, loc);`
`28`	`28`
`29`	`29`	`public override void Populate(TextWriter trapFile)`
`30`	`30`	`{`