Use generic collections

Project/Src/Document/HighlightingStrategy/HighlightRuleSet.cs

@@ -5,7 +5,8 @@
 //     <version>$Revision$</version>
 // </file>
 
-using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 using System.Xml;
 using ICSharpCode.TextEditor.Util;
 
@@ -85,7 +86,7 @@ public HighlightRuleSet(XmlElement el)
             }
         }
 
-        public ArrayList Spans { get; private set; } = new ArrayList();
+        public List<Span> Spans { get; private set; } = new List<Span>();
 
         public LookupTable KeyWords { get; }
 
@@ -112,7 +113,7 @@ public void MergeFrom(HighlightRuleSet ruleSet)
                 Delimiters[i] |= ruleSet.Delimiters[i];
             // insert merged spans in front of old spans
             var oldSpans = Spans;
-            Spans = (ArrayList)ruleSet.Spans.Clone();
+            Spans = ruleSet.Spans.ToList();
             Spans.AddRange(oldSpans);
             //keyWords.MergeFrom(ruleSet.keyWords);
             //prevMarkers.MergeFrom(ruleSet.prevMarkers);

Project/Src/Document/HighlightingStrategy/HighlightingManager.cs

@@ -17,8 +17,8 @@ public class HighlightingManager
         // hash table from extension name to highlighting definition,
         // OR from extension name to Pair SyntaxMode,ISyntaxModeFileProvider
 
-        private readonly Hashtable extensionsToName = new Hashtable();
-        private readonly ArrayList syntaxModeFileProviders = new ArrayList();
+        private readonly Dictionary<string, string> extensionsToName = new Dictionary<string, string>();
+        private readonly List<ISyntaxModeFileProvider> syntaxModeFileProviders = new List<ISyntaxModeFileProvider>();
 
         static HighlightingManager()
         {
@@ -31,7 +31,7 @@ public HighlightingManager()
             CreateDefaultHighlightingStrategy();
         }
 
-        public Hashtable HighlightingDefinitions { get; } = new Hashtable();
+        public Dictionary<string, object> HighlightingDefinitions { get; } = new Dictionary<string, object>();
 
         public static HighlightingManager Manager { get; }
 
@@ -111,28 +111,30 @@ internal KeyValuePair<SyntaxMode, ISyntaxModeFileProvider> FindHighlighterEntry(
             foreach (var mode in provider.SyntaxModes)
                 if (mode.Name == name)
                     return new KeyValuePair<SyntaxMode, ISyntaxModeFileProvider>(mode, provider);
-            return new KeyValuePair<SyntaxMode, ISyntaxModeFileProvider>(key: null, value: null);
+            return default;
         }
 
         public IHighlightingStrategy FindHighlighter(string name)
         {
-            var def = HighlightingDefinitions[name];
-            if (def is DictionaryEntry entry)
-                return LoadDefinition(entry);
-            return def == null ? DefaultHighlighting : (IHighlightingStrategy)def;
+            if (HighlightingDefinitions.TryGetValue(name, out var def))
+            {
+                switch (def)
+                {
+                    case DictionaryEntry entry:
+                        return LoadDefinition(entry);
+                    case IHighlightingStrategy strategy:
+                        return strategy;
+                }
+            }
+
+            return DefaultHighlighting;
         }
 
         public IHighlightingStrategy FindHighlighterForFile(string fileName)
         {
-            var highlighterName = (string)extensionsToName[Path.GetExtension(fileName).ToUpperInvariant()];
-            if (highlighterName != null)
-            {
-                var def = HighlightingDefinitions[highlighterName];
-                if (def is DictionaryEntry entry)
-                    return LoadDefinition(entry);
-                return def == null ? DefaultHighlighting : (IHighlightingStrategy)def;
-            }
-
+            var extension = Path.GetExtension(fileName).ToUpperInvariant();
+            if (extensionsToName.TryGetValue(extension, out var highlighterName))
+                return FindHighlighter(highlighterName);
             return DefaultHighlighting;
         }
 

Project/Src/Document/IDocument.cs

@@ -144,7 +144,7 @@ public interface IDocument
         /// <remarks>
         ///     Returns a <see cref="LineSegment" /> for the given line number.
         ///     This function should be used to get a line instead of getting the
-        ///     line using the <see cref="ArrayList" />.
+        ///     line using the list.
         /// </remarks>
         /// <param name="lineNumber">
         ///     The line number which is requested.