Minor fixes and rename host .xll

govert · govert · commit 2a6fa9a88a62 · 2016-04-24T23:43:16.000+02:00
diff --git a/Source/ExcelDna.IntelliSense.Host/ExcelDna.IntelliSense.Host.csproj b/Source/ExcelDna.IntelliSense.Host/ExcelDna.IntelliSense.Host.csproj
@@ -71,8 +71,8 @@
 xcopy "$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDna.xll" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn.xll*" /C /Y
 xcopy "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn.dna*" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn64.dna*" /C /Y
 xcopy "$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDna64.xll" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn64.xll*" /C /Y
-"$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDnaPack.exe" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn.dna" /Y
-"$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDnaPack.exe" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn64.dna" /Y</PostBuildEvent>
+"$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDnaPack.exe" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn.dna" /Y /O "$(TargetDir)ExcelDna.IntelliSense.xll"
+"$(SolutionDir)\packages\ExcelDna.AddIn.0.33.9\tools\ExcelDnaPack.exe" "$(TargetDir)ExcelDna.IntelliSense.Host-AddIn64.dna" /Y /O "$(TargetDir)ExcelDna.IntelliSense64.xll"</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Source/ExcelDna.IntelliSense/IntelliSenseDisplay.cs b/Source/ExcelDna.IntelliSense/IntelliSenseDisplay.cs
@@ -192,6 +192,10 @@ void UpdateFormulaEditWindow(IntPtr formulaEditWindow)
                     _argumentsToolTip = new ToolTipForm(_formulaEditWindow);
                     //_argumentsToolTip.OwnerHandle = _formulaEditWindow;
                 }
+                else
+                {
+                    Debug.Fail("Unexpected null FormulaEditWindow...");
+                }
             }
         }
 
@@ -226,9 +230,13 @@ void FormulaEditStart()
         void FormulaEditEnd()
         {
             Debug.Print($"IntelliSenseDisplay - FormulaEditEnd");
-            //_argumentsToolTip.Hide();
-            _argumentsToolTip.Dispose();
-            _argumentsToolTip = null;
+            // TODO: When can it be null
+            if (_argumentsToolTip != null)
+            {
+                //_argumentsToolTip.Hide();
+                _argumentsToolTip.Dispose();
+                _argumentsToolTip = null;
+            }
         }
 
         // Runs on the main thread
diff --git a/Source/ExcelDna.IntelliSense/IntelliSenseServer.cs b/Source/ExcelDna.IntelliSense/IntelliSenseServer.cs
@@ -397,7 +397,7 @@ static RegistrationInfo GetHighestPublishedRegistration()
 
         static void RegisterControlFunction()
         {
-            var method = typeof(IntelliSenseServer).GetMethod("IntelliSenseServerControl", BindingFlags.Static | BindingFlags.Public);
+            var method = typeof(IntelliSenseServer).GetMethod(nameof(IntelliSenseServerControl), BindingFlags.Static | BindingFlags.Public);
             var name = "IntelliSenseServerControl_" +_serverId.ToString("N");
             ExcelIntegration.RegisterMethods(new List<MethodInfo> { method }, 
                                              new List<object> { new ExcelCommandAttribute { Name = name } }, 

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,10 @@ void UpdateFormulaEditWindow(IntPtr formulaEditWindow)`
`192`	`192`	`_argumentsToolTip = new ToolTipForm(_formulaEditWindow);`
`193`	`193`	`//_argumentsToolTip.OwnerHandle = _formulaEditWindow;`
`194`	`194`	`}`
	`195`	`+ else`
	`196`	`+ {`
	`197`	`+ Debug.Fail("Unexpected null FormulaEditWindow...");`
	`198`	`+ }`
`195`	`199`	`}`
`196`	`200`	`}`
`197`	`201`
`@@ -226,9 +230,13 @@ void FormulaEditStart()`
`226`	`230`	`void FormulaEditEnd()`
`227`	`231`	`{`
`228`	`232`	`Debug.Print($"IntelliSenseDisplay - FormulaEditEnd");`
`229`		`- //_argumentsToolTip.Hide();`
`230`		`- _argumentsToolTip.Dispose();`
`231`		`- _argumentsToolTip = null;`
	`233`	`+ // TODO: When can it be null`
	`234`	`+ if (_argumentsToolTip != null)`
	`235`	`+ {`
	`236`	`+ //_argumentsToolTip.Hide();`
	`237`	`+ _argumentsToolTip.Dispose();`
	`238`	`+ _argumentsToolTip = null;`
	`239`	`+ }`
`232`	`240`	`}`
`233`	`241`
`234`	`242`	`// Runs on the main thread`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ static RegistrationInfo GetHighestPublishedRegistration()`
`397`	`397`
`398`	`398`	`static void RegisterControlFunction()`
`399`	`399`	`{`
`400`		`- var method = typeof(IntelliSenseServer).GetMethod("IntelliSenseServerControl", BindingFlags.Static \| BindingFlags.Public);`
	`400`	`+ var method = typeof(IntelliSenseServer).GetMethod(nameof(IntelliSenseServerControl), BindingFlags.Static \| BindingFlags.Public);`
`401`	`401`	`var name = "IntelliSenseServerControl_" +_serverId.ToString("N");`
`402`	`402`	`ExcelIntegration.RegisterMethods(new List<MethodInfo> { method },`
`403`	`403`	`new List<object> { new ExcelCommandAttribute { Name = name } },`