Remove Debugger property from ExpressionLoader

Author: awulkiew

solution/GraphicalDebugging/ExpressionLoader.cs

@@ -53,14 +53,10 @@ private void DebuggerEvents_OnEnterBreakMode(dbgEventReason Reason, ref dbgExecu
 
         public static bool IsBreakMode
         {
-            get => Debugger.IsBreakMode;
+            get => Instance.debugger.IsBreakMode;
         }
 
         private static ExpressionLoader Instance { get; set; }
-        private static Debugger Debugger
-        {
-            get { return Instance.debugger; }
-        }
 
         public static void Initialize(GraphicalDebuggingPackage package)
         {
@@ -158,15 +154,15 @@ private ExpressionLoader(DTE2 dte)
 
         public static Expression[] GetExpressions(string name, char separator = ';')
         {
-            var expr = Debugger.GetExpression(name);
+            var expr = Instance.debugger.GetExpression(name);
             if (expr.IsValid)
                 return new Expression[] { expr };
 
             string[] subnames = name.Split(separator);
             Expression[] exprs = new Expression[subnames.Length];
             for (int i = 0; i < subnames.Length; ++i)
             {
-                exprs[i] = Debugger.GetExpression(subnames[i]);
+                exprs[i] = Instance.debugger.GetExpression(subnames[i]);
             }
 
             return exprs;
@@ -492,7 +488,7 @@ public Loader FindByType(IKindConstraint kindConstraint, string name, string typ
                     int kindIndex = (int)kind;
                     foreach (LoaderCreator creator in lists[kindIndex])
                     {
-                        Loader loader = creator.Create(this, Debugger, name, type, id);
+                        Loader loader = creator.Create(this, Instance.debugger, name, type, id);
                         if (loader != null)
                         {
                             if (loadersCache != null)
@@ -511,7 +507,7 @@ public Loader FindByType(IKindConstraint kindConstraint, string name, string typ
                         {
                             foreach (LoaderCreator creator in lists[i])
                             {
-                                Loader loader = creator.Create(this, Debugger, name, type, id);
+                                Loader loader = creator.Create(this, Instance.debugger, name, type, id);
                                 if (loader != null)
                                 {
                                     if (loadersCache != null)