提交 51de32fb 编写于 作者: C CyrusNajmabadi

Rename parameter.

上级 c0adc624
......@@ -161,7 +161,7 @@ private static Metadata GetMetadataNoThrow(PortableExecutableReference reference
loadOnly,
createAsync: () => CreateMetadataSymbolTreeInfoAsync(solution, checksum, reference, cancellationToken),
keySuffix: "_Metadata_" + filePath,
readObject: reader => ReadSymbolTreeInfo(reader, (names, nodes) => GetSpellCheckerTask(solution, checksum, filePath, names, nodes)),
tryReadObject: reader => TryReadSymbolTreeInfo(reader, (names, nodes) => GetSpellCheckerTask(solution, checksum, filePath, names, nodes)),
cancellationToken: cancellationToken);
Contract.ThrowIfFalse(result != null || loadOnly == true, "Result can only be null if 'loadOnly: true' was passed.");
return result;
......
......@@ -36,7 +36,7 @@ internal partial class SymbolTreeInfo : IObjectWritable
loadOnly: false,
createAsync: () => CreateSpellCheckerAsync(checksum, concatenatedNames, sortedNodes),
keySuffix: "_SpellChecker_" + filePath,
readObject: SpellChecker.ReadFrom,
tryReadObject: SpellChecker.TryReadFrom,
cancellationToken: CancellationToken.None);
Contract.ThrowIfNull(result, "Result should never be null as we passed 'loadOnly: false'.");
return result;
......@@ -52,7 +52,7 @@ internal partial class SymbolTreeInfo : IObjectWritable
bool loadOnly,
Func<Task<T>> createAsync,
string keySuffix,
Func<ObjectReader, T> readObject,
Func<ObjectReader, T> tryReadObject,
CancellationToken cancellationToken) where T : class, IObjectWritable, IChecksummedObject
{
if (checksum == null)
......@@ -76,8 +76,8 @@ internal partial class SymbolTreeInfo : IObjectWritable
// We have some previously persisted data. Attempt to read it back.
// If we're able to, and the version of the persisted data matches
// our version, then we can reuse this instance.
result = readObject(reader);
if (result != null && checksum == result.Checksum)
result = tryReadObject(reader);
if (result?.Checksum == result.Checksum)
{
return result;
}
......@@ -142,12 +142,12 @@ public void WriteTo(ObjectWriter writer)
internal static SymbolTreeInfo ReadSymbolTreeInfo_ForTestingPurposesOnly(
ObjectReader reader, Checksum checksum)
{
return ReadSymbolTreeInfo(reader,
return TryReadSymbolTreeInfo(reader,
(names, nodes) => Task.FromResult(
new SpellChecker(checksum, nodes.Select(n => new StringSlice(names, n.NameSpan)))));
}
private static SymbolTreeInfo ReadSymbolTreeInfo(
private static SymbolTreeInfo TryReadSymbolTreeInfo(
ObjectReader reader,
Func<string, Node[], Task<SpellChecker>> createSpellCheckerTask)
{
......
......@@ -35,7 +35,7 @@ private static void FreeSymbolMap(MultiDictionary<string, ISymbol> symbolMap)
loadOnly: false,
createAsync: () => CreateSourceSymbolTreeInfoAsync(project, checksum, cancellationToken),
keySuffix: "_Source_" + project.FilePath,
readObject: reader => ReadSymbolTreeInfo(reader, (names, nodes) => GetSpellCheckerTask(project.Solution, checksum, project.FilePath, names, nodes)),
tryReadObject: reader => TryReadSymbolTreeInfo(reader, (names, nodes) => GetSpellCheckerTask(project.Solution, checksum, project.FilePath, names, nodes)),
cancellationToken: cancellationToken);
Contract.ThrowIfNull(result, "Result should never be null as we passed 'loadOnly: false'.");
return result;
......
......@@ -49,7 +49,7 @@ void IObjectWritable.WriteTo(ObjectWriter writer)
_bkTree.WriteTo(writer);
}
internal static SpellChecker ReadFrom(ObjectReader reader)
internal static SpellChecker TryReadFrom(ObjectReader reader)
{
try
{
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册