Fixes microsoft#1415: Load package when the PythonToolsService is req…

…uested.
zooba · Jul 18, 2016 · 6fbae20 · 6fbae20
1 parent 35cc0fe
commit 6fbae20
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/Python/Product/PythonTools/PythonTools/Extensions.cs b/Python/Product/PythonTools/PythonTools/Extensions.cs
@@ -474,7 +474,24 @@ internal static PythonToolsService GetPythonToolsService(this IServiceProvider s
             if (serviceProvider == null) {
                 return null;
             }
-            return (PythonToolsService)serviceProvider.GetService(typeof(PythonToolsService));
+            var pyService = (PythonToolsService)serviceProvider.GetService(typeof(PythonToolsService));
+            if (pyService == null) {
+                var shell = (IVsShell)serviceProvider.GetService(typeof(SVsShell));
+
+                var pkgGuid = GuidList.guidPythonToolsPackage;
+                IVsPackage pkg;
+                if (!ErrorHandler.Succeeded(shell.IsPackageLoaded(ref pkgGuid, out pkg)) && pkg != null) {
+                    throw new InvalidOperationException("Python Tools Package was loaded but could not get service");
+                }
+                var hr = shell.LoadPackage(ref pkgGuid, out pkg);
+                if (!ErrorHandler.Succeeded(hr)) {
+                    Debug.Fail(string.Format("Failed to load Python Tools Package: 0x{0:X08}", hr));
+                    ErrorHandler.ThrowOnFailure(hr);
+                }
+
+                pyService = (PythonToolsService)serviceProvider.GetService(typeof(PythonToolsService));
+            }
+            return pyService;
         }
 
         internal static IComponentModel GetComponentModel(this IServiceProvider serviceProvider) {