Fix version matching

Author: MikhailArkhipov

src/Analysis/Engine/Impl/Definitions/IModuleAnalysis.cs

@@ -20,6 +20,7 @@
 
 namespace Microsoft.PythonTools.Analysis {
     public interface IModuleAnalysis {
+        int Version { get; }
         IModuleContext InterpreterContext { get; }
         PythonAnalyzer ProjectState { get; }
         IScope Scope { get; }

src/Analysis/Engine/Impl/ModuleAnalysis.cs

@@ -34,20 +34,21 @@ namespace Microsoft.PythonTools.Analysis {
     /// 
     /// Can be queried for various information about the resulting analysis.
     /// </summary>
-    public sealed class ModuleAnalysis: IModuleAnalysis {
+    public sealed class ModuleAnalysis : IModuleAnalysis {
         private readonly AnalysisUnit _unit;
         private static Regex _otherPrivateRegex = new Regex("^_[a-zA-Z_]\\w*__[a-zA-Z_]\\w*$");
 
         private static readonly IEnumerable<IOverloadResult> GetSignaturesError =
             new[] { new OverloadResult(new ParameterResult[0], "Unknown", "IntellisenseError_Sigs", null) };
 
-        internal ModuleAnalysis(AnalysisUnit unit, InterpreterScope scope) {
+        internal ModuleAnalysis(AnalysisUnit unit, InterpreterScope scope, int version) {
             _unit = unit;
             Scope = scope;
+            Version = version;
         }
 
         #region Public API
-
+        public int Version { get; }
         /// <summary>
         /// Evaluates the given expression in at the provided line number and returns the values
         /// that the expression can evaluate to.
@@ -526,7 +527,7 @@ expr is TupleExpression ||
         /// specified location.
         /// </summary>
         /// <param name="index">The 0-based absolute index into the file.</param>
-        internal IEnumerable<IMemberResult> GetDefinitionTreeByIndex(int index) 
+        internal IEnumerable<IMemberResult> GetDefinitionTreeByIndex(int index)
             => GetDefinitionTree(_unit.Tree.IndexToLocation(index));
 
         /// <summary>
@@ -989,9 +990,9 @@ private static bool IsInFunctionParameter(InterpreterScope scope, PythonAst tree
             }
 
             return function.Parameters.Any(p => {
-                    var paramName = p.GetVerbatimImage(tree) ?? p.Name;
-                    return index >= p.StartIndex && index <= p.StartIndex + paramName.Length;
-                });
+                var paramName = p.GetVerbatimImage(tree) ?? p.Name;
+                return index >= p.StartIndex && index <= p.StartIndex + paramName.Length;
+            });
         }
 
         private static int GetParentScopeIndent(InterpreterScope scope, PythonAst tree) {

src/Analysis/Engine/Impl/ProjectEntry.cs

@@ -41,11 +41,15 @@ namespace Microsoft.PythonTools.Analysis {
     [SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable",
         Justification = "Unclear ownership makes it unlikely this object will be disposed correctly")]
     internal sealed class ProjectEntry : IPythonProjectEntry, IAggregateableProjectEntry, IDocument {
-        private AnalysisUnit _unit;
-        private TaskCompletionSource<IModuleAnalysis> _analysisTcs = new TaskCompletionSource<IModuleAnalysis>();
         private readonly SortedDictionary<int, DocumentBuffer> _buffers;
         private readonly ConcurrentQueue<WeakReference<ReferenceDict>> _backReferences = new ConcurrentQueue<WeakReference<ReferenceDict>>();
-        internal readonly HashSet<AggregateProjectEntry> _aggregates = new HashSet<AggregateProjectEntry>();
+        private readonly HashSet<AggregateProjectEntry> _aggregates = new HashSet<AggregateProjectEntry>();
+
+        private TaskCompletionSource<IModuleAnalysis> _analysisTcs = new TaskCompletionSource<IModuleAnalysis>();
+        private AnalysisUnit _unit;
+        private readonly ManualResetEventSlim _pendingParse = new ManualResetEventSlim(true);
+        private long _expectedParseVersion;
+        private long _expectedAnalysisVersion;
 
         internal ProjectEntry(
             PythonAnalyzer state,
@@ -84,17 +88,14 @@ internal static Uri MakeDocumentUri(string filePath) {
         public event EventHandler<EventArgs> NewParseTree;
         public event EventHandler<EventArgs> NewAnalysis;
 
-        private readonly ManualResetEventSlim _pendingParse = new ManualResetEventSlim(true);
-        private long _expectedParse;
-
         private class ActivePythonParse : IPythonParse {
             private readonly ProjectEntry _entry;
-            private readonly long _expected;
+            private readonly long _expectedVersion;
             private bool _completed;
 
-            public ActivePythonParse(ProjectEntry entry, long expected) {
+            public ActivePythonParse(ProjectEntry entry, long expectedVersion) {
                 _entry = entry;
-                _expected = expected;
+                _expectedVersion = expectedVersion;
             }
 
             public PythonAst Tree { get; set; }
@@ -105,7 +106,7 @@ public void Dispose() {
                     return;
                 }
                 lock (_entry) {
-                    if (_entry._expectedParse == _expected) {
+                    if (_entry._expectedParseVersion == _expectedVersion) {
                         _entry._pendingParse.Set();
                     }
                 }
@@ -114,7 +115,7 @@ public void Dispose() {
             public void Complete() {
                 _completed = true;
                 lock (_entry) {
-                    if (_entry._expectedParse == _expected) {
+                    if (_entry._expectedParseVersion == _expectedVersion) {
                         _entry.SetCurrentParse(Tree, Cookie);
                         _entry._pendingParse.Set();
                     }
@@ -125,8 +126,8 @@ public void Complete() {
         public IPythonParse BeginParse() {
             _pendingParse.Reset();
             lock (this) {
-                _expectedParse += 1;
-                return new ActivePythonParse(this, _expectedParse);
+                _expectedParseVersion += 1;
+                return new ActivePythonParse(this, _expectedParseVersion);
             }
         }
 
@@ -157,7 +158,7 @@ public IPythonParse GetCurrentParse() {
 
         internal void SetCompleteAnalysis() {
             lock (this) {
-                if (AnalysisVersion < _expectedParse) {
+                if (_expectedAnalysisVersion != Analysis.Version) {
                     return;
                 }
                 _analysisTcs.TrySetResult(Analysis);
@@ -166,8 +167,9 @@ internal void SetCompleteAnalysis() {
         }
 
         internal void ResetCompleteAnalysis() {
-            TaskCompletionSource<IModuleAnalysis> analysisTcs;
+            TaskCompletionSource<IModuleAnalysis> analysisTcs = null;
             lock (this) {
+                _expectedAnalysisVersion = AnalysisVersion + 1;
                 analysisTcs = _analysisTcs;
                 _analysisTcs = new TaskCompletionSource<IModuleAnalysis>(TaskCreationOptions.RunContinuationsAsynchronously);
             }
@@ -191,14 +193,9 @@ public void SetCurrentParse(PythonAst tree, IAnalysisCookie cookie, bool notify
             return GetCurrentParse();
         }
 
+        internal bool IsVisible(ProjectEntry assigningScope) => true;
 
-        internal bool IsVisible(ProjectEntry assigningScope) {
-            return true;
-        }
-
-        public void Analyze(CancellationToken cancel) {
-            Analyze(cancel, false);
-        }
+        public void Analyze(CancellationToken cancel) => Analyze(cancel, false);
 
         public void Analyze(CancellationToken cancel, bool enqueueOnly) {
             if (cancel.IsCancellationRequested) {
@@ -317,7 +314,8 @@ where lastDot > 0
             // publish the analysis now that it's complete/running
             Analysis = new ModuleAnalysis(
                 _unit,
-                ((ModuleScope)_unit.Scope).CloneForPublish()
+                ((ModuleScope)_unit.Scope).CloneForPublish(),
+                AnalysisVersion
             );
         }
 

src/Analysis/Engine/Test/ThreadingTest.cs

@@ -135,7 +135,6 @@ class MyClass:
             // One analysis before we start
             foreach (var e in entries) {
                 e.Analyze(cancel, true);
-                e.ResetCompleteAnalysis();
             }
             state.AnalyzeQueuedEntries(cancel);