From 2ee86110f6e886b2077ee38027af1484f6f9ae6a Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Fri, 1 Oct 2010 14:52:23 +0200 Subject: [PATCH] Fixed some FxCop warnings in AvalonEdit. --- .../CodeCompletion/CompletionList.cs | 7 ++++--- .../CodeCompletion/CompletionWindow.cs | 12 ++++++------ .../Highlighting/HighlightingColor.cs | 4 ++++ .../Highlighting/Xshd/XshdColor.cs | 4 ++++ src/Main/GlobalAssemblyInfo.template | 3 +++ 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs index aa9b33f444..e4089e66f6 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Globalization; using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; @@ -221,7 +222,7 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion { // if the user just typed one more character, don't filter all data but just filter what we are already displaying var listToFilter = (this.currentList != null && (!string.IsNullOrEmpty(this.currentText)) && (!string.IsNullOrEmpty(query)) && - query.StartsWith(this.currentText)) ? + query.StartsWith(this.currentText, StringComparison.Ordinal)) ? this.currentList : this.completionData; var matchingItems = @@ -328,7 +329,7 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion if (string.Equals(itemText, query, StringComparison.OrdinalIgnoreCase)) return 7; - if (itemText.StartsWith(query)) + if (itemText.StartsWith(query, StringComparison.Ordinal)) return 6; if (itemText.StartsWith(query, StringComparison.OrdinalIgnoreCase)) return 5; @@ -361,7 +362,7 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion foreach (char upper in text.Where(c => char.IsUpper(c))) { if (i > query.Length - 1) return true; // return true here for CamelCase partial match ("CQ" matches "CodeQualityAnalysis") - if (char.ToUpper(query[i]) != upper) + if (char.ToUpper(query[i], CultureInfo.InvariantCulture) != upper) return false; i++; } diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs index b690a99bfd..351c026e51 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs @@ -70,15 +70,15 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion return; object description = item.Description; if (description != null) { - if(description is string) { - toolTip.Content = new TextBlock - { - Text = description as string, + string descriptionText = description as string; + if (descriptionText != null) { + toolTip.Content = new TextBlock { + Text = descriptionText, TextWrapping = TextWrapping.Wrap }; - } - else + } else { toolTip.Content = description; + } toolTip.IsOpen = true; } else { toolTip.IsOpen = false; diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingColor.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingColor.cs index 1cdff695ba..0aaeed6c01 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingColor.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingColor.cs @@ -68,7 +68,11 @@ namespace ICSharpCode.AvalonEdit.Highlighting /// /// Serializes this HighlightingColor instance. /// + #if DOTNET4 + [System.Security.SecurityCritical] + #else [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)] + #endif public virtual void GetObjectData(SerializationInfo info, StreamingContext context) { if (info == null) diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XshdColor.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XshdColor.cs index 6b5efc14fe..1692defc31 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XshdColor.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XshdColor.cs @@ -71,7 +71,11 @@ namespace ICSharpCode.AvalonEdit.Highlighting.Xshd /// /// Serializes this XshdColor instance. /// + #if DOTNET4 + [System.Security.SecurityCritical] + #else [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)] + #endif public virtual void GetObjectData(SerializationInfo info, StreamingContext context) { if (info == null) diff --git a/src/Main/GlobalAssemblyInfo.template b/src/Main/GlobalAssemblyInfo.template index 677c6701d4..cd7aab3b2b 100644 --- a/src/Main/GlobalAssemblyInfo.template +++ b/src/Main/GlobalAssemblyInfo.template @@ -25,6 +25,9 @@ using System.Reflection; [assembly: AssemblyInformationalVersion(RevisionClass.FullVersion + "-$INSERTSHORTCOMMITHASH$")] [assembly: NeutralResourcesLanguage("en-US")] +[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2243:AttributeStringLiteralsShouldParseCorrectly", + Justification = "AssemblyInformationalVersion does not need to be a parsable version")] + internal static class RevisionClass { public const string Major = "4";