Extend lock in invalidate

Author: MikhailArkhipov

src/Analysis/Ast/Impl/Analyzer/PythonAnalyzer.cs

@@ -119,28 +119,21 @@ public void RemoveAnalysis(IPythonModule module) {
 
         public void EnqueueDocumentForAnalysis(IPythonModule module, ImmutableArray<IPythonModule> analysisDependencies) {
             var key = new AnalysisModuleKey(module);
-            PythonAnalyzerEntry entry;
-            int version;
             lock (_syncObj) {
-                if (!_analysisEntries.TryGetValue(key, out entry)) {
+                if (!_analysisEntries.TryGetValue(key, out var entry)) {
                     return;
                 }
-                version = _version + 1;
-            }
-
-            if (entry.Invalidate(analysisDependencies, version, out var dependencies)) {
-                AnalyzeDocument(key, entry, dependencies);
+                var version = _version + 1;
+                if (entry.Invalidate(analysisDependencies, version, out var dependencies)) {
+                    AnalyzeDocument(key, entry, dependencies);
+                }
             }
         }
 
         public void EnqueueDocumentForAnalysis(IPythonModule module, PythonAst ast, int bufferVersion) {
-            PythonAnalyzerEntry entry;
-            AnalysisModuleKey key;
-            int version;
-
             lock (_syncObj) {
-                entry = GetOrCreateAnalysisEntry(module, out key);
-                version = _version + 1;
+                var entry = GetOrCreateAnalysisEntry(module, out var key);
+                var version = _version + 1;
                 if (entry.BufferVersion >= bufferVersion) {
                     return;
                 }
@@ -152,10 +145,10 @@ public void EnqueueDocumentForAnalysis(IPythonModule module, PythonAst ast, int
                     key = nonUserAsDocumentKey;
                     entry = documentEntry;
                 }
-            }
 
-            if (entry.Invalidate(module, ast, bufferVersion, version, out var dependencies)) {
-                AnalyzeDocument(key, entry, dependencies);
+                if (entry.Invalidate(module, ast, bufferVersion, version, out var dependencies)) {
+                    AnalyzeDocument(key, entry, dependencies);
+                }
             }
         }
 
@@ -220,16 +213,13 @@ private void AnalyzeDocument(in AnalysisModuleKey key, in PythonAnalyzerEntry en
             _log?.Log(TraceEventType.Verbose, $"Analysis of {entry.Module.Name} ({entry.Module.ModuleType}) queued. Dependencies: {string.Join(", ", dependencies.Select(d => d.IsTypeshed ? $"{d.Name} (stub)" : d.Name))}");
 
             var graphVersion = _dependencyResolver.ChangeValue(key, entry, entry.IsUserOrBuiltin || key.IsNonUserAsDocument, dependencies);
-
-            lock (_syncObj) {
-                if (_version > graphVersion) {
-                    return;
-                }
-
-                _version = graphVersion;
-                _currentSession?.Cancel();
+            if (_version > graphVersion) {
+                return;
             }
 
+            _version = graphVersion;
+            _currentSession?.Cancel();
+
             if (TryCreateSession(graphVersion, entry, out var session)) {
                 session.Start(true);
             }