From c346f079dfbf10257d48fe3a564d3e8a7828030f Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 15 Jun 2014 19:29:49 +0200 Subject: [PATCH] Fix compiler warnings, and exclude the refactorings from NR.CSharp. --- .../ConnectMethodDecompiler.cs | 3 +- ILSpy/TextView/DecompilerTextView.cs | 5 +- .../CryptoConvert.cs | 2 +- .../ICSharpCode.NRefactory.CSharp.csproj | 172 +----------------- .../Visitors/CSharpToVBConverterVisitor.cs | 2 +- .../TypeSystem/CecilLoader.cs | 3 +- 6 files changed, 8 insertions(+), 179 deletions(-) diff --git a/ILSpy.BamlDecompiler/ConnectMethodDecompiler.cs b/ILSpy.BamlDecompiler/ConnectMethodDecompiler.cs index 59704a10c..14c714133 100644 --- a/ILSpy.BamlDecompiler/ConnectMethodDecompiler.cs +++ b/ILSpy.BamlDecompiler/ConnectMethodDecompiler.cs @@ -76,8 +76,7 @@ namespace ILSpy.BamlDecompiler } else if (condition != null) { result.Add(1, FindEvents(condition.FalseBlock)); } - */ - return result; + return result;*/ } /* EventRegistration[] FindEvents(ILBlock block) diff --git a/ILSpy/TextView/DecompilerTextView.cs b/ILSpy/TextView/DecompilerTextView.cs index 0ddb607f8..9b0a636d6 100644 --- a/ILSpy/TextView/DecompilerTextView.cs +++ b/ILSpy/TextView/DecompilerTextView.cs @@ -102,9 +102,8 @@ namespace ICSharpCode.ILSpy.TextView textEditor.TextArea.TextView.LineTransformers.Add(textMarkerService); textEditor.ShowLineNumbers = true; DisplaySettingsPanel.CurrentDisplaySettings.PropertyChanged += CurrentDisplaySettings_PropertyChanged; - - // Bookmarks context menu - textEditor.TextArea.DefaultInputHandler.NestedInputHandlers.Add(new SearchInputHandler(textEditor.TextArea)); + + SearchPanel.Install(textEditor); ShowLineMargin(); diff --git a/Mono.Cecil/Mono.Security.Cryptography/CryptoConvert.cs b/Mono.Cecil/Mono.Security.Cryptography/CryptoConvert.cs index b3e748735..bd389004b 100644 --- a/Mono.Cecil/Mono.Security.Cryptography/CryptoConvert.cs +++ b/Mono.Cecil/Mono.Security.Cryptography/CryptoConvert.cs @@ -139,7 +139,7 @@ namespace Mono.Security.Cryptography { rsa = RSA.Create (); rsa.ImportParameters (rsap); } - catch (CryptographicException ce) { + catch (CryptographicException) { // this may cause problem when this code is run under // the SYSTEM identity on Windows (e.g. ASP.NET). See // http://bugzilla.ximian.com/show_bug.cgi?id=77559 diff --git a/NRefactory/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj b/NRefactory/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj index 54244dd94..deb12f6ee 100644 --- a/NRefactory/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj +++ b/NRefactory/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj @@ -263,68 +263,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -356,8 +295,6 @@ - - @@ -377,10 +314,6 @@ - - - - @@ -393,111 +326,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -506,14 +343,7 @@ - - - - - - - - + diff --git a/NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs b/NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs index 9299eb99c..b2ff71cf5 100644 --- a/NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs +++ b/NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs @@ -800,7 +800,7 @@ namespace ICSharpCode.NRefactory.VB.Visitors throw new NotImplementedException(); - return EndNode(queryGroupClause, op); + //return EndNode(queryGroupClause, op); } public AstNode VisitAttribute(CSharp.Attribute attribute, object data) diff --git a/NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs b/NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs index 1e67de687..64eed843e 100644 --- a/NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs +++ b/NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs @@ -77,7 +77,7 @@ namespace ICSharpCode.NRefactory.TypeSystem /// Gets/Sets the cancellation token used by the cecil loader. /// public CancellationToken CancellationToken { get; set; } - + /// /// This delegate gets executed whenever an entity was loaded. /// @@ -87,6 +87,7 @@ namespace ICSharpCode.NRefactory.TypeSystem /// Warning: if delay-loading is used and the type system is accessed by multiple threads, /// the callback may be invoked concurrently on multiple threads. /// + [CLSCompliant(false)] public Action OnEntityLoaded { get; set; } ///