Merge pull request #1323 from zooba/issue-1251

Fixes #1251 No completions in virtual env REPL
microsoft · May 26, 2016 · a5b78ed · a5b78ed
2 parents 546ffac + 2c69ea7
commit a5b78ed
Show file tree

Hide file tree

Showing 13 changed files with 116 additions and 32 deletions.
diff --git a/Python/Product/Analysis/Interpreter/IInterpreterRegistryService.cs b/Python/Product/Analysis/Interpreter/IInterpreterRegistryService.cs
@@ -45,6 +45,17 @@ public interface IInterpreterRegistryService {
 
         InterpreterConfiguration FindConfiguration(string id);
 
+        /// <summary>
+        /// Gets a property value relating to a specific interpreter.
+        /// 
+        /// If the property is not set, returns <c>null</c>.
+        /// </summary>
+        /// <param name="id">The interpreter identifier.</param>
+        /// <param name="propName">A case-sensitive string identifying the
+        /// property. Values will be compared by ordinal.</param>
+        /// <returns>The property value, or <c>null</c> if not set.</returns>
+        object GetProperty(string id, string propName);
+
         /// <summary>
         /// Raised when the set of interpreters changes. This is not raised when
         /// the set is first initialized.

diff --git a/Python/Product/Analysis/Interpreter/IPythonInterpreterFactoryProvider.cs b/Python/Product/Analysis/Interpreter/IPythonInterpreterFactoryProvider.cs
@@ -46,6 +46,17 @@ public interface IPythonInterpreterFactoryProvider {
         /// Gets a specific configured interpreter
         /// </summary>
         IPythonInterpreterFactory GetInterpreterFactory(string id);
+
+        /// <summary>
+        /// Gets a property value associated with the specified interpreter. If
+        /// the property is not set or available, return <c>null</c>.
+        /// 
+        /// Property values should not change over the process lifetime.
+        /// </summary>
+        /// <param name="id">The interpreter id.</param>
+        /// <param name="propName">A case-sensitive string identifying the name
+        /// of the property. Values will be compared by ordinal.</param>
+        object GetProperty(string id, string propName);
     }
 
     public static class PythonInterpreterExtensions {

diff --git a/Python/Product/Analysis/Interpreter/InterpreterRegistryService.cs b/Python/Product/Analysis/Interpreter/InterpreterRegistryService.cs
@@ -361,6 +361,11 @@ private sealed class InterpretersEnumerable : IEnumerable<IPythonInterpreterFact
             return null;
         }
 
+        public object GetProperty(string id, string propName) {
+            var factoryProvider = GetFactoryProvider(id);
+            return factoryProvider?.GetProperty(id, propName);
+        }
+
         private IPythonInterpreterFactoryProvider GetFactoryProvider(string id) {
             var interpAndId = id.Split(new[] { '|' }, 2);
             if (interpAndId.Length == 2) {

diff --git a/Python/Product/CanopyInterpreter/CanopyInterpreterFactoryProvider.cs b/Python/Product/CanopyInterpreter/CanopyInterpreterFactoryProvider.cs
@@ -230,6 +230,8 @@ class CanopyInterpreterFactoryProvider : IPythonInterpreterFactoryProvider {
                 .FirstOrDefault();
         }
 
+        public object GetProperty(string id, string propName) => null;
+
         public event EventHandler InterpreterFactoriesChanged;
 
         private void OnInterpreterFactoriesChanged() {

diff --git a/Python/Product/IronPython/Interpreter/IronPythonInterpreterFactoryProvider.cs b/Python/Product/IronPython/Interpreter/IronPythonInterpreterFactoryProvider.cs
@@ -171,6 +171,7 @@ sealed class IronPythonInterpreterFactoryProvider : IPythonInterpreterFactoryPro
 
         public event EventHandler InterpreterFactoriesChanged;
 
+        public object GetProperty(string id, string propName) => null;
 
         #endregion
 

diff --git a/Python/Product/PythonTools/PythonTools/Extensions.cs b/Python/Product/PythonTools/PythonTools/Extensions.cs
@@ -290,8 +290,15 @@ public static class Extensions {
 
             string path = buffer.GetFilePath();
             if (path != null) {
-                var docTable = provider.GetService(typeof(SVsRunningDocumentTable)) as IVsRunningDocumentTable4;
-                var cookie = docTable.GetDocumentCookie(path);
+                var docTable = (IVsRunningDocumentTable4)provider.GetService(typeof(SVsRunningDocumentTable));
+                var cookie = VSConstants.VSCOOKIE_NIL;
+                try {
+                    cookie = docTable.GetDocumentCookie(path);
+                } catch (ArgumentException) {
+                    // Exception may be raised while VS is shutting down
+                    entry = null;
+                    return false;
+                }
                 VsProjectAnalyzer analyzer = null;
                 if (cookie != VSConstants.VSCOOKIE_NIL) {
                     IVsHierarchy hierarchy;
@@ -486,7 +493,14 @@ public static class Extensions {
                 IVsHierarchy hierarchy;
                 uint itemid;
                 docTable.GetDocumentHierarchyItem(cookie, out hierarchy, out itemid);
-                return hierarchy.GetProject()?.GetPythonProject();
+                var project = hierarchy.GetProject();
+                if (project != null) {
+                    return project.GetPythonProject();
+                }
+
+                object projectObj;
+                ErrorHandler.ThrowOnFailure(hierarchy.GetProperty(itemid, (int)__VSHPROPID.VSHPROPID_ExtObject, out projectObj));
+                return (projectObj as EnvDTE.Project)?.GetPythonProject();
             }
             return null;
         }

diff --git a/Python/Product/PythonTools/PythonTools/Repl/PythonInteractiveEvaluator.cs b/Python/Product/PythonTools/PythonTools/Repl/PythonInteractiveEvaluator.cs
@@ -122,19 +122,43 @@ partial class PythonInteractiveEvaluator :
         internal virtual void OnAttach() { }
         internal virtual void OnDetach() { }
 
+        private PythonProjectNode GetAssociatedPythonProject(InterpreterConfiguration interpreter = null) {
+            var moniker = ProjectMoniker;
+            if (interpreter == null) {
+                interpreter = Configuration?.Interpreter;
+            }
+
+            if (string.IsNullOrEmpty(moniker) && interpreter != null) {
+                var interpreterService = _serviceProvider.GetComponentModel().GetService<IInterpreterRegistryService>();
+                moniker = interpreterService.GetProperty(interpreter.Id, "ProjectMoniker") as string;
+            }
+
+            if (string.IsNullOrEmpty(moniker)) {
+                return null;
+            }
+
+            return _serviceProvider.GetProjectFromFile(moniker);
+        }
+
+
         public VsProjectAnalyzer Analyzer {
             get {
                 if (_analyzer != null) {
                     return _analyzer;
                 }
 
-                var interpreterService = _serviceProvider.GetComponentModel().GetService<IInterpreterRegistryService>();
                 var config = Configuration;
 
                 if (config == null) {
                     _analyzer = _serviceProvider.GetPythonToolsService().DefaultAnalyzer;
                 } else {
-                    _analyzer = new VsProjectAnalyzer(_serviceProvider, interpreterService.FindInterpreter(config.Interpreter.Id));
+                    var projectFile = GetAssociatedPythonProject(config.Interpreter)?.BuildProject;
+                    var interpreterService = _serviceProvider.GetComponentModel().GetService<IInterpreterRegistryService>();
+                    _analyzer = new VsProjectAnalyzer(
+                        _serviceProvider,
+                        interpreterService.FindInterpreter(config.Interpreter.Id),
+                        projectFile: projectFile
+                    );
                 }
                 return _analyzer;
             }
@@ -283,22 +307,20 @@ partial class PythonInteractiveEvaluator :
             }
 
             return await _serviceProvider.GetUIThread().InvokeTask(async () => {
-                if (!string.IsNullOrEmpty(ProjectMoniker)) {
-                    try {
-                        UpdatePropertiesFromProjectMoniker();
-                    } catch (NoInterpretersException ex) {
-                        WriteError(ex.ToString());
-                        return null;
-                    } catch (MissingInterpreterException ex) {
-                        WriteError(ex.ToString());
-                        return null;
-                    } catch (DirectoryNotFoundException ex) {
-                        WriteError(ex.ToString());
-                        return null;
-                    } catch (Exception ex) when (!ex.IsCriticalException()) {
-                        WriteError(ex.ToUnhandledExceptionMessage(GetType()));
-                        return null;
-                    }
+                try {
+                    UpdatePropertiesFromProjectMoniker();
+                } catch (NoInterpretersException ex) {
+                    WriteError(ex.ToString());
+                    return null;
+                } catch (MissingInterpreterException ex) {
+                    WriteError(ex.ToString());
+                    return null;
+                } catch (DirectoryNotFoundException ex) {
+                    WriteError(ex.ToString());
+                    return null;
+                } catch (Exception ex) when (!ex.IsCriticalException()) {
+                    WriteError(ex.ToUnhandledExceptionMessage(GetType()));
+                    return null;
                 }
 
                 var scriptsPath = ScriptsPath;
@@ -351,17 +373,7 @@ partial class PythonInteractiveEvaluator :
         }
 
         internal void UpdatePropertiesFromProjectMoniker() {
-            var solution = _serviceProvider.GetService(typeof(SVsSolution)) as IVsSolution;
-            if (solution == null) {
-                return;
-            }
-
-            IVsHierarchy hier;
-            if (string.IsNullOrEmpty(ProjectMoniker) ||
-                ErrorHandler.Failed(solution.GetProjectOfUniqueName(ProjectMoniker, out hier))) {
-                return;
-            }
-            var pyProj = hier?.GetProject()?.GetPythonProject();
+            var pyProj = GetAssociatedPythonProject();
             if (pyProj == null) {
                 return;
             }

diff --git a/Python/Product/Uwp.Interpreter/PythonUwpInterpreterFactoryProvider.cs b/Python/Product/Uwp.Interpreter/PythonUwpInterpreterFactoryProvider.cs
@@ -120,5 +120,7 @@ class PythonUwpInterpreterFactoryProvider : IPythonInterpreterFactoryProvider {
                 .Where(x => x.Configuration.Id == id)
                 .FirstOrDefault();
         }
+
+        public object GetProperty(string id, string propName) => null;
     }
 }
diff --git a/Python/Product/VSInterpreters/CPythonInterpreterFactoryProvider.cs b/Python/Product/VSInterpreters/CPythonInterpreterFactoryProvider.cs
@@ -24,6 +24,7 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using Microsoft.PythonTools.Infrastructure;
+using Microsoft.PythonTools.Parsing;
 using Microsoft.Win32;
 
 namespace Microsoft.PythonTools.Interpreter {
@@ -180,6 +181,13 @@ class CPythonInterpreterFactoryProvider : IPythonInterpreterFactoryProvider {
                     version = new Version(2, 7);
                 }
 
+                try {
+                    var langVer = version.ToLanguageVersion();
+                } catch (InvalidOperationException) {
+                    // Version is not currently supported
+                    return;
+                }
+
                 var archStr = interpKey.GetValue("Architecture") as string;
                 switch (archStr) {
                     case "x64": arch = ProcessorArchitecture.Amd64; break;
@@ -353,6 +361,8 @@ class CPythonInterpreterFactoryProvider : IPythonInterpreterFactoryProvider {
             _interpFactoriesChanged?.Invoke(this, EventArgs.Empty);
         }
 
+        public object GetProperty(string id, string propName) => null;
+
         #endregion
 
         class InterpreterInformation {

diff --git a/Python/Product/VSInterpreters/MSBuildProjectInterpreterFactoryProvider.cs b/Python/Product/VSInterpreters/MSBuildProjectInterpreterFactoryProvider.cs
@@ -129,6 +129,14 @@ public sealed class MSBuildProjectInterpreterFactoryProvider : IPythonInterprete
             return null;
         }
 
+        public object GetProperty(string id, string propName) {
+            if (propName == "ProjectMoniker") {
+                var moniker = id.Substring(id.LastIndexOf('|') + 1);
+                return PathUtils.IsValidPath(moniker) ? moniker : null;
+            }
+            return null;
+        }
+
         public static string GetInterpreterId(string file, string id) {
             return String.Join("|", MSBuildProviderName, id, file);
         }

diff --git a/Python/Tests/Core/ReplEvaluatorTests.cs b/Python/Tests/Core/ReplEvaluatorTests.cs
@@ -235,6 +235,8 @@ class SimpleFactoryProvider : IPythonInterpreterFactoryProvider {
                     .FirstOrDefault();
             }
 
+            public object GetProperty(string id, string propName) => null;
+
             public event EventHandler InterpreterFactoriesChanged { add { } remove { } }
         }
 

diff --git a/Python/Tests/Utilities.Python.Analysis/MockInterpreterOptionsService.cs b/Python/Tests/Utilities.Python.Analysis/MockInterpreterOptionsService.cs
@@ -165,5 +165,9 @@ public class MockInterpreterOptionsService : IInterpreterOptionsService, IInterp
         public string AddConfigurableInterpreter(string name, InterpreterConfiguration config) {
             throw new NotImplementedException();
         }
+
+        public object GetProperty(string id, string propName) {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/Python/Tests/Utilities.Python.Analysis/MockPythonInterpreterFactoryProvider.cs b/Python/Tests/Utilities.Python.Analysis/MockPythonInterpreterFactoryProvider.cs
@@ -90,6 +90,8 @@ public class MockPythonInterpreterFactoryProvider : IPythonInterpreterFactoryPro
                 .FirstOrDefault();
         }
 
+        public object GetProperty(string id, string propName) => null;
+
         public event EventHandler InterpreterFactoriesChanged;
     }
 }