[elpa] externals/csharp-mode d0d7ec3 140/459: Merge pull request #58 from josteink/compilation-mode-fixes

[ELPA Syncer]

branch: externals/csharp-mode
commit d0d7ec3ca71fe4d89c33b2803dc6bb68b6b8c69e
Merge: 367ecc2 8c5bae2
Author: Jostein Kjønigsen <jostein@kjonigsen.net>
Commit: Jostein Kjønigsen <jostein@kjonigsen.net>

    Merge pull request #58 from josteink/compilation-mode-fixes
    
    Tenative fixes for compilation-mode.
---
 csharp-mode-tests.el                   |  8 ++++++++
 csharp-mode.el                         |  4 ++--
 test-files/msbuild-square-brackets.txt | 37 ++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/csharp-mode-tests.el b/csharp-mode-tests.el
index a38cc30..c3e236c 100644
--- a/csharp-mode-tests.el
+++ b/csharp-mode-tests.el
@@ -105,6 +105,14 @@
              ("./test-files/msbuild-concurrent-error.txt" 
,csharp-compilation-re-msbuild-error 2
               ,(list-repeat-once
                 '("Program.cs")))
+             ("./test-files/msbuild-square-brackets.txt" 
,csharp-compilation-re-msbuild-error 6
+              ,(list-repeat-once
+                '("Properties\\AssemblyInfo.cs"
+                  "Program.cs"
+                  "Program.cs")))
+             ("./test-files/msbuild-square-brackets.txt" 
,csharp-compilation-re-msbuild-warning 2
+              ,(list-repeat-once
+                '("Program.cs")))
              ("./test-files/xbuild-warning.txt" 
,csharp-compilation-re-xbuild-warning 10
               ,(list-repeat-once
                 
'("/Users/jesseblack/Dropbox/barfapp/ConsoleApplication1/ClassLibrary1/Class1.cs"
diff --git a/csharp-mode.el b/csharp-mode.el
index e774a55..15cda83 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -4042,14 +4042,14 @@ The return value is meaningless, and is ignored by 
cc-mode.
   (concat
    "^[[:blank:]]*\\(?:[[:digit:]]+>\\)?"
    "\\([^(\r\n)]+\\)(\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?): "
-   "error [[:alnum:]]+: [^[\r\n]+\\[\\([^]\r\n]+\\)\\]$")
+   "error [[:alnum:]]+: [^\r\n]+\\[\\([^]\r\n]+\\)\\]$")
   "Regexp to match compilation error from msbuild.")
 
 (defconst csharp-compilation-re-msbuild-warning
   (concat
    "^[[:blank:]]*\\(?:[[:digit:]]+>\\)?"
    "\\([^(\r\n)]+\\)(\\([0-9]+\\)\\(?:,\\([0-9]+\\)\\)?): "
-   "warning [[:alnum:]]+: [^[\r\n]+\\[\\([^]\r\n]+\\)\\]$")
+   "warning [[:alnum:]]+: [^\r\n]+\\[\\([^]\r\n]+\\)\\]$")
   "Regexp to match compilation warning from msbuild.")
 
 ;; Notes on xbuild and devenv commonalities
diff --git a/test-files/msbuild-square-brackets.txt 
b/test-files/msbuild-square-brackets.txt
new file mode 100644
index 0000000..eb52ca1
--- /dev/null
+++ b/test-files/msbuild-square-brackets.txt
@@ -0,0 +1,37 @@
+-*- mode: compilation; default-directory: "~/Documents/Visual Studio 
2015/Projects/ArrayThingError/ArrayThingError/" -*-
+Compilation started at Wed May 13 19:21:20
+
+bash -c "for m in *akefile; do break; done; if [[ ${m} != \"*akefile\" ]]; 
then make; else set -o pipefail; 'c:/Program Files 
(x86)/MSBuild/14.0/Bin/MSBuild.exe' //m; fi"
+Microsoft (R) Build Engine version 14.0.22823.1
+Copyright (C) Microsoft Corporation. All rights reserved.
+
+Build started 2015-05-13 19:21:20.
+The target "AfterGenerateAppxManifest" listed in an AfterTargets attribute at 
"C:\Program Files 
(x86)\MSBuild\Microsoft\.NetNative\Microsoft.Net.CoreRuntime.targets (64,11)" 
does not exist in the project, and will be ignored.
+The target "AfterGenerateAppxManifest" listed in an AfterTargets attribute at 
"C:\Program Files 
(x86)\MSBuild\Microsoft\.NetNative\Microsoft.NetNative.targets (75,11)" does 
not exist in the project, and will be ignored.
+The target "AfterGenerateAppxManifest" listed in an AfterTargets attribute at 
"C:\Program Files 
(x86)\MSBuild\Microsoft\.NetNative\Microsoft.NetNative.targets (122,11)" does 
not exist in the project, and will be ignored.
+     1>Project "c:\Users\ohnob\Documents\Visual Studio 
2015\Projects\ArrayThingError\ArrayThingError\ArrayThingError.csproj" on node 1 
(default targets).
+     1>GenerateTargetFrameworkMonikerAttribute:
+       Skipping target "GenerateTargetFrameworkMonikerAttribute" because all 
output files are up-to-date with respect to the input files.
+       CoreCompile:
+         C:\Program Files (x86)\MSBuild\14.0\bin\csc2.exe /noconfig 
/nowarn:1701,1702 /nostdlib+ /platform:anycpu32bitpreferred /errorreport:prompt 
/warn:4 /define:DEBUG;TRACE /highentropyva+ /reference:"C:\Program Files 
(x86)\Reference 
Assemblies\Microsoft\Framework\.NETFramework\v4.5\Microsoft.CSharp.dll" 
/reference:"C:\Program Files (x86)\Reference 
Assemblies\Microsoft\Framework\.NETFramework\v4.5\mscorlib.dll" 
/reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framewor [...]
+     1>Properties\AssemblyInfo.cs(40,15): error CS0029: Cannot implicitly 
convert type 'int' to 'int[]' [c:\Users\ohnob\Documents\Visual Studio 
2015\Projects\ArrayThingError\ArrayThingError\ArrayThingError.csproj]
+     1>Program.cs(13,24): error CS0029: Cannot implicitly convert type 'int' 
to 'string' [c:\Users\ohnob\Documents\Visual Studio 
2015\Projects\ArrayThingError\ArrayThingError\ArrayThingError.csproj]
+     1>Program.cs(14,26): error CS0029: Cannot implicitly convert type 
'string' to 'string[]' [c:\Users\ohnob\Documents\Visual Studio 
2015\Projects\ArrayThingError\ArrayThingError\ArrayThingError.csproj]
+     1>Program.cs(15,28): warning CS0029: Cannot implicitly convert type 
'System.Collections.Generic.List<string[]>' to 'string[][]' 
[c:\Users\ohnob\Documents\Visual Studio 
2015\Projects\ArrayThingError\ArrayThingError\ArrayThingError.csproj]
+     1>Done Building Project "c:\Users\ohnob\Documents\Visual Studio 
2015\Projects\ArrayThingError\ArrayThingError\ArrayThingError.csproj" (default 
targets) -- FAILED.
+
+Build FAILED.
+
+       "c:\Users\ohnob\Documents\Visual Studio 
2015\Projects\ArrayThingError\ArrayThingError\ArrayThingError.csproj" (default 
target) (1) ->
+       (CoreCompile target) -> 
+         Properties\AssemblyInfo.cs(40,15): error CS0029: Cannot implicitly 
convert type 'int' to 'int[]' [c:\Users\ohnob\Documents\Visual Studio 
2015\Projects\ArrayThingError\ArrayThingError\ArrayThingError.csproj]
+         Program.cs(13,24): error CS0029: Cannot implicitly convert type 'int' 
to 'string' [c:\Users\ohnob\Documents\Visual Studio 
2015\Projects\ArrayThingError\ArrayThingError\ArrayThingError.csproj]
+         Program.cs(14,26): error CS0029: Cannot implicitly convert type 
'string' to 'string[]' [c:\Users\ohnob\Documents\Visual Studio 
2015\Projects\ArrayThingError\ArrayThingError\ArrayThingError.csproj]
+         Program.cs(15,28): warning CS0029: Cannot implicitly convert type 
'System.Collections.Generic.List<string[]>' to 'string[][]' 
[c:\Users\ohnob\Documents\Visual Studio 
2015\Projects\ArrayThingError\ArrayThingError\ArrayThingError.csproj]
+
+    0 Warning(s)
+    4 Error(s)
+
+Time Elapsed 00:00:00.23
+
+Compilation exited abnormally with code 1 at Wed May 13 19:21:20