Minor code cleanup

Author: govert

Source/ExcelDna.IntelliSense/CrossAppDomainSingleton.cs

@@ -56,7 +56,6 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CrossAppDomainSingleton.cs" />
     <Compile Include="FormattedText.cs" />
     <Compile Include="IntelliSenseDisplay.cs" />
     <Compile Include="IntelliSenseHelper.cs" />

Source/ExcelDna.IntelliSense/ExcelDna.IntelliSense.csproj

@@ -7,11 +7,11 @@ namespace ExcelDna.IntelliSense
 {
     // TODO: This is to be replaced by the Provider / Server info retrieval mechanism
     // First version might run on a timer for updates.
-    public class IntelliSenseHelper : IDisposable
+    class IntelliSenseHelper : IDisposable
     {
-        private readonly IntelliSenseDisplay _id;
-        private readonly IIntelliSenseProvider _excelDnaProvider = new ExcelDnaIntelliSenseProvider();
-        private readonly IIntelliSenseProvider _workbookProvider = new WorkbookIntelliSenseProvider();
+        readonly IntelliSenseDisplay _id;
+        readonly IIntelliSenseProvider _excelDnaProvider = new ExcelDnaIntelliSenseProvider();
+        readonly IIntelliSenseProvider _workbookProvider = new WorkbookIntelliSenseProvider();
         // TODO: Others
 
 

Source/ExcelDna.IntelliSense/IntellisenseHelper.cs

@@ -139,7 +139,7 @@ static void ProcessExitEvent(object sender, EventArgs e)
             s_AppDomainShutdown = true;
         }
 
-        private static void AppDomainUnloadEvent(object sender, EventArgs e)
+        static void AppDomainUnloadEvent(object sender, EventArgs e)
         {
             Close();
             s_AppDomainShutdown = true;

Source/ExcelDna.IntelliSense/Logging.cs

@@ -6,11 +6,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Excel-DNA IntelliSense")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("IntelliSense service for Microsoft Excel")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Excel-DNA")]
 [assembly: AssemblyProduct("Excel-DNA IntelliSense")]
