Merge pull request #1323 from zooba/issue-1251

zooba · zooba · commit a5b78ed55377 · 2016-05-26T16:56:19.000-07:00
Fixes #1251 No completions in virtual env REPL
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 @@ public InterpreterConfiguration FindConfiguration(string id) {
             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 @@ public IPythonInterpreterFactory GetInterpreterFactory(string id) {
                 .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 @@ private void DiscoverInterpreterFactories() {
 
         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 @@ internal static bool TryGetAnalysisEntry(this ITextView view, ITextBuffer buffer
 
             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 @@ internal static PythonProjectNode GetProjectFromFile(this IServiceProvider servi
                 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 @@ internal virtual void OnConnected() { }
         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 @@ protected async Task<CommandProcessorThread> EnsureConnectedAsync() {
             }
 
             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 @@ protected virtual async Task ExecuteStartupScripts(string scriptsPath) {
         }
 
         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 @@ public IPythonInterpreterFactory GetInterpreterFactory(string id) {
                 .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 @@ private static void TryRegisterInterpreter(Dictionary<string, InterpreterInforma
                     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 @@ private void OnInterpreterFactoriesChanged() {
             _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 IPythonInterpreterFactory GetInterpreterFactory(string id) {
             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 @@ public IPythonInterpreterFactory GetInterpreterFactory(string id) {
                     .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 InterpreterConfiguration FindConfiguration(string id) {
         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 IPythonInterpreterFactory GetInterpreterFactory(string id) {
                 .FirstOrDefault();
         }
 
+        public object GetProperty(string id, string propName) => null;
+
         public event EventHandler InterpreterFactoriesChanged;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,8 @@ public IPythonInterpreterFactory GetInterpreterFactory(string id) {`
`230`	`230`	`.FirstOrDefault();`
`231`	`231`	`}`
`232`	`232`
	`233`	`+ public object GetProperty(string id, string propName) => null;`
	`234`	`+`
`233`	`235`	`public event EventHandler InterpreterFactoriesChanged;`
`234`	`236`
`235`	`237`	`private void OnInterpreterFactoriesChanged() {`
Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ private void DiscoverInterpreterFactories() {`
`171`	`171`
`172`	`172`	`public event EventHandler InterpreterFactoriesChanged;`
`173`	`173`
	`174`	`+ public object GetProperty(string id, string propName) => null;`
`174`	`175`
`175`	`176`	`#endregion`
`176`	`177`
Original file line number	Diff line number	Diff line change
`@@ -120,5 +120,7 @@ public IPythonInterpreterFactory GetInterpreterFactory(string id) {`
`120`	`120`	`.Where(x => x.Configuration.Id == id)`
`121`	`121`	`.FirstOrDefault();`
`122`	`122`	`}`
	`123`	`+`
	`124`	`+ public object GetProperty(string id, string propName) => null;`
`123`	`125`	`}`
`124`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,14 @@ public IPythonInterpreterFactory GetInterpreterFactory(string id) {`
`129`	`129`	`return null;`
`130`	`130`	`}`
`131`	`131`
	`132`	`+ public object GetProperty(string id, string propName) {`
	`133`	`+ if (propName == "ProjectMoniker") {`
	`134`	`+ var moniker = id.Substring(id.LastIndexOf('\|') + 1);`
	`135`	`+ return PathUtils.IsValidPath(moniker) ? moniker : null;`
	`136`	`+ }`
	`137`	`+ return null;`
	`138`	`+ }`
	`139`	`+`
`132`	`140`	`public static string GetInterpreterId(string file, string id) {`
`133`	`141`	`return String.Join("\|", MSBuildProviderName, id, file);`
`134`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,8 @@ public IPythonInterpreterFactory GetInterpreterFactory(string id) {`
`235`	`235`	`.FirstOrDefault();`
`236`	`236`	`}`
`237`	`237`
	`238`	`+ public object GetProperty(string id, string propName) => null;`
	`239`	`+`
`238`	`240`	`public event EventHandler InterpreterFactoriesChanged { add { } remove { } }`
`239`	`241`	`}`
`240`	`242`
Original file line number	Diff line number	Diff line change
`@@ -165,5 +165,9 @@ public InterpreterConfiguration FindConfiguration(string id) {`
`165`	`165`	`public string AddConfigurableInterpreter(string name, InterpreterConfiguration config) {`
`166`	`166`	`throw new NotImplementedException();`
`167`	`167`	`}`
	`168`	`+`
	`169`	`+ public object GetProperty(string id, string propName) {`
	`170`	`+ throw new NotImplementedException();`
	`171`	`+ }`
`168`	`172`	`}`
`169`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,8 @@ public IPythonInterpreterFactory GetInterpreterFactory(string id) {`
`90`	`90`	`.FirstOrDefault();`
`91`	`91`	`}`
`92`	`92`
	`93`	`+ public object GetProperty(string id, string propName) => null;`
	`94`	`+`
`93`	`95`	`public event EventHandler InterpreterFactoriesChanged;`
`94`	`96`	`}`
`95`	`97`	`}`