emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/csharp-mode 8c5bae2 139/459: Fixup


From: ELPA Syncer
Subject: [elpa] externals/csharp-mode 8c5bae2 139/459: Fixup
Date: Sun, 22 Aug 2021 13:59:13 -0400 (EDT)

branch: externals/csharp-mode
commit 8c5bae284f4f87e70f3d59c5c96a2cd7a32ebd29
Author: Jostein Kjønigsen <jostein@kjonigsen.net>
Commit: Jostein Kjønigsen <jostein@kjonigsen.net>

    Fixup
---
 csharp-mode-tests.el                   | 6 ++++--
 csharp-mode.el                         | 2 +-
 test-files/msbuild-square-brackets.txt | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/csharp-mode-tests.el b/csharp-mode-tests.el
index f0254e3..c3e236c 100644
--- a/csharp-mode-tests.el
+++ b/csharp-mode-tests.el
@@ -105,12 +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 2
+             ("./test-files/msbuild-square-brackets.txt" 
,csharp-compilation-re-msbuild-error 6
               ,(list-repeat-once
                 '("Properties\\AssemblyInfo.cs"
                   "Program.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 fb50ebe..15cda83 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -4049,7 +4049,7 @@ The return value is meaningless, and is ignored by 
cc-mode.
   (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
index 2067d7f..eb52ca1 100644
--- a/test-files/msbuild-square-brackets.txt
+++ b/test-files/msbuild-square-brackets.txt
@@ -17,7 +17,7 @@ The target "AfterGenerateAppxManifest" listed in an 
AfterTargets attribute at "C
      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): error 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>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.
@@ -27,7 +27,7 @@ Build FAILED.
          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): error CS0029: Cannot implicitly convert type 
'System.Collections.Generic.List<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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]