Fix bug in VS Integration.

rsdn · Dec 10, 2015 · 57c4b84 · 57c4b84
1 parent 3a04882
commit 57c4b84
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/...Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeLibraryReferenceManager.n b/...Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeLibraryReferenceManager.n
@@ -265,12 +265,6 @@ namespace Nemerle.Completion2.Factories
         SR.Assembly.LoadFrom(path)
       else
       {
-        def reflect = Assembly.ReflectionOnlyLoadFrom(path);
-        def fullName = reflect.FullName;
-
-        when (assemblyByStrongName.ContainsKey(fullName) && !assemblyWithoutContext.Contains(fullName))
-          return SR.Assembly.LoadFrom(path);
-
         try { NonBlockingAssemblyLoadFrom(path) }
         catch
         {
@@ -284,9 +278,14 @@ namespace Nemerle.Completion2.Factories
 
     static NonBlockingAssemblyLoadFrom(path : string) : Assembly
     {
+      def assemblyName = AssemblyName.GetAssemblyName(path);
+      def fullName     = assemblyName.FullName;
+
+      when (assemblyByStrongName.ContainsKey(fullName) && !assemblyWithoutContext.Contains(fullName))
+        return SR.Assembly.LoadFrom(path);
+
       def asmBytes = ReadAllBytes(path);
-
-      def symPath = ChangeExtension(path, ".pdb");
+      def symPath  = ChangeExtension(path, ".pdb");
       def symBytes = if (Exists(symPath)) ReadAllBytes(symPath) else null;
 
       def asm =