C#: Fix exception throwing

tamasvajk · tamasvajk · commit b07aceff6b30 · 2020-10-13T14:45:37.000+02:00
diff --git a/csharp/extractor/Semmle.Extraction.CIL.Driver/InvalidAssemblyException.cs b/csharp/extractor/Semmle.Extraction.CIL.Driver/InvalidAssemblyException.cs
@@ -2,6 +2,6 @@
 
 namespace Semmle.Extraction.CIL.Driver
 {
-    internal class InvalidAssemblyException : Exception
+    public class InvalidAssemblyException : Exception
     { }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Analyser.cs b/csharp/extractor/Semmle.Extraction.CSharp/Analyser.cs
@@ -171,7 +171,7 @@ private static string GetOutputName(CSharpCompilation compilation,
                 if (entry == null)
                 {
                     if (compilation.SyntaxTrees.Length == 0)
-                        throw new ArgumentNullException("No source files seen");
+                        throw new InvalidOperationException("No source files seen");
 
                     // Probably invalid, but have a go anyway.
                     var entryPointFile = compilation.SyntaxTrees.First().FilePath;
diff --git a/csharp/extractor/Semmle.Extraction/Id.cs b/csharp/extractor/Semmle.Extraction/Id.cs
@@ -123,7 +123,7 @@ public Label(int value) : this()
         public override string ToString()
         {
             if (!Valid)
-                throw new NullReferenceException("Attempt to use an invalid label");
+                throw new InvalidOperationException("Attempt to use an invalid label");
 
             return "#" + Value;
         }
@@ -148,7 +148,7 @@ public override bool Equals(object? other)
         public void AppendTo(System.IO.TextWriter trapFile)
         {
             if (!Valid)
-                throw new NullReferenceException("Attempt to use an invalid label");
+                throw new InvalidOperationException("Attempt to use an invalid label");
 
             trapFile.Write('#');
             trapFile.Write(Value);
diff --git a/csharp/extractor/Semmle.Extraction/TrapExtensions.cs b/csharp/extractor/Semmle.Extraction/TrapExtensions.cs
@@ -86,7 +86,7 @@ public static TextWriter WriteColumn(this TextWriter trapFile, object o)
                 case Enum _:
                     return trapFile.WriteColumn((int)o);
                 default:
-                    throw new ArgumentException(nameof(o));
+                    throw new NotSupportedException($"Unsupported object type '{o.GetType()}' received");
             }
         }
 
diff --git a/csharp/extractor/Semmle.Extraction/TrapWriter.cs b/csharp/extractor/Semmle.Extraction/TrapWriter.cs
@@ -81,7 +81,7 @@ public TrapWriter(ILogger logger, PathTransformer.ITransformedPath outputfile, s
                         compressionStream = fileStream;
                         break;
                     default:
-                        throw new ArgumentException(nameof(trapCompression));
+                        throw new ArgumentOutOfRangeException(nameof(trapCompression), trapCompression, "Unsupported compression type");
                 }
 
 
@@ -264,7 +264,7 @@ private static string TrapExtension(CompressionMode compression)
                 case CompressionMode.None: return "";
                 case CompressionMode.Gzip: return ".gz";
                 case CompressionMode.Brotli: return ".br";
-                default: throw new ArgumentException(nameof(compression));
+                default: throw new ArgumentOutOfRangeException(nameof(compression), compression, "Unsupported compression type");
             }
         }
 
diff --git a/csharp/extractor/Semmle.Util/CanonicalPathCache.cs b/csharp/extractor/Semmle.Util/CanonicalPathCache.cs
@@ -212,7 +212,7 @@ public enum Symlinks
         public CanonicalPathCache(int maxCapacity, PathStrategy pathStrategy)
         {
             if (maxCapacity <= 0)
-                throw new ArgumentOutOfRangeException("Invalid cache size specified");
+                throw new ArgumentOutOfRangeException(nameof(maxCapacity), maxCapacity, "Invalid cache size specified");
 
             this.maxCapacity = maxCapacity;
             this.pathStrategy = pathStrategy;
@@ -278,7 +278,7 @@ public static CanonicalPathCache Create(ILogger logger, int maxCapacity, Symlink
                     pathStrategy = new QueryDirectoryStrategy();
                     break;
                 default:
-                    throw new ArgumentOutOfRangeException("Invalid symlinks option");
+                    throw new ArgumentOutOfRangeException(nameof(symlinks), symlinks, "Invalid symlinks option");
             }
 
             return new CanonicalPathCache(maxCapacity, pathStrategy);

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace Semmle.Extraction.CIL.Driver`
`4`	`4`	`{`
`5`		`- internal class InvalidAssemblyException : Exception`
	`5`	`+ public class InvalidAssemblyException : Exception`
`6`	`6`	`{ }`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ private static string GetOutputName(CSharpCompilation compilation,`
`171`	`171`	`if (entry == null)`
`172`	`172`	`{`
`173`	`173`	`if (compilation.SyntaxTrees.Length == 0)`
`174`		`- throw new ArgumentNullException("No source files seen");`
	`174`	`+ throw new InvalidOperationException("No source files seen");`
`175`	`175`
`176`	`176`	`// Probably invalid, but have a go anyway.`
`177`	`177`	`var entryPointFile = compilation.SyntaxTrees.First().FilePath;`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public Label(int value) : this()`
`123`	`123`	`public override string ToString()`
`124`	`124`	`{`
`125`	`125`	`if (!Valid)`
`126`		`- throw new NullReferenceException("Attempt to use an invalid label");`
	`126`	`+ throw new InvalidOperationException("Attempt to use an invalid label");`
`127`	`127`
`128`	`128`	`return "#" + Value;`
`129`	`129`	`}`
`@@ -148,7 +148,7 @@ public override bool Equals(object? other)`
`148`	`148`	`public void AppendTo(System.IO.TextWriter trapFile)`
`149`	`149`	`{`
`150`	`150`	`if (!Valid)`
`151`		`- throw new NullReferenceException("Attempt to use an invalid label");`
	`151`	`+ throw new InvalidOperationException("Attempt to use an invalid label");`
`152`	`152`
`153`	`153`	`trapFile.Write('#');`
`154`	`154`	`trapFile.Write(Value);`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public static TextWriter WriteColumn(this TextWriter trapFile, object o)`
`86`	`86`	`case Enum _:`
`87`	`87`	`return trapFile.WriteColumn((int)o);`
`88`	`88`	`default:`
`89`		`- throw new ArgumentException(nameof(o));`
	`89`	`+ throw new NotSupportedException($"Unsupported object type '{o.GetType()}' received");`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public TrapWriter(ILogger logger, PathTransformer.ITransformedPath outputfile, s`
`81`	`81`	`compressionStream = fileStream;`
`82`	`82`	`break;`
`83`	`83`	`default:`
`84`		`- throw new ArgumentException(nameof(trapCompression));`
	`84`	`+ throw new ArgumentOutOfRangeException(nameof(trapCompression), trapCompression, "Unsupported compression type");`
`85`	`85`	`}`
`86`	`86`
`87`	`87`
`@@ -264,7 +264,7 @@ private static string TrapExtension(CompressionMode compression)`
`264`	`264`	`case CompressionMode.None: return "";`
`265`	`265`	`case CompressionMode.Gzip: return ".gz";`
`266`	`266`	`case CompressionMode.Brotli: return ".br";`
`267`		`- default: throw new ArgumentException(nameof(compression));`
	`267`	`+ default: throw new ArgumentOutOfRangeException(nameof(compression), compression, "Unsupported compression type");`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`