Skip to content
This repository was archived by the owner on Apr 14, 2022. It is now read-only.

Commit 515cbc2

Browse files
author
MikhailArkhipov
committed
Remove All member in favor of enumerable
1 parent 2fdece6 commit 515cbc2

4 files changed

Lines changed: 11 additions & 13 deletions

File tree

src/Analysis/Engine/Test/ServerExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public static async Task<IModuleAnalysis> OpenDefaultDocumentAndGetAnalysisAsync
149149
var cancellationToken = new CancellationTokenSource(failAfter).Token;
150150
await server.SendDidOpenTextDocument(TestData.GetDefaultModuleUri(), content, languageId);
151151
cancellationToken.ThrowIfCancellationRequested();
152-
var projectEntry = (ProjectEntry) server.ProjectFiles.All.Single();
152+
var projectEntry = (ProjectEntry) server.ProjectFiles.Single();
153153
return await projectEntry.GetAnalysisAsync(cancellationToken: cancellationToken);
154154
}
155155

@@ -167,7 +167,7 @@ public static Task SendDidChangeTextDocumentAsync(this Server server, Uri uri, s
167167
}
168168

169169
public static async Task<IModuleAnalysis> ChangeDefaultDocumentAndGetAnalysisAsync(this Server server, string text, int failAfter = 30000) {
170-
var projectEntry = (ProjectEntry) server.ProjectFiles.All.Single();
170+
var projectEntry = (ProjectEntry) server.ProjectFiles.Single();
171171
await server.SendDidChangeTextDocumentAsync(projectEntry.DocumentUri, text);
172172
return await projectEntry.GetAnalysisAsync(cancellationToken: new CancellationTokenSource(failAfter).Token);
173173
}

src/LanguageServer/Impl/Implementation/EditorFiles.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public EditorFiles(Server server) {
4242
public void Close(Uri uri) => GetDocument(uri).Close(uri);
4343

4444
public void UpdateDiagnostics() {
45-
foreach (var entry in _server.ProjectFiles.All) {
45+
foreach (var entry in _server.ProjectFiles) {
4646
GetDocument(entry.DocumentUri).UpdateAnalysisDiagnostics(entry, -1);
4747
}
4848
}

src/LanguageServer/Impl/Implementation/ProjectFiles.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@ public IProjectEntry RemoveEntry(Uri documentUri) {
4040
return _projectFiles.TryRemove(documentUri, out var entry) ? entry : null;
4141
}
4242

43-
public IEnumerable<IProjectEntry> All {
44-
get {
45-
ThrowIfDisposed();
46-
return _projectFiles.Values;
47-
}
48-
}
49-
5043
public IEnumerable<string> GetLoadedFiles() {
5144
ThrowIfDisposed();
5245
return _projectFiles.Keys.Select(k => k.AbsoluteUri);
@@ -103,8 +96,13 @@ private void ThrowIfDisposed() {
10396
}
10497

10598
#region IEnumerable<IProjectEntry>
106-
public IEnumerator<IProjectEntry> GetEnumerator() => All.GetEnumerator();
107-
IEnumerator IEnumerable.GetEnumerator() => All.GetEnumerator();
99+
public IEnumerator<IProjectEntry> GetEnumerator() => GetAll().GetEnumerator();
100+
IEnumerator IEnumerable.GetEnumerator() => GetAll().GetEnumerator();
101+
102+
private ICollection<IProjectEntry> GetAll() {
103+
ThrowIfDisposed();
104+
return _projectFiles.Values;
105+
}
108106
#endregion
109107
}
110108
}

src/LanguageServer/Impl/Implementation/Server.WorkspaceSymbols.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public override async Task<SymbolInformation[]> WorkspaceSymbols(WorkspaceSymbol
3434
var members = Enumerable.Empty<IMemberResult>();
3535
var opts = GetMemberOptions.ExcludeBuiltins | GetMemberOptions.DeclaredOnly;
3636

37-
foreach (var entry in ProjectFiles.All) {
37+
foreach (var entry in ProjectFiles) {
3838
members = members.Concat(
3939
await GetModuleVariablesAsync(entry as ProjectEntry, opts, @params.query, 50, cancellationToken)
4040
);

0 commit comments

Comments
 (0)