branch: externals/csharp-mode
commit ed628e6dd5611935cc38492c834a1fc718345948
Author: Jostein Kjønigsen <jost...@kjonigsen.net>
Commit: Jostein Kjønigsen <jost...@kjonigsen.net>
Attempt fix compilation-mode regexps for both xbuild & msbuild.
---
csharp-mode.el | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/csharp-mode.el b/csharp-mode.el
index d42aacf..68a548f 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -4146,16 +4146,22 @@ The return value is meaningless, and is ignored by
cc-mode.
(expand-file-name (match-string 1) (file-name-directory (match-string 4))))
(defconst csharp-compilation-re-build-error
+ "Regexp to match compilation error from xbuild/msbuild-logs like this:
+
/Users/jesseblack/Dropbox/barfapp/ConsoleApplication1/ClassLibrary1/Folder/Class1.cs(12):
error CS1525: Unexpected symbol `}', expecting `;', `{', `=>', or `where'
+"
(concat
"^[[:blank:]]*"
- "\\([^(\r\n]+\\)(\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?): "
- "error [[:alnum:]]+: .+ \\[\\([^]\r\n]+\\)\\]$"))
+ "\\([^(\r\n)]+\\)(\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?): "
+ "error [[:alnum:]]+: .+ ?\\(\\[\\([^]\r\n]+\\)\\]\\)?$"))
(defconst csharp-compilation-re-build-warning
+ "Regexp to match compilation warning from xbuild/msbuild-logs like this:
+
/Users/jesseblack/Dropbox/barfapp/ConsoleApplication1/ClassLibrary1/Class1.cs(11):
warning CS0169: The private field `ClassLibrary1.Class1.BadImageFormatExcep'
is never used
+"
(concat
"^[[:blank:]]*"
- "\\([^(\r\n]+\\)(\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?): "
- "warning [[:alnum:]]+: .+ \\[\\([^]\r\n]+\\)\\]$"))
+ "\\([^(\r\n)]+\\)(\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?): "
+ "warning [[:alnum:]]+: .+ ?\\(\\[\\([^]\r\n]+\\)\\]\\)?$"))
(eval-after-load 'compile
(lambda ()
