C#: Simplify object initialization

tamasvajk · tamasvajk · commit 504f56adeb46 · 2020-10-13T13:27:46.000+02:00
diff --git a/csharp/extractor/Semmle.Extraction.CIL.Driver/ExtractorOptions.cs b/csharp/extractor/Semmle.Extraction.CIL.Driver/ExtractorOptions.cs
@@ -121,8 +121,10 @@ public void AddFile(string assemblyPath, bool extractAll)
                 filesAnalyzed.Add(assemblyPath);
                 try
                 {
-                    var info = new AssemblyInfo(assemblyPath);
-                    info.extract = extractAll;
+                    var info = new AssemblyInfo(assemblyPath)
+                    {
+                        extract = extractAll
+                    };
                     if (!assembliesRead.ContainsKey(info.name))
                         assembliesRead.Add(info.name, info);
                 }
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Assembly.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Assembly.cs
@@ -30,10 +30,12 @@ public Assembly(Context cx) : base(cx)
             cx.assembly = this;
             var def = cx.mdReader.GetAssemblyDefinition();
 
-            assemblyName = new AssemblyName();
-            assemblyName.Name = cx.mdReader.GetString(def.Name);
-            assemblyName.Version = def.Version;
-            assemblyName.CultureInfo = new CultureInfo(cx.mdReader.GetString(def.Culture));
+            assemblyName = new AssemblyName
+            {
+                Name = cx.mdReader.GetString(def.Name),
+                Version = def.Version,
+                CultureInfo = new CultureInfo(cx.mdReader.GetString(def.Culture))
+            };
 
             if (!def.PublicKey.IsNil)
                 assemblyName.SetPublicKey(cx.mdReader.GetBlobBytes(def.PublicKey));
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Factories.cs b/csharp/extractor/Semmle.Extraction.CIL/Factories.cs
@@ -72,8 +72,10 @@ public PrimitiveType Create(PrimitiveTypeCode code)
 
             if (e is null)
             {
-                e = new PrimitiveType(this, code);
-                e.Label = cx.GetNewLabel();
+                e = new PrimitiveType(this, code)
+                {
+                    Label = cx.GetNewLabel()
+                };
                 cx.DefineLabel(e, cx.TrapWriter.Writer, cx.Extractor);
                 primitiveTypes[(int)code] = e;
             }

Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,10 @@ public void AddFile(string assemblyPath, bool extractAll)`
`121`	`121`	`filesAnalyzed.Add(assemblyPath);`
`122`	`122`	`try`
`123`	`123`	`{`
`124`		`- var info = new AssemblyInfo(assemblyPath);`
`125`		`- info.extract = extractAll;`
	`124`	`+ var info = new AssemblyInfo(assemblyPath)`
	`125`	`+ {`
	`126`	`+ extract = extractAll`
	`127`	`+ };`
`126`	`128`	`if (!assembliesRead.ContainsKey(info.name))`
`127`	`129`	`assembliesRead.Add(info.name, info);`
`128`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,10 @@ public PrimitiveType Create(PrimitiveTypeCode code)`
`72`	`72`
`73`	`73`	`if (e is null)`
`74`	`74`	`{`
`75`		`- e = new PrimitiveType(this, code);`
`76`		`- e.Label = cx.GetNewLabel();`
	`75`	`+ e = new PrimitiveType(this, code)`
	`76`	`+ {`
	`77`	`+ Label = cx.GetNewLabel()`
	`78`	`+ };`
`77`	`79`	`cx.DefineLabel(e, cx.TrapWriter.Writer, cx.Extractor);`
`78`	`80`	`primitiveTypes[(int)code] = e;`
`79`	`81`	`}`