[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/csharp-mode e1a7622 138/459: Tenative fixes for compila
From: |
ELPA Syncer |
Subject: |
[elpa] externals/csharp-mode e1a7622 138/459: Tenative fixes for compilation-mode. |
Date: |
Sun, 22 Aug 2021 13:59:13 -0400 (EDT) |
branch: externals/csharp-mode
commit e1a7622c6182f49c7de5f23d4d821c87af954741
Author: Jostein Kjønigsen <jostein@kjonigsen.net>
Commit: Jostein Kjønigsen <jostein@kjonigsen.net>
Tenative fixes for compilation-mode.
Match msbuild output with [] in the error output by not using [ as a
end-of-error marker. [ is explicitly included later in the regexp
anyway.
Fixes https://github.com/josteink/csharp-mode/issues/37
---
csharp-mode-tests.el | 6 ++++++
csharp-mode.el | 2 +-
test-files/msbuild-square-brackets.txt | 37 ++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/csharp-mode-tests.el b/csharp-mode-tests.el
index a38cc30..f0254e3 100644
--- a/csharp-mode-tests.el
+++ b/csharp-mode-tests.el
@@ -105,6 +105,12 @@
("./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
+ ,(list-repeat-once
+ '("Properties\\AssemblyInfo.cs"
+ "Program.cs"
+ "Program.cs"
+ "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..fb50ebe 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -4042,7 +4042,7 @@ 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
diff --git a/test-files/msbuild-square-brackets.txt
b/test-files/msbuild-square-brackets.txt
new file mode 100644
index 0000000..2067d7f
--- /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): 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>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): 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]
+
+ 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
- [elpa] externals/csharp-mode f08f0ee 154/459: Improved test-structure with less redundant information (and thus errors). Prepare for improved tests., (continued)
- [elpa] externals/csharp-mode f08f0ee 154/459: Improved test-structure with less redundant information (and thus errors). Prepare for improved tests., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 7b8fe05 160/459: Fix version-history based on actual git-tags., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 838727a 173/459: Ensure we get Emacs 24.4 for CI., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 405af61 076/459: Fix parsing of build-logs., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 1574d3e 085/459: Merge pull request #32 from binki/master, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode f1a2e06 110/459: Add unit-test for fontification of compiler-directives., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 7856be4 123/459: Merge pull request #50 from syohex/workaround-18845, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 257602e 121/459: Test-file for https://github.com/josteink/csharp-mode/issues/46, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode ef9d3f9 134/459: Update changelog., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 367ecc2 137/459: Clean up test-code., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode e1a7622 138/459: Tenative fixes for compilation-mode.,
ELPA Syncer <=
- [elpa] externals/csharp-mode 2ddd3c2 142/459: Merge pull request #62 from shoover/fontification-hang, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode b11fcda 147/459: Imenu: Add support for interface-prefixed methods., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode bc3bd2a 155/459: Fix devenv.com output-parsing, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 9743156 158/459: Test-case for fontification error, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 57b2353 161/459: Bump version since we're working on vNext, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 682e394 162/459: Address issue with cc-mode in Emacs git master., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode a631944 165/459: Make check-defuns a make-target., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode ce2ff93 168/459: Make fontification-test assess-based., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 7fa38d2 170/459: Extend syntax propertize function for vliterals, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode bd201c2 171/459: Remove now unused code, move log functions to top, ELPA Syncer, 2021/08/22