Fix workbook names vs. paths

Author: govert

Source/ExcelDna.IntelliSense/ExcelDna.IntelliSense.csproj

@@ -22,6 +22,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>
+    </DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

Source/ExcelDna.IntelliSense/Providers/WorkbookIntelliSenseProvider.cs

@@ -137,13 +137,13 @@ public void Initialize()
             {
                 foreach (Workbook wb in xlApp.Workbooks)
                 {
-                    var path = wb.FullName;
-                    if (!_workbookRegistrationInfos.ContainsKey(path))
+                    var name = wb.Name;
+                    if (!_workbookRegistrationInfos.ContainsKey(name))
                     {
-                        WorkbookRegistrationInfo regInfo = new WorkbookRegistrationInfo(path);
-                        _workbookRegistrationInfos[path] = regInfo;
+                        WorkbookRegistrationInfo regInfo = new WorkbookRegistrationInfo(name);
+                        _workbookRegistrationInfos[name] = regInfo;
 
-                        RegisterWithXmlProvider(wb, path);
+                        RegisterWithXmlProvider(wb);
 
                         regInfo.Refresh();
                     }
@@ -175,32 +175,32 @@ public IList<FunctionInfo> GetFunctionInfos()
 
         #endregion
 
-        void Excel_WorkbookOpen(Workbook Wb)
+        void Excel_WorkbookOpen(Workbook wb)
         {
-            var path = Wb.FullName;
-            var regInfo = new WorkbookRegistrationInfo(path);
+            var name = wb.Name;
+            var regInfo = new WorkbookRegistrationInfo(name);
             lock (_workbookRegistrationInfos)
             {
-                _workbookRegistrationInfos[path] = regInfo;
-                RegisterWithXmlProvider(Wb, path);
+                _workbookRegistrationInfos[name] = regInfo;
+                RegisterWithXmlProvider(wb);
                 OnInvalidate();
             }
         }
 
-        void Excel_WorkbookBeforeClose(Workbook Wb, ref bool Cancel)
+        void Excel_WorkbookBeforeClose(Workbook wb, ref bool cancel)
         {
             // Do we have to worry about renaming / Save As?
             // Do we have to worry about other BeforeClose handlers cancelling the close?
             lock (_workbookRegistrationInfos)
             {
-                var path = Wb.FullName;
-                _workbookRegistrationInfos.Remove(path);
-                UnregisterWithXmlProvider(Wb, path);
+                _workbookRegistrationInfos.Remove(wb.Name);
+                UnregisterWithXmlProvider(wb);
             }
         }
 
-        void RegisterWithXmlProvider(Workbook wb, string path)
+        void RegisterWithXmlProvider(Workbook wb)
         {
+            var path = wb.FullName;
             var xmlPath = GetXmlPath(path);
             _xmlProvider.RegisterXmlFunctionInfo(xmlPath);  // Will check if file exists
 
@@ -212,8 +212,9 @@ void RegisterWithXmlProvider(Workbook wb, string path)
             }
         }
 
-        void UnregisterWithXmlProvider(Workbook wb, string path)
+        void UnregisterWithXmlProvider(Workbook wb)
         {
+            var path = wb.FullName;
             var xmlPath = GetXmlPath(path);
             _xmlProvider.UnregisterXmlFunctionInfo(xmlPath);
             _xmlProvider.UnregisterXmlFunctionInfo(path);

Source/ExcelDna.IntelliSense/Providers/XmlIntelliSenseProvider.cs

@@ -9,6 +9,7 @@
 
 namespace ExcelDna.IntelliSense
 {
+    // CONSIDER: Support regular .NET XML documentation, either as files or packed?
     class XmlIntelliSenseProvider : IIntelliSenseProvider
     {
         public class XmlRegistrationInfo
@@ -184,7 +185,6 @@ void OnInvalidate(object _unused_)
 
         public void Dispose()
         {
-            throw new NotImplementedException();
         }
     }