branch: externals/csharp-mode commit 7805fe898a38bd28e03c8341a0314e4cb3db842e Author: Jostein Kjønigsen <jost...@kjonigsen.net> Commit: Jostein Kjønigsen <jost...@kjonigsen.net>
Fix const-declaration for compilation-error regexps. --- csharp-mode.el | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/csharp-mode.el b/csharp-mode.el index aa8c234..329da47 100644 --- a/csharp-mode.el +++ b/csharp-mode.el @@ -4146,22 +4146,26 @@ 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 + (concat + "^[[:blank:]]*" + "\\([^(\r\n)]+\\)(\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?): " + "error [[:alnum:]]+: .+ ?\\(\\[\\([^]\r\n]+\\)\\]\\)?$") + ;; docstring "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' " +) + +(defconst csharp-compilation-re-build-warning (concat "^[[:blank:]]*" "\\([^(\r\n)]+\\)(\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?): " - "error [[:alnum:]]+: .+ ?\\(\\[\\([^]\r\n]+\\)\\]\\)?$")) - -(defconst csharp-compilation-re-build-warning + "warning [[:alnum:]]+: .+ ?\\(\\[\\([^]\r\n]+\\)\\]\\)?$") + ;; docstring "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]+\\)\\]\\)?$")) + ) (eval-after-load 'compile (lambda ()