-[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2015")]
+[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

Source/ExcelDna.IntelliSense/Properties/AssemblyInfo.cs

@@ -12,11 +12,11 @@ namespace ExcelDna.IntelliSense
     sealed class SingleThreadSynchronizationContext : SynchronizationContext
     {
         /// <summary>The queue of work items.</summary>
-        private readonly BlockingCollection<KeyValuePair<SendOrPostCallback, object>> m_queue =
+        readonly BlockingCollection<KeyValuePair<SendOrPostCallback, object>> m_queue =
             new BlockingCollection<KeyValuePair<SendOrPostCallback, object>>();
 
         // /// <summary>The processing thread.</summary>
-        // private readonly Thread m_thread = Thread.CurrentThread;
+        // readonly Thread m_thread = Thread.CurrentThread;
 
         /// <summary>Dispatches an asynchronous message to the synchronization context.</summary>
         /// <param name="d">The System.Threading.SendOrPostCallback delegate to call.</param>

Source/ExcelDna.IntelliSense/SingleThreadSynchronizationContext.cs

@@ -11,10 +11,10 @@ namespace ExcelDna.IntelliSense
     class ToolTipForm  : Form
     {
         FormattedText _text;
-        private Label label;
-        private Label label1;
-        private ToolTip toolTip1;
-        private System.ComponentModel.IContainer components;
+        Label label;
+        Label label1;
+        ToolTip toolTip1;
+        System.ComponentModel.IContainer components;
         Win32Window _owner;
 
         public ToolTipForm(IntPtr hwndOwner)
@@ -85,9 +85,9 @@ protected override bool ShowWithoutActivation
         //    }
         //}
 
-        private const int CS_DROPSHADOW = 0x00020000;
-        private const int WS_EX_TOOLWINDOW = 0x00000080;
-        private const int WS_EX_NOACTIVATE = 0x08000000;
+        const int CS_DROPSHADOW = 0x00020000;
+        const int WS_EX_TOOLWINDOW = 0x00000080;
+        const int WS_EX_NOACTIVATE = 0x08000000;
         protected override CreateParams CreateParams
         {
             get
@@ -148,7 +148,7 @@ protected override void OnPaint(PaintEventArgs e)
             Size = new Size(lineWidths.Max() + widthPadding, totalHeight + heightPadding);
         }
 
-        private void DrawString(Graphics g, Brush brush, ref Rectangle rect, out Size used,
+        void DrawString(Graphics g, Brush brush, ref Rectangle rect, out Size used,
                                 StringFormat format, string text, Font font)
         {
             using (StringFormat copy = (StringFormat)format.Clone())
@@ -172,7 +172,7 @@ private void DrawString(Graphics g, Brush brush, ref Rectangle rect, out Size us
             }
         }
 
-        private void InitializeComponent()
+        void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
             this.label = new System.Windows.Forms.Label();

Source/ExcelDna.IntelliSense/ToolTipForm.cs

@@ -319,7 +319,7 @@ public FormulaEditWatcher(WindowWatcher windowWatcher, SynchronizationContext sy
         }
 
         // Runs on the Automation thread
-        private void _windowWatcher_MainWindowChanged(object sender, EventArgs args)
+        void _windowWatcher_MainWindowChanged(object sender, EventArgs args)
         {
             if (_mainWindow != null)
             {
@@ -572,7 +572,7 @@ void _windowWatcher_PopupListWindowChanged(object sender, WindowWatcher.WindowCh
         }
 
         // Runs on our automation thread
-        private void _windowWatcher_MainWindowChanged(object sender, EventArgs args)
+        void _windowWatcher_MainWindowChanged(object sender, EventArgs args)
         {
             if (_mainWindow != null)
             {
@@ -645,7 +645,7 @@ void PopupListElementSelectedHandler(object sender, AutomationEventArgs e)
 
         // TODO: This should be exposed as an event and popup resize should be elsewhere
         // Runs on an automation event thread
-        private void PopupListStructureChangedHandler(object sender, StructureChangedEventArgs e)
+        void PopupListStructureChangedHandler(object sender, StructureChangedEventArgs e)
         {
             // Debug.Print($">>>> PopupListWatcher.PopupListStructureChangedHandler ({e.StructureChangeType}) on thread {Thread.CurrentThread.ManagedThreadId}");
             // Debug.WriteLine($">>> PopupList structure changed - {e.StructureChangeType}");
@@ -709,7 +709,7 @@ private void PopupListStructureChangedHandler(object sender, StructureChangedEve
 
         // CONSIDER: This will run on our automation thread
         //           Should be OK to call MoveWindow from there - it just posts messages to the window.
-        private void TestMoveWindow(AutomationElement listWindow, int xOffset, int yOffset)
+        void TestMoveWindow(AutomationElement listWindow, int xOffset, int yOffset)
         {
             var hwndList = (IntPtr)(int)(listWindow.GetCurrentPropertyValue(AutomationElement.NativeWindowHandleProperty));
             var listRect = (Rect)listWindow.GetCurrentPropertyValue(AutomationElement.BoundingRectangleProperty);
@@ -719,7 +719,7 @@ private void TestMoveWindow(AutomationElement listWindow, int xOffset, int yOffs
 
         // Can run on our automation thread or on any automation event thread (which is also allowed to read properties)
         // But might fail, if the newSelectedItem is already gone by the time we run...
-        private void UpdateSelectedItem(AutomationElement newSelectedItem)
+        void UpdateSelectedItem(AutomationElement newSelectedItem)
         {
             if (!IsVisible || newSelectedItem == null)
             {
@@ -810,7 +810,7 @@ public void Dispose()
     //        //_windowWatcher.PopupListWindowChanged += _windowWatcher_PopupListWindowChanged;
     //    }
 
-    //    private void _windowWatcher_SelectDataSourceWindowChanged(object sender, WindowWatcher.WindowChangedEventArgs e)
+    //    void _windowWatcher_SelectDataSourceWindowChanged(object sender, WindowWatcher.WindowChangedEventArgs e)
     //    {
     //    }
 

Source/ExcelDna.IntelliSense/Watchers.cs

@@ -119,7 +119,7 @@ void OnWinEventReceived(object winEventArgsObj)
         }
 
         #region IDisposable Support
-        private bool disposedValue = false; // To detect redundant calls
+        bool disposedValue = false; // To detect redundant calls
 
         protected virtual void Dispose(bool disposing)
         {