Merge pull request #121 from udlose/performance/reduce-allocations

Fix #116 and Performance/reduce allocations

Author: danipen

.gitignore

@@ -1,7 +1,7 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 
 # User-specific files
 *.rsuser
@@ -43,6 +43,9 @@ Generated\ Files/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
+# VisualStudio live unit testing
+*.lutconfig
+
 # NUnit
 *.VisualState.xml
 TestResult.xml

src/TextMateSharp.Grammars/Resources/ResourceLoader.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Reflection;
 
 namespace TextMateSharp.Grammars.Resources
@@ -12,7 +11,7 @@ internal class ResourceLoader
 
         internal static Stream OpenGrammarPackage(string grammarName)
         {
-            string grammarPackage = GrammarPrefix + grammarName.ToLowerInvariant() + "." + "package.json";
+            string grammarPackage = GrammarPrefix + grammarName.ToLowerInvariant() + ".package.json";
 
             var result = typeof(ResourceLoader).GetTypeInfo().Assembly.GetManifestResourceStream(
                 grammarPackage);

src/TextMateSharp.Tests/Grammar/LineTextTests.cs

@@ -1,7 +1,5 @@
-using System;
-
 using NUnit.Framework;
-
+using System;
 using TextMateSharp.Grammars;
 
 namespace TextMateSharp.Tests.Grammar
@@ -351,15 +349,6 @@ public void GetHashCode_SameContent_ShouldReturnSameHash()
             Assert.AreEqual(lineText1.GetHashCode(), lineText2.GetHashCode());
         }
 
-        [Test]
-        public void GetHashCode_DifferentContent_ShouldReturnDifferentHash()
-        {
-            LineText lineText1 = "hello";
-            LineText lineText2 = "world";
-
-            Assert.AreNotEqual(lineText1.GetHashCode(), lineText2.GetHashCode());
-        }
-
         [Test]
         public void GetHashCode_EmptyLineText_ShouldReturnZero()
         {
@@ -390,10 +379,12 @@ public void GetHashCode_SameInstance_ShouldBeConsistent()
         }
 
         [Test]
-        public void GetHashCode_DifferentArraysSameContent_ShouldReturnSameHash()
+        public void GetHashCode_DifferentStringInstances_SameContent_ShouldReturnSameHash()
         {
+            // avoid declaring these as const and use this pattern to dodge string interning
+            // which would make them reference the same object and not test the content-based hash code properly
             string buffer1 = "hello";
-            string buffer2 = "hello";
+            string buffer2 = new string("hello".ToCharArray());
 
             LineText lineText1 = buffer1.AsMemory();
             LineText lineText2 = buffer2.AsMemory();
@@ -423,27 +414,12 @@ public void GetHashCode_UnicodeContent_ShouldWork()
         }
 
         [Test]
-        public void GetHashCode_SimilarStrings_ShouldProduceDifferentHashes()
-        {
-            // These are similar but should have different hashes
-            LineText lineText1 = "abc";
-            LineText lineText2 = "abd";
-            LineText lineText3 = "bbc";
-
-            Assert.AreNotEqual(lineText1.GetHashCode(), lineText2.GetHashCode());
-            Assert.AreNotEqual(lineText1.GetHashCode(), lineText3.GetHashCode());
-            Assert.AreNotEqual(lineText2.GetHashCode(), lineText3.GetHashCode());
-        }
-
-        [Test]
-        public void GetHashCode_SingleCharacter_ShouldWork()
+        public void GetHashCode_SingleCharacter_WithSameContent_ShouldWork()
         {
             LineText lineText1 = "a";
             LineText lineText2 = "a";
-            LineText lineText3 = "b";
 
             Assert.AreEqual(lineText1.GetHashCode(), lineText2.GetHashCode());
-            Assert.AreNotEqual(lineText1.GetHashCode(), lineText3.GetHashCode());
         }
 
         #endregion