Mikhail Arkhipov (MikhailArkhipov) · Apr 12, 2019 · Mar 1, 2019 · Mar 1, 2019 · Mar 5, 2019 · Mar 5, 2019
diff --git a/src/Analysis/Ast/Impl/Documents/Definitions/IRunningDocumentTable.cs b/src/Analysis/Ast/Impl/Documents/Definitions/IRunningDocumentTable.cs
@@ -24,7 +24,13 @@ namespace Microsoft.Python.Analysis.Documents {
     /// the running document table in Visual Studio, see
     /// "https://docs.microsoft.com/en-us/visualstudio/extensibility/internals/running-document-table"/>
     /// </summary>
-    public interface IRunningDocumentTable: IEnumerable<IDocument> {
+    public interface IRunningDocumentTable {
+        /// <summary>
+        /// Returns collection of currently open or loaded modules.
+        /// Does not include stubs or compiled/scraped modules.
+        /// </summary>
+        IEnumerable<IDocument> GetDocuments();
+
         /// <summary>
         /// Opens document. Adds file to the list of available documents
         /// unless it was already loaded via indirect import.

diff --git a/src/Analysis/Ast/Impl/Documents/RunningDocumentTable.cs b/src/Analysis/Ast/Impl/Documents/RunningDocumentTable.cs
@@ -14,7 +14,6 @@
 // permissions and limitations under the License.
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -60,6 +59,16 @@ public RunningDocumentTable(IServiceContainer services) {
         public event EventHandler<DocumentEventArgs> Closed;
         public event EventHandler<DocumentEventArgs> Removed;
 
+        /// <summary>
+        /// Returns collection of currently open or loaded modules.
+        /// Does not include stubs or compiled/scraped modules.
+        /// </summary>
+        public IEnumerable<IDocument> GetDocuments() {
+            lock (_lock) {
+                return _documentsByName.Values.Select(e => e.Document).ToArray();
+            }
+        }
+
         /// <summary>
         /// Adds file to the list of available documents.
         /// </summary>
@@ -149,8 +158,6 @@ public int UnlockDocument(Uri uri) {
             }
         }
 
-        public IEnumerator<IDocument> GetEnumerator() => _documentsByUri.Values.Select(e => e.Document).GetEnumerator();
-
         public void CloseDocument(Uri documentUri) {
             var closed = false;
             var removed = false;
@@ -182,8 +189,6 @@ public void CloseDocument(Uri documentUri) {
             }
         }
 
-        IEnumerator IEnumerable.GetEnumerator() => _documentsByUri.Values.GetEnumerator();
-
         public void Dispose() {
             lock (_lock) {
                 foreach (var d in _documentsByUri.Values.OfType<IDisposable>()) {
@@ -196,6 +201,7 @@ private DocumentEntry FindDocument(string moduleName, Uri uri) {
             if (uri != null && _documentsByUri.TryGetValue(uri, out var entry)) {
                 return entry;
             }
+
             if (!string.IsNullOrEmpty(moduleName) && _documentsByName.TryGetValue(moduleName, out entry)) {
                 return entry;
             }

diff --git a/src/LanguageServer/Impl/Implementation/Server.cs b/src/LanguageServer/Impl/Implementation/Server.cs
@@ -231,7 +231,7 @@ public void NotifyPackagesChanged(CancellationToken cancellationToken) {
         private void RestartAnalysis() {
             var analyzer = Services.GetService<IPythonAnalyzer>();;
             analyzer.ResetAnalyzer();
-            foreach (var doc in _rdt) {
+            foreach (var doc in _rdt.GetDocuments()) {
                 doc.Reset(null);
             }
         }

diff --git a/src/LanguageServer/Impl/LanguageServer.Configuration.cs b/src/LanguageServer/Impl/LanguageServer.Configuration.cs
@@ -83,7 +83,7 @@ internal static void HandleLintingOnOff(IServiceContainer services, bool linterE
             var wasEnabled = optionsProvider.Options.LintingEnabled;
             optionsProvider.Options.LintingEnabled = linterEnabled;
 
-            foreach (var m in rdt.Where(m => m.ModuleType == ModuleType.User)) {
+            foreach (var m in rdt.GetDocuments().Where(m => m.ModuleType == ModuleType.User)) {
                 IReadOnlyList<DiagnosticsEntry> entries = Array.Empty<DiagnosticsEntry>();
                 if (!wasEnabled && linterEnabled) {
                     // Lint all user files in the RDT

diff --git a/src/LanguageServer/Test/RdtTests.cs b/src/LanguageServer/Test/RdtTests.cs
@@ -79,9 +79,9 @@ public async Task LockCount() {
             rdt.OpenDocument(uri1, "from LockCount1 import *");
             await Services.GetService<IPythonAnalyzer>().WaitForCompleteAnalysisAsync();
 
-            var docLc1 = rdt.First(d => d.Name.Contains("LockCount1"));
-            var docLc2 = rdt.First(d => d.Name.Contains("LockCount2"));
-            var docLc3 = rdt.First(d => d.Name.Contains("LockCount3"));
+            var docLc1 = rdt.GetDocuments().First(d => d.Name.Contains("LockCount1"));
+            var docLc2 = rdt.GetDocuments().First(d => d.Name.Contains("LockCount2"));
+            var docLc3 = rdt.GetDocuments().First(d => d.Name.Contains("LockCount3"));
 
             VerifyLockCount(rdt, docLc1.Uri, 1);
             VerifyLockCount(rdt, docLc2.Uri, 1);
@@ -109,9 +109,9 @@ public async Task OpenCloseAnalysis() {
             rdt.OpenDocument(uri, "from LockCount1 import *");
             await Services.GetService<IPythonAnalyzer>().WaitForCompleteAnalysisAsync();
 
-            var docLc1 = rdt.First(d => d.Name.Contains("LockCount1"));
-            var docLc2 = rdt.First(d => d.Name.Contains("LockCount2"));
-            var docLc3 = rdt.First(d => d.Name.Contains("LockCount3"));
+            var docLc1 = rdt.GetDocuments().First(d => d.Name.Contains("LockCount1"));
+            var docLc2 = rdt.GetDocuments().First(d => d.Name.Contains("LockCount2"));
+            var docLc3 = rdt.GetDocuments().First(d => d.Name.Contains("LockCount3"));
 
             var ds = GetDiagnosticsService();
             PublishDiagnostics();