fix: Fix link creation for System.Buffers

vchirikov · Mar 9, 2020 · 2a1f09e · 2a1f09e
1 parent 1b55965
commit 2a1f09e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+<a name="1.1.3"></a>
+## 1.1.3 (2020-##-##)
+
+### Features
+
+* Add System.Buffers source support
+
 <a name="1.1.2"></a>
 ## 1.1.2 (2020-03-07)
 

diff --git a/src/GoToDnSpy/NetstandardTypeToAssemblyMapper.cs b/src/GoToDnSpy/NetstandardTypeToAssemblyMapper.cs
@@ -14,7 +14,6 @@ public class NamespaceToAssemblyMapper
             "System.Diagnostics",
             "System.Reflection",
             "System.Text",
-            "System.Buffers",
             "System.Threading",
             "System.Net",
             "System.Numerics",
@@ -25,6 +24,7 @@ public class NamespaceToAssemblyMapper
             "System.IO",
             "System.Globalization",
             "System.Collections.Generic",
+            "System.Buffers.Text",
         };
 
         private readonly static string[] _coreLibTypes = new string[] {
@@ -35,13 +35,19 @@ public class NamespaceToAssemblyMapper
 
         internal string Get(string typeNamespace, string typeName)
         {
-            if (_coreLibStartWithNamespaces.Any(x => x.StartsWith(typeNamespace))
-                || _coreLibStandAloneNamespaces.Contains(typeNamespace)
-                || _coreLibTypes.Any(x => x.StartsWith(typeName)))
+            if (_coreLibStartWithNamespaces.Any(x => x.StartsWith(typeNamespace, StringComparison.Ordinal))
+                || _coreLibStandAloneNamespaces.Contains(typeNamespace, StringComparer.Ordinal)
+                || _coreLibTypes.Any(x => x.StartsWith(typeName, StringComparison.Ordinal)))
             {
                 return "System.Private.CoreLib";
             }
 
+
+            if(typeNamespace.StartsWith("System.Buffers", StringComparison.Ordinal))
+            {
+                return "System.Memory";
+            }
+
             var result = CheckNamespace(typeNamespace);
             if (result != null)
                 return result;

diff --git a/src/GoToDnSpy/source.extension.cs b/src/GoToDnSpy/source.extension.cs
@@ -11,7 +11,7 @@ internal sealed partial class Vsix
         public const string Name = "GoToDnSpy";
         public const string Description = @"Open dnSpy or source.dot.net and select method or type under caret.";
         public const string Language = "en-US";
-        public const string Version = "1.1.2";
+        public const string Version = "1.1.3";
         public const string Author = "Vladimir Chirikov";
         public const string Tags = "GoToDnSpy, GoTo, Disasm, ILSpy, ILDisasm, Disassemble, CIL, IL, MSIL, dnSpy, de4dot, dnlib, decompile, Emit";
     }

diff --git a/src/GoToDnSpy/source.extension.vsixmanifest b/src/GoToDnSpy/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="GoToDnSpy" Version="1.1.2" Language="en-US" Publisher="Vladimir Chirikov" />
+        <Identity Id="GoToDnSpy" Version="1.1.3" Language="en-US" Publisher="Vladimir Chirikov" />
         <DisplayName>GoToDnSpy</DisplayName>
         <Description xml:space="preserve">Open dnSpy or source.dot.net and select method or type under caret.</Description>
         <MoreInfo>https://github.com/vchirikov/GoToDnSpy</MoreInfo>