Merge pull request #1468 from hvitved/csharp/extractor-error

C#: Include extractor message in diagnostic queries

csharp/ql/src/Diagnostics/ExtractorError.ql

@@ -16,5 +16,4 @@ import semmle.code.csharp.commons.Diagnostics
 from ExtractorError error
 where not exists(CompilerError ce | ce.getLocation().getFile() = error.getLocation().getFile())
 select error,
-  "Unexpected " + error.getOrigin() + " error in element '" + error.getElementText() +
-    "' at location " + error.getStackTrace()
+  "Unexpected " + error.getOrigin() + " error: " + error.getText() + "\n" + error.getStackTrace()

csharp/ql/src/Diagnostics/ExtractorMessage.ql

@@ -13,5 +13,5 @@ import semmle.code.csharp.commons.Diagnostics
 
 from ExtractorMessage message
 select message,
-  message.getSeverityText() + " was generated by " + message.getOrigin() + " in element '" +
-    message.getElementText() + "' at location " + message.getStackTrace()
+  message.getSeverityText() + " was generated by " + message.getOrigin() + ": " + message.getText() +
+    "\n" + message.getStackTrace()