PR

Author: MikhailArkhipov

src/Analysis/Engine/Impl/ProjectEntry.cs

@@ -157,13 +157,12 @@ public IPythonParse GetCurrentParse() {
 
         internal void SetCompleteAnalysis() {
             lock (this) {
-                if (AnalysisVersion >= _expectedParse) {
-                    _analysisTcs.TrySetResult(Analysis);
+                if (AnalysisVersion < _expectedParse) {
+                    return;
                 }
+                _analysisTcs.TrySetResult(Analysis);
             }
-            if (AnalysisVersion >= _expectedParse) {
-                RaiseNewAnalysis();
-            }
+            RaiseNewAnalysis();
         }
 
         internal void ResetCompleteAnalysis() {
@@ -294,7 +293,7 @@ private void Parse(bool enqueueOnly, CancellationToken cancel) {
                 string pathPrefix = PathUtils.EnsureEndSeparator(Path.GetDirectoryName(FilePath));
                 var children =
                     from pair in ProjectState.ModulesByFilename
-                    // Is the candidate child package in a subdirectory of our package?
+                        // Is the candidate child package in a subdirectory of our package?
                     let fileName = pair.Key
                     where fileName.StartsWithOrdinal(pathPrefix, ignoreCase: true)
                     let moduleName = pair.Value.Name

src/LanguageServer/Impl/Implementation/Server.cs

@@ -584,37 +584,44 @@ private IDisposable GetDocumentParseCounter(IDocument doc, out int count) {
             }
         }
 
-        internal async Task EnqueueItemAsync(IDocument doc, AnalysisPriority priority = AnalysisPriority.Normal, bool parse = true, bool enqueueForAnalysis = true) {
+        internal Task EnqueueItemAsync(IDocument doc, AnalysisPriority priority = AnalysisPriority.Normal, bool parse = true, bool enqueueForAnalysis = true) {
             _disposableBag.ThrowIfDisposed();
             var pending = _pendingAnalysisEnqueue.Incremented();
             try {
                 var entry = doc as ProjectEntry;
                 entry?.ResetCompleteAnalysis();
 
-                // If we don't need to parse, use null cooking
-                IAnalysisCookie cookie = null;
+                // If we don't need to parse, use null cookie
+                var cookieTask = Task.FromResult<IAnalysisCookie>(null);
                 if (parse) {
                     using (GetDocumentParseCounter(doc, out var count)) {
                         if (count > 3) {
                             // Rough check to prevent unbounded queueing. If we have
                             // multiple parses in queue, we will get the latest doc
                             // version in one of the ones to come.
-                            return;
+                            return Task.CompletedTask;
                         }
                         TraceMessage($"Parsing document {doc.DocumentUri}");
-                        cookie = await ParseQueue.EnqueueAsync(doc, Analyzer.LanguageVersion);
+                        cookieTask = ParseQueue.EnqueueAsync(doc, Analyzer.LanguageVersion);
                     }
                 }
 
                 // The call must be fire and forget, but should not be yielding.
                 // It is called from DidChangeTextDocument which must fully finish
                 // since otherwise Complete() may come before the change is enqueued
                 // for processing and the completion list will be driven off the stale data.
-                var p = pending;
-                await OnDocumentChangeProcessingCompleteAsync(doc, cookie as VersionCookie, enqueueForAnalysis, priority, p);
-                pending = null;
-            } finally {
+                return cookieTask.ContinueWith(async t => {
+                    if (t.IsFaulted) {
+                        // Happens when file got deleted before processing 
+                        pending.Dispose();
+                        LogMessage(MessageType.Error, t.Exception.Message);
+                        return;
+                    }
+                    await OnDocumentChangeProcessingCompleteAsync(doc, t.Result as VersionCookie, enqueueForAnalysis, priority, pending);
+                });
+            } catch {
                 pending?.Dispose();
+                throw;
             }
         }