From 3ffbbd837e9414204330835320fc27e2ec3108d2 Mon Sep 17 00:00:00 2001 From: CyrusNajmabadi Date: Mon, 8 May 2017 11:50:19 -0700 Subject: [PATCH] Rename type. --- .../Core/Portable/Execution/CustomAsset.cs | 8 +- .../Portable/Execution/CustomAssetBuilder.cs | 2 +- .../Core/Portable/Execution/Extensions.cs | 42 +++++----- .../Core/Portable/Execution/RemotableData.cs | 8 +- .../Core/Portable/Execution/Serializer.cs | 76 +++++++++---------- .../Serializer_ChecksumWithChildren.cs | 26 +++---- .../Core/Portable/Execution/SolutionAsset.cs | 4 +- ...nds.cs => WellKnownSynchronizationKind.cs} | 2 +- .../SymbolTree/SymbolTreeInfo_Source.cs | 2 +- .../SyntaxTree/SyntaxTreeIndex_Persistence.cs | 2 +- .../Workspace/Solution/ChecksumCollection.cs | 16 ++-- .../Solution/ChecksumWithChildren.cs | 4 +- .../Workspace/Solution/Checksum_Factory.cs | 8 +- .../Workspace/Solution/DocumentInfo.cs | 2 +- .../Workspace/Solution/ProjectInfo.cs | 2 +- .../Workspace/Solution/SolutionInfo.cs | 2 +- .../Workspace/Solution/StateChecksums.cs | 6 +- .../Core/Portable/Workspaces.csproj | 2 +- .../SnapshotSerializationTestBase.cs | 44 +++++------ .../Execution/SnapshotSerializationTests.cs | 12 +-- .../Remote/Core/Services/AssetService.cs | 2 +- .../SnapshotService.JsonRpcAssetSource.cs | 2 +- 22 files changed, 137 insertions(+), 137 deletions(-) rename src/Workspaces/Core/Portable/Execution/{WellKnownSynchronizationKinds.cs => WellKnownSynchronizationKind.cs} (96%) diff --git a/src/Workspaces/Core/Portable/Execution/CustomAsset.cs b/src/Workspaces/Core/Portable/Execution/CustomAsset.cs index 3d9058d48f0..517a52b0811 100644 --- a/src/Workspaces/Core/Portable/Execution/CustomAsset.cs +++ b/src/Workspaces/Core/Portable/Execution/CustomAsset.cs @@ -14,7 +14,7 @@ namespace Microsoft.CodeAnalysis.Execution /// internal abstract class CustomAsset : RemotableData { - public CustomAsset(Checksum checksum, WellKnownSynchronizationKinds kind) : base(checksum, kind) + public CustomAsset(Checksum checksum, WellKnownSynchronizationKind kind) : base(checksum, kind) { } } @@ -26,7 +26,7 @@ internal sealed class SimpleCustomAsset : CustomAsset { private readonly Action _writer; - public SimpleCustomAsset(WellKnownSynchronizationKinds kind, Action writer) : + public SimpleCustomAsset(WellKnownSynchronizationKind kind, Action writer) : base(CreateChecksumFromStreamWriter(kind, writer), kind) { // unlike SolutionAsset which gets checksum from solution states, this one build one by itself. @@ -39,7 +39,7 @@ public override Task WriteObjectToAsync(ObjectWriter writer, CancellationToken c return SpecializedTasks.EmptyTask; } - private static Checksum CreateChecksumFromStreamWriter(WellKnownSynchronizationKinds kind, Action writer) + private static Checksum CreateChecksumFromStreamWriter(WellKnownSynchronizationKind kind, Action writer) { using (var stream = SerializableBytes.CreateWritableStream()) using (var objectWriter = new ObjectWriter(stream)) @@ -68,7 +68,7 @@ internal sealed class WorkspaceAnalyzerReferenceAsset : CustomAsset public WorkspaceAnalyzerReferenceAsset(AnalyzerReference reference, Serializer serializer) : base( serializer.CreateChecksum(reference, CancellationToken.None), - WellKnownSynchronizationKinds.AnalyzerReference) + WellKnownSynchronizationKind.AnalyzerReference) { _reference = reference; _serializer = serializer; diff --git a/src/Workspaces/Core/Portable/Execution/CustomAssetBuilder.cs b/src/Workspaces/Core/Portable/Execution/CustomAssetBuilder.cs index cbf54fc1c0c..5322d2e0a8c 100644 --- a/src/Workspaces/Core/Portable/Execution/CustomAssetBuilder.cs +++ b/src/Workspaces/Core/Portable/Execution/CustomAssetBuilder.cs @@ -32,7 +32,7 @@ public CustomAsset Build(OptionSet options, string language, CancellationToken c { cancellationToken.ThrowIfCancellationRequested(); - return new SimpleCustomAsset(WellKnownSynchronizationKinds.OptionSet, + return new SimpleCustomAsset(WellKnownSynchronizationKind.OptionSet, (writer, cancellationTokenOnStreamWriting) => _serializer.SerializeOptionSet(options, language, writer, cancellationTokenOnStreamWriting)); } diff --git a/src/Workspaces/Core/Portable/Execution/Extensions.cs b/src/Workspaces/Core/Portable/Execution/Extensions.cs index 481b1d600c9..99a1b3c6767 100644 --- a/src/Workspaces/Core/Portable/Execution/Extensions.cs +++ b/src/Workspaces/Core/Portable/Execution/Extensions.cs @@ -15,30 +15,30 @@ public static T[] ReadArray(this ObjectReader reader) return (T[])reader.ReadValue(); } - public static WellKnownSynchronizationKinds GetWellKnownSynchronizationKind(this object value) + public static WellKnownSynchronizationKind GetWellKnownSynchronizationKind(this object value) { switch (value) { - case SolutionStateChecksums _: return WellKnownSynchronizationKinds.SolutionState; - case ProjectStateChecksums _: return WellKnownSynchronizationKinds.ProjectState; - case DocumentStateChecksums _: return WellKnownSynchronizationKinds.DocumentState; - case ProjectChecksumCollection _: return WellKnownSynchronizationKinds.Projects; - case DocumentChecksumCollection _: return WellKnownSynchronizationKinds.Documents; - case TextDocumentChecksumCollection _: return WellKnownSynchronizationKinds.TextDocuments; - case ProjectReferenceChecksumCollection _: return WellKnownSynchronizationKinds.ProjectReferences; - case MetadataReferenceChecksumCollection _: return WellKnownSynchronizationKinds.MetadataReferences; - case AnalyzerReferenceChecksumCollection _: return WellKnownSynchronizationKinds.AnalyzerReferences; - case SolutionInfo.SolutionAttributes _: return WellKnownSynchronizationKinds.SolutionAttributes; - case ProjectInfo.ProjectAttributes _: return WellKnownSynchronizationKinds.ProjectAttributes; - case DocumentInfo.DocumentAttributes _: return WellKnownSynchronizationKinds.DocumentAttributes; - case CompilationOptions _: return WellKnownSynchronizationKinds.CompilationOptions; - case ParseOptions _: return WellKnownSynchronizationKinds.ParseOptions; - case ProjectReference _: return WellKnownSynchronizationKinds.ProjectReference; - case MetadataReference _: return WellKnownSynchronizationKinds.MetadataReference; - case AnalyzerReference _: return WellKnownSynchronizationKinds.AnalyzerReference; - case TextDocumentState _: return WellKnownSynchronizationKinds.RecoverableSourceText; - case SourceText _: return WellKnownSynchronizationKinds.SourceText; - case OptionSet _: return WellKnownSynchronizationKinds.OptionSet; + case SolutionStateChecksums _: return WellKnownSynchronizationKind.SolutionState; + case ProjectStateChecksums _: return WellKnownSynchronizationKind.ProjectState; + case DocumentStateChecksums _: return WellKnownSynchronizationKind.DocumentState; + case ProjectChecksumCollection _: return WellKnownSynchronizationKind.Projects; + case DocumentChecksumCollection _: return WellKnownSynchronizationKind.Documents; + case TextDocumentChecksumCollection _: return WellKnownSynchronizationKind.TextDocuments; + case ProjectReferenceChecksumCollection _: return WellKnownSynchronizationKind.ProjectReferences; + case MetadataReferenceChecksumCollection _: return WellKnownSynchronizationKind.MetadataReferences; + case AnalyzerReferenceChecksumCollection _: return WellKnownSynchronizationKind.AnalyzerReferences; + case SolutionInfo.SolutionAttributes _: return WellKnownSynchronizationKind.SolutionAttributes; + case ProjectInfo.ProjectAttributes _: return WellKnownSynchronizationKind.ProjectAttributes; + case DocumentInfo.DocumentAttributes _: return WellKnownSynchronizationKind.DocumentAttributes; + case CompilationOptions _: return WellKnownSynchronizationKind.CompilationOptions; + case ParseOptions _: return WellKnownSynchronizationKind.ParseOptions; + case ProjectReference _: return WellKnownSynchronizationKind.ProjectReference; + case MetadataReference _: return WellKnownSynchronizationKind.MetadataReference; + case AnalyzerReference _: return WellKnownSynchronizationKind.AnalyzerReference; + case TextDocumentState _: return WellKnownSynchronizationKind.RecoverableSourceText; + case SourceText _: return WellKnownSynchronizationKind.SourceText; + case OptionSet _: return WellKnownSynchronizationKind.OptionSet; } throw ExceptionUtilities.UnexpectedValue(value); diff --git a/src/Workspaces/Core/Portable/Execution/RemotableData.cs b/src/Workspaces/Core/Portable/Execution/RemotableData.cs index 94fa61fffc8..8b35d69adfa 100644 --- a/src/Workspaces/Core/Portable/Execution/RemotableData.cs +++ b/src/Workspaces/Core/Portable/Execution/RemotableData.cs @@ -16,19 +16,19 @@ internal abstract partial class RemotableData /// /// Indicates what kind of object it is - /// for examples. + /// for examples. /// /// this will be used in tranportation framework and deserialization service /// to hand shake how to send over data and deserialize serialized data /// - public readonly WellKnownSynchronizationKinds Kind; + public readonly WellKnownSynchronizationKind Kind; /// /// Checksum of this object /// public readonly Checksum Checksum; - public RemotableData(Checksum checksum, WellKnownSynchronizationKinds kind) + public RemotableData(Checksum checksum, WellKnownSynchronizationKind kind) { Checksum = checksum; Kind = kind; @@ -47,7 +47,7 @@ public RemotableData(Checksum checksum, WellKnownSynchronizationKinds kind) private sealed class NullRemotableData : RemotableData { public NullRemotableData() : - base(Checksum.Null, WellKnownSynchronizationKinds.Null) + base(Checksum.Null, WellKnownSynchronizationKind.Null) { // null object has null kind and null checksum. // this null object is known to checksum framework and transportation framework to handle null case diff --git a/src/Workspaces/Core/Portable/Execution/Serializer.cs b/src/Workspaces/Core/Portable/Execution/Serializer.cs index e5b0e4ad90f..b8a5c382b7b 100644 --- a/src/Workspaces/Core/Portable/Execution/Serializer.cs +++ b/src/Workspaces/Core/Portable/Execution/Serializer.cs @@ -63,21 +63,21 @@ public Checksum CreateChecksum(object value, CancellationToken cancellationToken switch (kind) { - case WellKnownSynchronizationKinds.Null: + case WellKnownSynchronizationKind.Null: return Checksum.Null; - case WellKnownSynchronizationKinds.CompilationOptions: - case WellKnownSynchronizationKinds.ParseOptions: - case WellKnownSynchronizationKinds.ProjectReference: + case WellKnownSynchronizationKind.CompilationOptions: + case WellKnownSynchronizationKind.ParseOptions: + case WellKnownSynchronizationKind.ProjectReference: return Checksum.Create(kind, value, this); - case WellKnownSynchronizationKinds.MetadataReference: + case WellKnownSynchronizationKind.MetadataReference: return Checksum.Create(kind, _hostSerializationService.CreateChecksum((MetadataReference)value, cancellationToken)); - case WellKnownSynchronizationKinds.AnalyzerReference: + case WellKnownSynchronizationKind.AnalyzerReference: return Checksum.Create(kind, _hostSerializationService.CreateChecksum((AnalyzerReference)value, cancellationToken)); - case WellKnownSynchronizationKinds.SourceText: + case WellKnownSynchronizationKind.SourceText: return Checksum.Create(kind, ((SourceText)value).GetChecksum()); default: @@ -104,37 +104,37 @@ public void Serialize(object value, ObjectWriter writer, CancellationToken cance switch (kind) { - case WellKnownSynchronizationKinds.Null: + case WellKnownSynchronizationKind.Null: // do nothing return; - case WellKnownSynchronizationKinds.SolutionAttributes: - case WellKnownSynchronizationKinds.ProjectAttributes: - case WellKnownSynchronizationKinds.DocumentAttributes: + case WellKnownSynchronizationKind.SolutionAttributes: + case WellKnownSynchronizationKind.ProjectAttributes: + case WellKnownSynchronizationKind.DocumentAttributes: ((IObjectWritable)value).WriteTo(writer); return; - case WellKnownSynchronizationKinds.CompilationOptions: + case WellKnownSynchronizationKind.CompilationOptions: SerializeCompilationOptions((CompilationOptions)value, writer, cancellationToken); return; - case WellKnownSynchronizationKinds.ParseOptions: + case WellKnownSynchronizationKind.ParseOptions: SerializeParseOptions((ParseOptions)value, writer, cancellationToken); return; - case WellKnownSynchronizationKinds.ProjectReference: + case WellKnownSynchronizationKind.ProjectReference: SerializeProjectReference((ProjectReference)value, writer, cancellationToken); return; - case WellKnownSynchronizationKinds.MetadataReference: + case WellKnownSynchronizationKind.MetadataReference: SerializeMetadataReference((MetadataReference)value, writer, cancellationToken); return; - case WellKnownSynchronizationKinds.AnalyzerReference: + case WellKnownSynchronizationKind.AnalyzerReference: SerializeAnalyzerReference((AnalyzerReference)value, writer, usePathFromAssembly: true, cancellationToken: cancellationToken); return; - case WellKnownSynchronizationKinds.SourceText: + case WellKnownSynchronizationKind.SourceText: SerializeSourceText(storage: null, text: (SourceText)value, writer: writer, cancellationToken: cancellationToken); return; @@ -146,7 +146,7 @@ public void Serialize(object value, ObjectWriter writer, CancellationToken cance } } - public T Deserialize(WellKnownSynchronizationKinds kind, ObjectReader reader, CancellationToken cancellationToken) + public T Deserialize(WellKnownSynchronizationKind kind, ObjectReader reader, CancellationToken cancellationToken) { using (Logger.LogBlock(FunctionId.Serializer_Deserialize, kind.ToString(), cancellationToken)) { @@ -154,39 +154,39 @@ public T Deserialize(WellKnownSynchronizationKinds kind, ObjectReader reader, switch (kind) { - case WellKnownSynchronizationKinds.Null: + case WellKnownSynchronizationKind.Null: return default(T); - case WellKnownSynchronizationKinds.SolutionState: - case WellKnownSynchronizationKinds.ProjectState: - case WellKnownSynchronizationKinds.DocumentState: - case WellKnownSynchronizationKinds.Projects: - case WellKnownSynchronizationKinds.Documents: - case WellKnownSynchronizationKinds.TextDocuments: - case WellKnownSynchronizationKinds.ProjectReferences: - case WellKnownSynchronizationKinds.MetadataReferences: - case WellKnownSynchronizationKinds.AnalyzerReferences: + case WellKnownSynchronizationKind.SolutionState: + case WellKnownSynchronizationKind.ProjectState: + case WellKnownSynchronizationKind.DocumentState: + case WellKnownSynchronizationKind.Projects: + case WellKnownSynchronizationKind.Documents: + case WellKnownSynchronizationKind.TextDocuments: + case WellKnownSynchronizationKind.ProjectReferences: + case WellKnownSynchronizationKind.MetadataReferences: + case WellKnownSynchronizationKind.AnalyzerReferences: return (T)(object)DeserializeChecksumWithChildren(reader, cancellationToken); - case WellKnownSynchronizationKinds.SolutionAttributes: + case WellKnownSynchronizationKind.SolutionAttributes: return (T)(object)SolutionInfo.SolutionAttributes.ReadFrom(reader); - case WellKnownSynchronizationKinds.ProjectAttributes: + case WellKnownSynchronizationKind.ProjectAttributes: return (T)(object)ProjectInfo.ProjectAttributes.ReadFrom(reader); - case WellKnownSynchronizationKinds.DocumentAttributes: + case WellKnownSynchronizationKind.DocumentAttributes: return (T)(object)DocumentInfo.DocumentAttributes.ReadFrom(reader); - case WellKnownSynchronizationKinds.CompilationOptions: + case WellKnownSynchronizationKind.CompilationOptions: return (T)(object)DeserializeCompilationOptions(reader, cancellationToken); - case WellKnownSynchronizationKinds.ParseOptions: + case WellKnownSynchronizationKind.ParseOptions: return (T)(object)DeserializeParseOptions(reader, cancellationToken); - case WellKnownSynchronizationKinds.ProjectReference: + case WellKnownSynchronizationKind.ProjectReference: return (T)(object)DeserializeProjectReference(reader, cancellationToken); - case WellKnownSynchronizationKinds.MetadataReference: + case WellKnownSynchronizationKind.MetadataReference: return (T)(object)DeserializeMetadataReference(reader, cancellationToken); - case WellKnownSynchronizationKinds.AnalyzerReference: + case WellKnownSynchronizationKind.AnalyzerReference: return (T)(object)DeserializeAnalyzerReference(reader, cancellationToken); - case WellKnownSynchronizationKinds.SourceText: + case WellKnownSynchronizationKind.SourceText: return (T)(object)DeserializeSourceText(reader, cancellationToken); - case WellKnownSynchronizationKinds.OptionSet: + case WellKnownSynchronizationKind.OptionSet: return (T)(object)DeserializeOptionSet(reader, cancellationToken); default: diff --git a/src/Workspaces/Core/Portable/Execution/Serializer_ChecksumWithChildren.cs b/src/Workspaces/Core/Portable/Execution/Serializer_ChecksumWithChildren.cs index 38f4aafe4dd..1d8cb16bbf2 100644 --- a/src/Workspaces/Core/Portable/Execution/Serializer_ChecksumWithChildren.cs +++ b/src/Workspaces/Core/Portable/Execution/Serializer_ChecksumWithChildren.cs @@ -17,7 +17,7 @@ internal partial class Serializer private const byte ChecksumKind = 0; private const byte ChecksumWithChildrenKind = 1; - private static readonly ImmutableDictionary> s_creatorMap = CreateCreatorMap(); + private static readonly ImmutableDictionary> s_creatorMap = CreateCreatorMap(); public void SerializeChecksumWithChildren(ChecksumWithChildren checksums, ObjectWriter writer, CancellationToken cancellationToken) { @@ -54,7 +54,7 @@ private ChecksumWithChildren DeserializeChecksumWithChildren(ObjectReader reader { cancellationToken.ThrowIfCancellationRequested(); - var kind = (WellKnownSynchronizationKinds)reader.ReadInt32(); + var kind = (WellKnownSynchronizationKind)reader.ReadInt32(); var checksum = Checksum.ReadFrom(reader); var childrenCount = reader.ReadInt32(); @@ -84,18 +84,18 @@ private ChecksumWithChildren DeserializeChecksumWithChildren(ObjectReader reader return checksums; } - private static ImmutableDictionary> CreateCreatorMap() + private static ImmutableDictionary> CreateCreatorMap() { - return ImmutableDictionary>.Empty - .Add(WellKnownSynchronizationKinds.SolutionState, children => new SolutionStateChecksums(children)) - .Add(WellKnownSynchronizationKinds.ProjectState, children => new ProjectStateChecksums(children)) - .Add(WellKnownSynchronizationKinds.DocumentState, children => new DocumentStateChecksums(children)) - .Add(WellKnownSynchronizationKinds.Projects, children => new ProjectChecksumCollection(children)) - .Add(WellKnownSynchronizationKinds.Documents, children => new DocumentChecksumCollection(children)) - .Add(WellKnownSynchronizationKinds.TextDocuments, children => new TextDocumentChecksumCollection(children)) - .Add(WellKnownSynchronizationKinds.ProjectReferences, children => new ProjectReferenceChecksumCollection(children)) - .Add(WellKnownSynchronizationKinds.MetadataReferences, children => new MetadataReferenceChecksumCollection(children)) - .Add(WellKnownSynchronizationKinds.AnalyzerReferences, children => new AnalyzerReferenceChecksumCollection(children)); + return ImmutableDictionary>.Empty + .Add(WellKnownSynchronizationKind.SolutionState, children => new SolutionStateChecksums(children)) + .Add(WellKnownSynchronizationKind.ProjectState, children => new ProjectStateChecksums(children)) + .Add(WellKnownSynchronizationKind.DocumentState, children => new DocumentStateChecksums(children)) + .Add(WellKnownSynchronizationKind.Projects, children => new ProjectChecksumCollection(children)) + .Add(WellKnownSynchronizationKind.Documents, children => new DocumentChecksumCollection(children)) + .Add(WellKnownSynchronizationKind.TextDocuments, children => new TextDocumentChecksumCollection(children)) + .Add(WellKnownSynchronizationKind.ProjectReferences, children => new ProjectReferenceChecksumCollection(children)) + .Add(WellKnownSynchronizationKind.MetadataReferences, children => new MetadataReferenceChecksumCollection(children)) + .Add(WellKnownSynchronizationKind.AnalyzerReferences, children => new AnalyzerReferenceChecksumCollection(children)); } } } diff --git a/src/Workspaces/Core/Portable/Execution/SolutionAsset.cs b/src/Workspaces/Core/Portable/Execution/SolutionAsset.cs index 124bc1cf7af..86fbf604e22 100644 --- a/src/Workspaces/Core/Portable/Execution/SolutionAsset.cs +++ b/src/Workspaces/Core/Portable/Execution/SolutionAsset.cs @@ -13,7 +13,7 @@ namespace Microsoft.CodeAnalysis.Execution /// internal abstract class SolutionAsset : RemotableData { - protected SolutionAsset(Checksum checksum, WellKnownSynchronizationKinds kind) + protected SolutionAsset(Checksum checksum, WellKnownSynchronizationKind kind) : base(checksum, kind) { } @@ -64,7 +64,7 @@ internal sealed class SourceTextAsset : SolutionAsset private readonly Serializer _serializer; public SourceTextAsset(Checksum checksum, TextDocumentState state, Serializer serializer) : - base(checksum, WellKnownSynchronizationKinds.SourceText) + base(checksum, WellKnownSynchronizationKind.SourceText) { _state = state; _serializer = serializer; diff --git a/src/Workspaces/Core/Portable/Execution/WellKnownSynchronizationKinds.cs b/src/Workspaces/Core/Portable/Execution/WellKnownSynchronizationKind.cs similarity index 96% rename from src/Workspaces/Core/Portable/Execution/WellKnownSynchronizationKinds.cs rename to src/Workspaces/Core/Portable/Execution/WellKnownSynchronizationKind.cs index 066d0b55ca2..a939b61b078 100644 --- a/src/Workspaces/Core/Portable/Execution/WellKnownSynchronizationKinds.cs +++ b/src/Workspaces/Core/Portable/Execution/WellKnownSynchronizationKind.cs @@ -3,7 +3,7 @@ namespace Microsoft.CodeAnalysis.Serialization { // TODO: Kind might not actually needed. see whether we can get rid of this - internal enum WellKnownSynchronizationKinds + internal enum WellKnownSynchronizationKind { Null, diff --git a/src/Workspaces/Core/Portable/FindSymbols/SymbolTree/SymbolTreeInfo_Source.cs b/src/Workspaces/Core/Portable/FindSymbols/SymbolTree/SymbolTreeInfo_Source.cs index a5d80a8a135..ab4876e509b 100644 --- a/src/Workspaces/Core/Portable/FindSymbols/SymbolTree/SymbolTreeInfo_Source.cs +++ b/src/Workspaces/Core/Portable/FindSymbols/SymbolTree/SymbolTreeInfo_Source.cs @@ -66,7 +66,7 @@ public static async Task GetSourceSymbolsChecksumAsync(Project project allChecksums.Add(compilationOptionsChecksum); allChecksums.Add(parseOptionsChecksum); - var checksum = Checksum.Create(WellKnownSynchronizationKinds.SymbolTreeInfo, allChecksums); + var checksum = Checksum.Create(WellKnownSynchronizationKind.SymbolTreeInfo, allChecksums); return checksum; } finally diff --git a/src/Workspaces/Core/Portable/FindSymbols/SyntaxTree/SyntaxTreeIndex_Persistence.cs b/src/Workspaces/Core/Portable/FindSymbols/SyntaxTree/SyntaxTreeIndex_Persistence.cs index a0a6a0d5859..42f0c9a6bf9 100644 --- a/src/Workspaces/Core/Portable/FindSymbols/SyntaxTree/SyntaxTreeIndex_Persistence.cs +++ b/src/Workspaces/Core/Portable/FindSymbols/SyntaxTree/SyntaxTreeIndex_Persistence.cs @@ -89,7 +89,7 @@ private void WriteFormatAndChecksum(ObjectWriter writer, string formatVersion) var parseOptionsChecksum = ChecksumCache.GetOrCreate( parseOptions, _ => serializer.CreateChecksum(parseOptions, cancellationToken)); - return Checksum.Create(WellKnownSynchronizationKinds.SyntaxTreeIndex, new[] { textChecksum, parseOptionsChecksum }); + return Checksum.Create(WellKnownSynchronizationKind.SyntaxTreeIndex, new[] { textChecksum, parseOptionsChecksum }); } private async Task SaveAsync( diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/ChecksumCollection.cs b/src/Workspaces/Core/Portable/Workspace/Solution/ChecksumCollection.cs index 1d5a72da8fa..008ecaeebdf 100644 --- a/src/Workspaces/Core/Portable/Workspace/Solution/ChecksumCollection.cs +++ b/src/Workspaces/Core/Portable/Workspace/Solution/ChecksumCollection.cs @@ -12,11 +12,11 @@ namespace Microsoft.CodeAnalysis.Serialization /// internal abstract class ChecksumCollection : ChecksumWithChildren, IEnumerable { - protected ChecksumCollection(WellKnownSynchronizationKinds kind, Checksum[] checksums) : this(kind, (object[])checksums) + protected ChecksumCollection(WellKnownSynchronizationKind kind, Checksum[] checksums) : this(kind, (object[])checksums) { } - protected ChecksumCollection(WellKnownSynchronizationKinds kind, object[] checksums) : base(kind, checksums) + protected ChecksumCollection(WellKnownSynchronizationKind kind, object[] checksums) : base(kind, checksums) { } @@ -38,36 +38,36 @@ IEnumerator IEnumerable.GetEnumerator() internal class ProjectChecksumCollection : ChecksumCollection { public ProjectChecksumCollection(Checksum[] checksums) : this((object[])checksums) { } - public ProjectChecksumCollection(object[] checksums) : base(WellKnownSynchronizationKinds.ProjectChecksumCollection, checksums) { } + public ProjectChecksumCollection(object[] checksums) : base(WellKnownSynchronizationKind.ProjectChecksumCollection, checksums) { } } internal class DocumentChecksumCollection : ChecksumCollection { public DocumentChecksumCollection(Checksum[] checksums) : this((object[])checksums) { } - public DocumentChecksumCollection(object[] checksums) : base(WellKnownSynchronizationKinds.DocumentChecksumCollection, checksums) { } + public DocumentChecksumCollection(object[] checksums) : base(WellKnownSynchronizationKind.DocumentChecksumCollection, checksums) { } } internal class TextDocumentChecksumCollection : ChecksumCollection { public TextDocumentChecksumCollection(Checksum[] checksums) : this((object[])checksums) { } - public TextDocumentChecksumCollection(object[] checksums) : base(WellKnownSynchronizationKinds.TextDocumentChecksumCollection, checksums) { } + public TextDocumentChecksumCollection(object[] checksums) : base(WellKnownSynchronizationKind.TextDocumentChecksumCollection, checksums) { } } internal class ProjectReferenceChecksumCollection : ChecksumCollection { public ProjectReferenceChecksumCollection(Checksum[] checksums) : this((object[])checksums) { } - public ProjectReferenceChecksumCollection(object[] checksums) : base(WellKnownSynchronizationKinds.ProjectReferenceChecksumCollection, checksums) { } + public ProjectReferenceChecksumCollection(object[] checksums) : base(WellKnownSynchronizationKind.ProjectReferenceChecksumCollection, checksums) { } } internal class MetadataReferenceChecksumCollection : ChecksumCollection { public MetadataReferenceChecksumCollection(Checksum[] checksums) : this((object[])checksums) { } - public MetadataReferenceChecksumCollection(object[] checksums) : base(WellKnownSynchronizationKinds.MetadataReferenceChecksumCollection, checksums) { } + public MetadataReferenceChecksumCollection(object[] checksums) : base(WellKnownSynchronizationKind.MetadataReferenceChecksumCollection, checksums) { } } internal class AnalyzerReferenceChecksumCollection : ChecksumCollection { public AnalyzerReferenceChecksumCollection(Checksum[] checksums) : this((object[])checksums) { } - public AnalyzerReferenceChecksumCollection(object[] checksums) : base(WellKnownSynchronizationKinds.AnalyzerReferenceChecksumCollection, checksums) { } + public AnalyzerReferenceChecksumCollection(object[] checksums) : base(WellKnownSynchronizationKind.AnalyzerReferenceChecksumCollection, checksums) { } } } diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/ChecksumWithChildren.cs b/src/Workspaces/Core/Portable/Workspace/Solution/ChecksumWithChildren.cs index 43461c80b0d..8a96e582ed5 100644 --- a/src/Workspaces/Core/Portable/Workspace/Solution/ChecksumWithChildren.cs +++ b/src/Workspaces/Core/Portable/Workspace/Solution/ChecksumWithChildren.cs @@ -10,7 +10,7 @@ namespace Microsoft.CodeAnalysis.Serialization /// internal abstract class ChecksumWithChildren : IChecksummedObject { - public ChecksumWithChildren(WellKnownSynchronizationKinds kind, params object[] children) + public ChecksumWithChildren(WellKnownSynchronizationKind kind, params object[] children) { Checksum = CreateChecksum(kind, children); Children = children; @@ -20,7 +20,7 @@ public ChecksumWithChildren(WellKnownSynchronizationKinds kind, params object[] public IReadOnlyList Children { get; } - private static Checksum CreateChecksum(WellKnownSynchronizationKinds kind, object[] children) + private static Checksum CreateChecksum(WellKnownSynchronizationKind kind, object[] children) { // given children must be either Checksum or Checksums (collection of a checksum) return Checksum.Create(kind, children.Select(c => c as Checksum ?? ((ChecksumCollection)c).Checksum)); diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/Checksum_Factory.cs b/src/Workspaces/Core/Portable/Workspace/Solution/Checksum_Factory.cs index dbc50f77793..cc95c9d326b 100644 --- a/src/Workspaces/Core/Portable/Workspace/Solution/Checksum_Factory.cs +++ b/src/Workspaces/Core/Portable/Workspace/Solution/Checksum_Factory.cs @@ -24,7 +24,7 @@ public static Checksum Create(Stream stream) } } - public static Checksum Create(WellKnownSynchronizationKinds kind, IObjectWritable @object) + public static Checksum Create(WellKnownSynchronizationKind kind, IObjectWritable @object) { using (var stream = SerializableBytes.CreateWritableStream()) using (var objectWriter = new ObjectWriter(stream)) @@ -36,7 +36,7 @@ public static Checksum Create(WellKnownSynchronizationKinds kind, IObjectWritabl } } - public static Checksum Create(WellKnownSynchronizationKinds kind, IEnumerable checksums) + public static Checksum Create(WellKnownSynchronizationKind kind, IEnumerable checksums) { using (var stream = SerializableBytes.CreateWritableStream()) using (var writer = new ObjectWriter(stream)) @@ -52,7 +52,7 @@ public static Checksum Create(WellKnownSynchronizationKinds kind, IEnumerable bytes) + public static Checksum Create(WellKnownSynchronizationKind kind, ImmutableArray bytes) { using (var stream = SerializableBytes.CreateWritableStream()) using (var writer = new ObjectWriter(stream)) @@ -68,7 +68,7 @@ public static Checksum Create(WellKnownSynchronizationKinds kind, ImmutableArray } } - public static Checksum Create(WellKnownSynchronizationKinds kind, T value, Serializer serializer) + public static Checksum Create(WellKnownSynchronizationKind kind, T value, Serializer serializer) { using (var stream = SerializableBytes.CreateWritableStream()) using (var objectWriter = new ObjectWriter(stream)) diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/DocumentInfo.cs b/src/Workspaces/Core/Portable/Workspace/Solution/DocumentInfo.cs index 0ea5dc98aa4..a6ac6503361 100644 --- a/src/Workspaces/Core/Portable/Workspace/Solution/DocumentInfo.cs +++ b/src/Workspaces/Core/Portable/Workspace/Solution/DocumentInfo.cs @@ -235,7 +235,7 @@ Checksum IChecksummedObject.Checksum { if (_lazyChecksum == null) { - _lazyChecksum = Checksum.Create(WellKnownSynchronizationKinds.DocumentAttributes, this); + _lazyChecksum = Checksum.Create(WellKnownSynchronizationKind.DocumentAttributes, this); } return _lazyChecksum; diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/ProjectInfo.cs b/src/Workspaces/Core/Portable/Workspace/Solution/ProjectInfo.cs index b0f34d64004..f40bcdd9de3 100644 --- a/src/Workspaces/Core/Portable/Workspace/Solution/ProjectInfo.cs +++ b/src/Workspaces/Core/Portable/Workspace/Solution/ProjectInfo.cs @@ -475,7 +475,7 @@ Checksum IChecksummedObject.Checksum { if (_lazyChecksum == null) { - _lazyChecksum = Checksum.Create(WellKnownSynchronizationKinds.ProjectAttributes, this); + _lazyChecksum = Checksum.Create(WellKnownSynchronizationKind.ProjectAttributes, this); } return _lazyChecksum; diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionInfo.cs b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionInfo.cs index f5d9029c9ad..a76b498de81 100644 --- a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionInfo.cs +++ b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionInfo.cs @@ -139,7 +139,7 @@ Checksum IChecksummedObject.Checksum { if (_lazyChecksum == null) { - _lazyChecksum = Checksum.Create(WellKnownSynchronizationKinds.SolutionAttributes, this); + _lazyChecksum = Checksum.Create(WellKnownSynchronizationKind.SolutionAttributes, this); } return _lazyChecksum; diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/StateChecksums.cs b/src/Workspaces/Core/Portable/Workspace/Solution/StateChecksums.cs index bc873f7ff2f..bef86d7f526 100644 --- a/src/Workspaces/Core/Portable/Workspace/Solution/StateChecksums.cs +++ b/src/Workspaces/Core/Portable/Workspace/Solution/StateChecksums.cs @@ -16,7 +16,7 @@ internal sealed class SolutionStateChecksums : ChecksumWithChildren { } - public SolutionStateChecksums(params object[] children) : base(WellKnownSynchronizationKinds.SolutionStateChecksums, children) + public SolutionStateChecksums(params object[] children) : base(WellKnownSynchronizationKind.SolutionStateChecksums, children) { } @@ -94,7 +94,7 @@ internal class ProjectStateChecksums : ChecksumWithChildren { } - public ProjectStateChecksums(params object[] children) : base(WellKnownSynchronizationKinds.ProjectStateChecksums, children) + public ProjectStateChecksums(params object[] children) : base(WellKnownSynchronizationKind.ProjectStateChecksums, children) { } @@ -228,7 +228,7 @@ internal class DocumentStateChecksums : ChecksumWithChildren { } - public DocumentStateChecksums(params object[] children) : base(WellKnownSynchronizationKinds.DocumentStateChecksums, children) + public DocumentStateChecksums(params object[] children) : base(WellKnownSynchronizationKind.DocumentStateChecksums, children) { } diff --git a/src/Workspaces/Core/Portable/Workspaces.csproj b/src/Workspaces/Core/Portable/Workspaces.csproj index 74ab71906e6..2b343008c48 100644 --- a/src/Workspaces/Core/Portable/Workspaces.csproj +++ b/src/Workspaces/Core/Portable/Workspaces.csproj @@ -368,7 +368,7 @@ - + diff --git a/src/Workspaces/CoreTest/Execution/SnapshotSerializationTestBase.cs b/src/Workspaces/CoreTest/Execution/SnapshotSerializationTestBase.cs index 69a44e59f0e..832430e20f6 100644 --- a/src/Workspaces/CoreTest/Execution/SnapshotSerializationTestBase.cs +++ b/src/Workspaces/CoreTest/Execution/SnapshotSerializationTestBase.cs @@ -39,7 +39,7 @@ internal static Solution CreateFullSolution(HostServices hostServices = null) internal static async Task VerifyAssetAsync(ISolutionSynchronizationService service, SolutionStateChecksums solutionObject) { await VerifyAssetSerializationAsync( - service, solutionObject.Info, WellKnownSynchronizationKinds.SolutionAttributes, + service, solutionObject.Info, WellKnownSynchronizationKind.SolutionAttributes, (v, k, s) => SolutionAsset.Create(s.CreateChecksum(v, CancellationToken.None), v, s)).ConfigureAwait(false); foreach (var projectChecksum in solutionObject.Projects) @@ -52,15 +52,15 @@ internal static async Task VerifyAssetAsync(ISolutionSynchronizationService serv internal static async Task VerifyAssetAsync(ISolutionSynchronizationService service, ProjectStateChecksums projectObject) { var info = await VerifyAssetSerializationAsync( - service, projectObject.Info, WellKnownSynchronizationKinds.ProjectAttributes, + service, projectObject.Info, WellKnownSynchronizationKind.ProjectAttributes, (v, k, s) => SolutionAsset.Create(s.CreateChecksum(v, CancellationToken.None), v, s)).ConfigureAwait(false); await VerifyAssetSerializationAsync( - service, projectObject.CompilationOptions, WellKnownSynchronizationKinds.CompilationOptions, + service, projectObject.CompilationOptions, WellKnownSynchronizationKind.CompilationOptions, (v, k, s) => SolutionAsset.Create(s.CreateChecksum(v, CancellationToken.None), v, s)); await VerifyAssetSerializationAsync( - service, projectObject.ParseOptions, WellKnownSynchronizationKinds.ParseOptions, + service, projectObject.ParseOptions, WellKnownSynchronizationKind.ParseOptions, (v, k, s) => SolutionAsset.Create(s.CreateChecksum(v, CancellationToken.None), v, s)); foreach (var checksum in projectObject.Documents) @@ -72,21 +72,21 @@ internal static async Task VerifyAssetAsync(ISolutionSynchronizationService serv foreach (var checksum in projectObject.ProjectReferences) { await VerifyAssetSerializationAsync( - service, checksum, WellKnownSynchronizationKinds.ProjectReference, + service, checksum, WellKnownSynchronizationKind.ProjectReference, (v, k, s) => SolutionAsset.Create(s.CreateChecksum(v, CancellationToken.None), v, s)); } foreach (var checksum in projectObject.MetadataReferences) { await VerifyAssetSerializationAsync( - service, checksum, WellKnownSynchronizationKinds.MetadataReference, + service, checksum, WellKnownSynchronizationKind.MetadataReference, (v, k, s) => SolutionAsset.Create(s.CreateChecksum(v, CancellationToken.None), v, s)); } foreach (var checksum in projectObject.AnalyzerReferences) { await VerifyAssetSerializationAsync( - service, checksum, WellKnownSynchronizationKinds.AnalyzerReference, + service, checksum, WellKnownSynchronizationKind.AnalyzerReference, (v, k, s) => SolutionAsset.Create(s.CreateChecksum(v, CancellationToken.None), v, s)); } @@ -100,19 +100,19 @@ internal static async Task VerifyAssetAsync(ISolutionSynchronizationService serv internal static async Task VerifyAssetAsync(ISolutionSynchronizationService service, DocumentStateChecksums documentObject) { var info = await VerifyAssetSerializationAsync( - service, documentObject.Info, WellKnownSynchronizationKinds.DocumentAttributes, + service, documentObject.Info, WellKnownSynchronizationKind.DocumentAttributes, (v, k, s) => SolutionAsset.Create(s.CreateChecksum(v, CancellationToken.None), v, s)).ConfigureAwait(false); await VerifyAssetSerializationAsync( - service, documentObject.Text, WellKnownSynchronizationKinds.SourceText, + service, documentObject.Text, WellKnownSynchronizationKind.SourceText, (v, k, s) => SolutionAsset.Create(s.CreateChecksum(v, CancellationToken.None), v, s)); } internal static async Task VerifyAssetSerializationAsync( ISolutionSynchronizationService service, Checksum checksum, - WellKnownSynchronizationKinds kind, - Func assetGetter) + WellKnownSynchronizationKind kind, + Func assetGetter) { // re-create asset from object var syncService = (SolutionSynchronizationServiceFactory.Service)service; @@ -206,20 +206,20 @@ internal static void ChecksumWithChildrenEqual(ChecksumWithChildren checksums1, int expectedAdditionalDocumentCount) { VerifyChecksumInService(snapshotService, projectObject.Checksum, projectObject.GetWellKnownSynchronizationKind()); - VerifyChecksumInService(snapshotService, projectObject.Info, WellKnownSynchronizationKinds.ProjectAttributes); - VerifyChecksumInService(snapshotService, projectObject.CompilationOptions, WellKnownSynchronizationKinds.CompilationOptions); - VerifyChecksumInService(snapshotService, projectObject.ParseOptions, WellKnownSynchronizationKinds.ParseOptions); + VerifyChecksumInService(snapshotService, projectObject.Info, WellKnownSynchronizationKind.ProjectAttributes); + VerifyChecksumInService(snapshotService, projectObject.CompilationOptions, WellKnownSynchronizationKind.CompilationOptions); + VerifyChecksumInService(snapshotService, projectObject.ParseOptions, WellKnownSynchronizationKind.ParseOptions); VerifyCollectionInService(snapshotService, projectObject.Documents.ToDocumentObjects(snapshotService), expectedDocumentCount); - VerifyCollectionInService(snapshotService, projectObject.ProjectReferences, expectedProjectReferenceCount, WellKnownSynchronizationKinds.ProjectReference); - VerifyCollectionInService(snapshotService, projectObject.MetadataReferences, expectedMetadataReferenceCount, WellKnownSynchronizationKinds.MetadataReference); - VerifyCollectionInService(snapshotService, projectObject.AnalyzerReferences, expectedAnalyzerReferenceCount, WellKnownSynchronizationKinds.AnalyzerReference); + VerifyCollectionInService(snapshotService, projectObject.ProjectReferences, expectedProjectReferenceCount, WellKnownSynchronizationKind.ProjectReference); + VerifyCollectionInService(snapshotService, projectObject.MetadataReferences, expectedMetadataReferenceCount, WellKnownSynchronizationKind.MetadataReference); + VerifyCollectionInService(snapshotService, projectObject.AnalyzerReferences, expectedAnalyzerReferenceCount, WellKnownSynchronizationKind.AnalyzerReference); VerifyCollectionInService(snapshotService, projectObject.AdditionalDocuments.ToDocumentObjects(snapshotService), expectedAdditionalDocumentCount); } - internal static void VerifyCollectionInService(ISolutionSynchronizationService snapshotService, ChecksumCollection checksums, int expectedCount, WellKnownSynchronizationKinds expectedItemKind) + internal static void VerifyCollectionInService(ISolutionSynchronizationService snapshotService, ChecksumCollection checksums, int expectedCount, WellKnownSynchronizationKind expectedItemKind) { VerifyChecksumInService(snapshotService, checksums.Checksum, checksums.GetWellKnownSynchronizationKind()); Assert.Equal(checksums.Count, expectedCount); @@ -244,8 +244,8 @@ internal static void VerifyCollectionInService(ISolutionSynchronizationService s internal static void VerifySnapshotInService(ISolutionSynchronizationService snapshotService, DocumentStateChecksums documentObject) { VerifyChecksumInService(snapshotService, documentObject.Checksum, documentObject.GetWellKnownSynchronizationKind()); - VerifyChecksumInService(snapshotService, documentObject.Info, WellKnownSynchronizationKinds.DocumentAttributes); - VerifyChecksumInService(snapshotService, documentObject.Text, WellKnownSynchronizationKinds.SourceText); + VerifyChecksumInService(snapshotService, documentObject.Info, WellKnownSynchronizationKind.DocumentAttributes); + VerifyChecksumInService(snapshotService, documentObject.Text, WellKnownSynchronizationKind.SourceText); } internal static void VerifySynchronizationObjectInService(ISolutionSynchronizationService snapshotService, T syncObject) where T : RemotableData @@ -253,7 +253,7 @@ internal static void VerifySnapshotInService(ISolutionSynchronizationService sna VerifyChecksumInService(snapshotService, syncObject.Checksum, syncObject.Kind); } - internal static void VerifyChecksumInService(ISolutionSynchronizationService snapshotService, Checksum checksum, WellKnownSynchronizationKinds kind) + internal static void VerifyChecksumInService(ISolutionSynchronizationService snapshotService, Checksum checksum, WellKnownSynchronizationKind kind) { Assert.NotNull(checksum); var otherObject = snapshotService.GetRemotableData(checksum, CancellationToken.None); @@ -266,7 +266,7 @@ internal static void VerifyChecksumInService(ISolutionSynchronizationService sna ChecksumEqual(checksumObject1.Checksum, checksumObject1.Kind, checksumObject2.Checksum, checksumObject2.Kind); } - internal static void ChecksumEqual(Checksum checksum1, WellKnownSynchronizationKinds kind1, Checksum checksum2, WellKnownSynchronizationKinds kind2) + internal static void ChecksumEqual(Checksum checksum1, WellKnownSynchronizationKind kind1, Checksum checksum2, WellKnownSynchronizationKind kind2) { Assert.Equal(checksum1, checksum2); Assert.Equal(kind1, kind2); diff --git a/src/Workspaces/CoreTest/Execution/SnapshotSerializationTests.cs b/src/Workspaces/CoreTest/Execution/SnapshotSerializationTests.cs index adacfe3682c..152c06e12ca 100644 --- a/src/Workspaces/CoreTest/Execution/SnapshotSerializationTests.cs +++ b/src/Workspaces/CoreTest/Execution/SnapshotSerializationTests.cs @@ -42,7 +42,7 @@ public async Task CreateSolutionSnapshotId_Empty() VerifySynchronizationObjectInService(snapshotService, solutionSyncObject); var solutionObject = await snapshotService.GetValueAsync(checksum).ConfigureAwait(false); - VerifyChecksumInService(snapshotService, solutionObject.Info, WellKnownSynchronizationKinds.SolutionAttributes); + VerifyChecksumInService(snapshotService, solutionObject.Info, WellKnownSynchronizationKind.SolutionAttributes); var projectsSyncObject = snapshotService.GetRemotableData(solutionObject.Projects.Checksum, CancellationToken.None); VerifySynchronizationObjectInService(snapshotService, projectsSyncObject); @@ -78,7 +78,7 @@ public async Task CreateSolutionSnapshotId_Project() var solutionObject = await snapshotService.GetValueAsync(checksum).ConfigureAwait(false); - VerifyChecksumInService(snapshotService, solutionObject.Info, WellKnownSynchronizationKinds.SolutionAttributes); + VerifyChecksumInService(snapshotService, solutionObject.Info, WellKnownSynchronizationKind.SolutionAttributes); var projectSyncObject = snapshotService.GetRemotableData(solutionObject.Projects.Checksum, CancellationToken.None); VerifySynchronizationObjectInService(snapshotService, projectSyncObject); @@ -114,8 +114,8 @@ public async Task CreateSolutionSnapshotId() var solutionObject = await snapshotService.GetValueAsync(syncObject.Checksum).ConfigureAwait(false); VerifySynchronizationObjectInService(snapshotService, syncObject); - VerifyChecksumInService(snapshotService, solutionObject.Info, WellKnownSynchronizationKinds.SolutionAttributes); - VerifyChecksumInService(snapshotService, solutionObject.Projects.Checksum, WellKnownSynchronizationKinds.Projects); + VerifyChecksumInService(snapshotService, solutionObject.Info, WellKnownSynchronizationKind.SolutionAttributes); + VerifyChecksumInService(snapshotService, solutionObject.Projects.Checksum, WellKnownSynchronizationKind.Projects); Assert.Equal(solutionObject.Projects.Count, 1); VerifySnapshotInService(snapshotService, solutionObject.Projects.ToProjectObjects(snapshotService)[0], 1, 0, 0, 0, 0); @@ -151,8 +151,8 @@ public async Task CreateSolutionSnapshotId_Full() var solutionObject = await snapshotService.GetValueAsync(syncObject.Checksum).ConfigureAwait(false); VerifySynchronizationObjectInService(snapshotService, syncObject); - VerifyChecksumInService(snapshotService, solutionObject.Info, WellKnownSynchronizationKinds.SolutionAttributes); - VerifyChecksumInService(snapshotService, solutionObject.Projects.Checksum, WellKnownSynchronizationKinds.Projects); + VerifyChecksumInService(snapshotService, solutionObject.Info, WellKnownSynchronizationKind.SolutionAttributes); + VerifyChecksumInService(snapshotService, solutionObject.Projects.Checksum, WellKnownSynchronizationKind.Projects); Assert.Equal(solutionObject.Projects.Count, 2); diff --git a/src/Workspaces/Remote/Core/Services/AssetService.cs b/src/Workspaces/Remote/Core/Services/AssetService.cs index fdb46cce105..05caaad9879 100644 --- a/src/Workspaces/Remote/Core/Services/AssetService.cs +++ b/src/Workspaces/Remote/Core/Services/AssetService.cs @@ -29,7 +29,7 @@ public AssetService(int sessionId, AssetStorage assetStorage) _assetStorage = assetStorage; } - public T Deserialize(WellKnownSynchronizationKinds kind, ObjectReader reader, CancellationToken cancellationToken) + public T Deserialize(WellKnownSynchronizationKind kind, ObjectReader reader, CancellationToken cancellationToken) { return s_serializer.Deserialize(kind, reader, cancellationToken); } diff --git a/src/Workspaces/Remote/ServiceHub/Services/SnapshotService.JsonRpcAssetSource.cs b/src/Workspaces/Remote/ServiceHub/Services/SnapshotService.JsonRpcAssetSource.cs index 391369afa7c..0ae446a02b5 100644 --- a/src/Workspaces/Remote/ServiceHub/Services/SnapshotService.JsonRpcAssetSource.cs +++ b/src/Workspaces/Remote/ServiceHub/Services/SnapshotService.JsonRpcAssetSource.cs @@ -73,7 +73,7 @@ private class JsonRpcAssetSource : AssetSource var responseChecksum = Checksum.ReadFrom(reader); Contract.ThrowIfFalse(checksums.Contains(responseChecksum)); - var kind = (WellKnownSynchronizationKinds)reader.ReadInt32(); + var kind = (WellKnownSynchronizationKind)reader.ReadInt32(); // in service hub, cancellation means simply closed stream var @object = _owner.RoslynServices.AssetService.Deserialize(kind, reader, cancellationToken); -- GitLab