Small improvements after last merge.

Author: Neverbirth

PluginCore/PluginCore/Controls/CompletionList.cs

@@ -124,7 +124,7 @@ static public void SelectItem(String name)
         }
 
         /// <summary>
-        /// Require that completion items are explicitly inserted (Enter, Tab, mouse-click)
+        /// Require that completion items are explicitely inserted (Enter, Tab, mouse-click)
         /// </summary>
         public static void DisableAutoInsertion()
         {

PluginCore/PluginCore/Controls/CompletionListControl.cs

@@ -731,7 +731,7 @@ public int SmartMatch(string label, string word, int len)
             {
                 if (label.StartsWith(word, StringComparison.OrdinalIgnoreCase))
                 {
-                    if (label.StartsWith(word)) return 1;
+                    if (label.StartsWithOrdinal(word)) return 1;
                     else return 5;
                 }
                 return 0;
@@ -751,15 +751,15 @@ public int SmartMatch(string label, string word, int len)
                 int p2;
                 if (firstUpper) // try case sensitive search
                 {
-                    p2 = label.IndexOf(word);
+                    p2 = label.IndexOfOrdinal(word);
                     if (p2 >= 0)
                     {
-                        int p3 = label.LastIndexOf("." + word); // in qualified type name
+                        int p3 = label.LastIndexOfOrdinal("." + word); // in qualified type name
                         if (p3 > 0)
                         {
                             if (p3 == label.LastIndexOf('.'))
                             {
-                                if (label.EndsWith("." + word)) return 1;
+                                if (label.EndsWithOrdinal("." + word)) return 1;
                                 else return 3;
                             }
                             else return 4;
@@ -829,7 +829,7 @@ public int IsAbbreviation(string label, string word)
             }
             else
             {
-                p2 = label.IndexOf("." + c);
+                p2 = label.IndexOfOrdinal("." + c);
                 if (p2 >= 0) { score = 2; p2++; }
                 else
                 {
@@ -844,7 +844,7 @@ public int IsAbbreviation(string label, string word)
             {
                 p = p2;
                 c = word[i++];
-                if (char.IsUpper(c)) p2 = label.IndexOf(c.ToString(), p + 1);
+                if (char.IsUpper(c)) p2 = label.IndexOfOrdinal(c.ToString(), p + 1);
                 else p2 = label.IndexOf(c.ToString(), p + 1, StringComparison.OrdinalIgnoreCase);
                 if (p2 < 0) return 0;
 
@@ -858,7 +858,7 @@ public int IsAbbreviation(string label, string word)
             }
             if (dist == len - 1)
             {
-                if (label == word || label.EndsWith("." + word)) return 1;
+                if (label == word || label.EndsWithOrdinal("." + word)) return 1;
                 return score;
             }
             else return score + 2;
@@ -895,9 +895,9 @@ public bool ReplaceText(string tail, char trigger)
                     {
                         if (word != null && tail.Length > 0)
                         {
-                            if (replace.StartsWith(word, StringComparison.OrdinalIgnoreCase) && replace.IndexOf(tail) >= word.Length)
+                            if (replace.StartsWith(word, StringComparison.OrdinalIgnoreCase) && replace.IndexOfOrdinal(tail) >= word.Length)
                             {
-                                replace = replace.Substring(0, replace.IndexOf(tail));
+                                replace = replace.Substring(0, replace.IndexOfOrdinal(tail));
                             }
                         }
                         host.BeginUndoAction();

PluginCore/ScintillaNet/ScintillaControl.cs

@@ -1,13 +1,11 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Printing;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Drawing;
 using System.Windows.Forms;
 using ScintillaNet.Configuration;
 using PluginCore.FRService;