Browse Source

Fixed some FxCop warnings in AvalonEdit.

pull/2/head
Daniel Grunwald 15 years ago
parent
commit
2ee86110f6
  1. 7
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs
  2. 12
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs
  3. 4
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingColor.cs
  4. 4
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XshdColor.cs
  5. 3
      src/Main/GlobalAssemblyInfo.template

7
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs

@ -4,6 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Globalization;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Controls.Primitives; 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 // 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)) && 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; this.currentList : this.completionData;
var matchingItems = var matchingItems =
@ -328,7 +329,7 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion
if (string.Equals(itemText, query, StringComparison.OrdinalIgnoreCase)) if (string.Equals(itemText, query, StringComparison.OrdinalIgnoreCase))
return 7; return 7;
if (itemText.StartsWith(query)) if (itemText.StartsWith(query, StringComparison.Ordinal))
return 6; return 6;
if (itemText.StartsWith(query, StringComparison.OrdinalIgnoreCase)) if (itemText.StartsWith(query, StringComparison.OrdinalIgnoreCase))
return 5; return 5;
@ -361,7 +362,7 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion
foreach (char upper in text.Where(c => char.IsUpper(c))) { foreach (char upper in text.Where(c => char.IsUpper(c))) {
if (i > query.Length - 1) if (i > query.Length - 1)
return true; // return true here for CamelCase partial match ("CQ" matches "CodeQualityAnalysis") 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; return false;
i++; i++;
} }

12
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs

@ -70,15 +70,15 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion
return; return;
object description = item.Description; object description = item.Description;
if (description != null) { if (description != null) {
if(description is string) { string descriptionText = description as string;
toolTip.Content = new TextBlock if (descriptionText != null) {
{ toolTip.Content = new TextBlock {
Text = description as string, Text = descriptionText,
TextWrapping = TextWrapping.Wrap TextWrapping = TextWrapping.Wrap
}; };
} } else {
else
toolTip.Content = description; toolTip.Content = description;
}
toolTip.IsOpen = true; toolTip.IsOpen = true;
} else { } else {
toolTip.IsOpen = false; toolTip.IsOpen = false;

4
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingColor.cs

@ -68,7 +68,11 @@ namespace ICSharpCode.AvalonEdit.Highlighting
/// <summary> /// <summary>
/// Serializes this HighlightingColor instance. /// Serializes this HighlightingColor instance.
/// </summary> /// </summary>
#if DOTNET4
[System.Security.SecurityCritical]
#else
[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)] [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
#endif
public virtual void GetObjectData(SerializationInfo info, StreamingContext context) public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
{ {
if (info == null) if (info == null)

4
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XshdColor.cs

@ -71,7 +71,11 @@ namespace ICSharpCode.AvalonEdit.Highlighting.Xshd
/// <summary> /// <summary>
/// Serializes this XshdColor instance. /// Serializes this XshdColor instance.
/// </summary> /// </summary>
#if DOTNET4
[System.Security.SecurityCritical]
#else
[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)] [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
#endif
public virtual void GetObjectData(SerializationInfo info, StreamingContext context) public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
{ {
if (info == null) if (info == null)

3
src/Main/GlobalAssemblyInfo.template

@ -25,6 +25,9 @@ using System.Reflection;
[assembly: AssemblyInformationalVersion(RevisionClass.FullVersion + "-$INSERTSHORTCOMMITHASH$")] [assembly: AssemblyInformationalVersion(RevisionClass.FullVersion + "-$INSERTSHORTCOMMITHASH$")]
[assembly: NeutralResourcesLanguage("en-US")] [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 internal static class RevisionClass
{ {
public const string Major = "4"; public const string Major = "4";

Loading…
Cancel
Save