Log model errors even in standalone extraction

Author: tamasvajk

csharp/extractor/Semmle.Extraction/Context.cs

@@ -376,15 +376,27 @@ private void ExtractionError(Message msg)
             Extractor.Message(msg);
         }
 
+        private void ExtractionError(InternalError error)
+        {
+            ExtractionError(new Message(error.Message, error.EntityText, CreateLocation(error.Location), error.StackTrace, Severity.Error));
+        }
+
+        private void ReportError(InternalError error)
+        {
+            if (!Extractor.Standalone)
+                throw error;
+
+            ExtractionError(error);
+        }
+
         /// <summary>
         /// Signal an error in the program model.
         /// </summary>
         /// <param name="node">The syntax node causing the failure.</param>
         /// <param name="msg">The error message.</param>
         public void ModelError(SyntaxNode node, string msg)
         {
-            if (!Extractor.Standalone)
-                throw new InternalError(node, msg);
+            ReportError(new InternalError(node, msg));
         }
 
         /// <summary>
@@ -394,8 +406,7 @@ public void ModelError(SyntaxNode node, string msg)
         /// <param name="msg">The error message.</param>
         public void ModelError(ISymbol symbol, string msg)
         {
-            if (!Extractor.Standalone)
-                throw new InternalError(symbol, msg);
+            ReportError(new InternalError(symbol, msg));
         }
 
         /// <summary>
@@ -404,8 +415,7 @@ public void ModelError(ISymbol symbol, string msg)
         /// <param name="msg">The error message.</param>
         public void ModelError(string msg)
         {
-            if (!Extractor.Standalone)
-                throw new InternalError(msg);
+            ReportError(new InternalError(msg));
         }
 
         /// <summary>

csharp/ql/src/Diagnostics/DiagnosticExtractionErrors.ql

@@ -11,8 +11,13 @@
 import csharp
 import semmle.code.csharp.commons.Diagnostics
 
+private string getLocation(ExtractorError error) {
+  if error.getLocation().getFile().fromSource()
+  then result = " in " + error.getLocation().getFile()
+  else result = ""
+}
+
 from ExtractorError error
 where not exists(CompilerError ce | ce.getLocation().getFile() = error.getLocation().getFile())
 select error,
-  "Unexpected " + error.getOrigin() + " error: " + error.getText() + " in " +
-    error.getLocation().getFile(), 3
+  "Unexpected " + error.getOrigin() + " error" + getLocation(error) + ": " + error.getText(), 3

csharp/ql/test/library-tests/diagnostics/DiagnosticExtractorErrors.expected

@@ -0,0 +1,2 @@
+| Program.cs:9:32:9:46 | Unable to resolve target for call. (Compilation error?) | Unexpected C# extractor error in Program.cs: Unable to resolve target for call. (Compilation error?) | 3 |
+| file://:0:0:0:0 | Unhandled literal type | Unexpected C# extractor error: Unhandled literal type | 3 |