Skip to content

Refactor translator APIs #5223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dsplaisted wants to merge 4 commits into from
Closed

Refactor translator APIs #5223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9eb662e
Refactor translator APIs
dsplaisted Apr 1, 2020
3d7b414
Fix nullable translation
dsplaisted Apr 3, 2020
629053f
Simplify TranslatorHelpers
dsplaisted Apr 6, 2020
6c625c7
Merge branch 'master' into refactor-translation
Forgind Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Build.UnitTests/Collections/OMcollections_tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
using Shouldly;
using ObjectModel = System.Collections.ObjectModel;
using Xunit;
using Microsoft.Build.BackEnd;

namespace Microsoft.Build.UnitTests.OM.Collections
{
Expand Down
1 change: 1 addition & 0 deletions src/Build.UnitTests/Construction/ElementLocation_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using System.Reflection;
using Xunit;
using System.Text;
using Microsoft.Build.BackEnd;

namespace Microsoft.Build.UnitTests.Construction
{
Expand Down
1 change: 1 addition & 0 deletions src/Build.UnitTests/Instance/ProjectMetadataInstance_Internal_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Microsoft.Build.Construction;
using Microsoft.Build.UnitTests.BackEnd;
using Xunit;
using Microsoft.Build.BackEnd;

namespace Microsoft.Build.UnitTests.OM.Instance
{
Expand Down
1 change: 1 addition & 0 deletions src/Build.UnitTests/Instance/ProjectPropertyInstance_Internal_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using Microsoft.Build.Construction;
using Microsoft.Build.UnitTests.BackEnd;
using Xunit;
using Microsoft.Build.BackEnd;

namespace Microsoft.Build.UnitTests.OM.Instance
{
Expand Down
1 change: 1 addition & 0 deletions src/Build.UnitTests/Instance/TaskItem_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using Microsoft.Build.Framework;
using System.IO;
using Xunit;
using Microsoft.Build.BackEnd;

namespace Microsoft.Build.UnitTests.OM.Instance
{
Expand Down
4 changes: 2 additions & 2 deletions src/Build/BackEnd/BuildManager/RequestedProjectState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ private static IDictionary<string, List<string>> CreateItemMetadataDictionary(in
return new Dictionary<string, List<string>>(capacity, StringComparer.OrdinalIgnoreCase);
}

private static void TranslateMetadataForItem(ref List<string> list, ITranslator translator)
private static void TranslateMetadataForItem(ITranslator translator, ref List<string> list)
{
translator.Translate(ref list);
}

private static void TranslateString(ref string s, ITranslator translator)
private static void TranslateString(ITranslator translator, ref string s)
{
translator.Translate(ref s);
}
Expand Down
8 changes: 4 additions & 4 deletions src/Build/BackEnd/Components/Caching/ConfigCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ public void Translate(ITranslator translator)
{
translator.TranslateDictionary(
ref _configurations,
(ref int configId, ITranslator aTranslator) => aTranslator.Translate(ref configId),
(ref BuildRequestConfiguration configuration, ITranslator aTranslator) =>
(ITranslator aTranslator, ref int configId) => aTranslator.Translate(ref configId),
(ITranslator aTranslator, ref BuildRequestConfiguration configuration) =>
{
if (translator.Mode == TranslationDirection.WriteToStream)
{
Expand All @@ -365,8 +365,8 @@ public void Translate(ITranslator translator)

translator.TranslateDictionary(
ref _configurationIdsByMetadata,
(ref ConfigurationMetadata configMetadata, ITranslator aTranslator) => aTranslator.Translate(ref configMetadata, ConfigurationMetadata.FactoryForDeserialization),
(ref int configId, ITranslator aTranslator) => aTranslator.Translate(ref configId),
(ITranslator aTranslator, ref ConfigurationMetadata configMetadata) => aTranslator.Translate(ref configMetadata, ConfigurationMetadata.FactoryForDeserialization),
(ITranslator aTranslator, ref int configId) => aTranslator.Translate(ref configId),
capacity => new Dictionary<ConfigurationMetadata, int>(capacity));
}

Expand Down
4 changes: 2 additions & 2 deletions src/Build/BackEnd/Components/Caching/ResultsCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ public void Translate(ITranslator translator)

translator.TranslateDictionary(
ref localReference,
(ref int i, ITranslator aTranslator) => aTranslator.Translate(ref i),
(ref BuildResult result, ITranslator aTranslator) => aTranslator.Translate(ref result),
(ITranslator aTranslator, ref int i) => aTranslator.Translate(ref i),
(ITranslator aTranslator, ref BuildResult result) => aTranslator.Translate(ref result),
capacity => new ConcurrentDictionary<int, BuildResult>(Environment.ProcessorCount, capacity));

if (translator.Mode == TranslationDirection.ReadFromStream)
Expand Down
4 changes: 2 additions & 2 deletions src/Build/Instance/ProjectInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2045,13 +2045,13 @@ private void TranslateTargets(ITranslator translator)
}

// todo move to nested function after c#7
private static void TranslatorForTargetSpecificDictionaryKey(ref string key, ITranslator translator)
private static void TranslatorForTargetSpecificDictionaryKey(ITranslator translator, ref string key)
{
translator.Translate(ref key);
}

// todo move to nested function after c#7
private static void TranslatorForTargetSpecificDictionaryValue(ref List<TargetSpecification> value, ITranslator translator)
private static void TranslatorForTargetSpecificDictionaryValue(ITranslator translator, ref List<TargetSpecification> value)
{
translator.Translate(ref value, TargetSpecification.FactoryForDeserialization);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Build/Instance/ProjectTaskInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,12 +390,12 @@ void ITranslatable.Translate(ITranslator translator)
}
}

private static void ParametersKeyTranslator(ref string key, ITranslator translator)
private static void ParametersKeyTranslator(ITranslator translator, ref string key)
{
translator.Translate(ref key);
}

private static void ParametersValueTranslator(ref (string, ElementLocation) value, ITranslator translator)
private static void ParametersValueTranslator(ITranslator translator, ref (string, ElementLocation) value)
{
if (translator.Mode == TranslationDirection.WriteToStream)
{
Expand Down
8 changes: 4 additions & 4 deletions src/Build/Instance/TaskRegistry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1707,13 +1707,13 @@ public void Translate(ITranslator translator)
}

// todo move to nested function after C# 7
private static void TranslatorForTaskParametersKey(ref string key, ITranslator translator)
private static void TranslatorForTaskParametersKey(ITranslator translator, ref string key)
{
translator.Translate(ref key);
}

// todo move to nested function after C# 7
private static void TranslatorForTaskParameterValue(ref TaskPropertyInfo taskPropertyInfo, ITranslator translator)
private static void TranslatorForTaskParameterValue(ITranslator translator, ref TaskPropertyInfo taskPropertyInfo)
{
string name = null;
string propertyTypeName = null;
Expand Down Expand Up @@ -1783,13 +1783,13 @@ public void Translate(ITranslator translator)
}

//todo make nested after C# 7
void TranslateTaskRegistrationKey(ref RegisteredTaskIdentity taskIdentity, ITranslator translator)
void TranslateTaskRegistrationKey(ITranslator translator, ref RegisteredTaskIdentity taskIdentity)
{
translator.Translate(ref taskIdentity);
}

//todo make nested after C# 7
void TranslateTaskRegistrationValue(ref List<RegisteredTaskRecord> taskRecords, ITranslator translator)
void TranslateTaskRegistrationValue(ITranslator translator, ref List<RegisteredTaskRecord> taskRecords)
{
translator.Translate(ref taskRecords, RegisteredTaskRecord.FactoryForDeserialization);
}
Expand Down
1 change: 1 addition & 0 deletions src/Build/Microsoft.Build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
</Compile>
<Compile Include="..\Shared\TaskParameter.cs" />
<Compile Include="..\Shared\TaskParameterTypeVerifier.cs" />
<Compile Include="..\Shared\TranslatorHelpers.cs" />
<Compile Include="..\Shared\CommunicationsUtilities.cs" />
<Compile Include="..\Shared\InterningBinaryReader.cs" />
<Compile Include="..\Shared\TaskEngineAssemblyResolver.cs">
Expand Down
1 change: 1 addition & 0 deletions src/MSBuild/MSBuild.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
<Compile Include="..\Shared\INodePacketHandler.cs" />
<Compile Include="..\Shared\ITranslatable.cs" />
<Compile Include="..\Shared\ITranslator.cs" />
<Compile Include="..\Shared\TranslatorHelpers.cs" />
<Compile Include="..\Shared\BinaryTranslator.cs" />
<Compile Include="..\Shared\CommunicationsUtilities.cs" />
<Compile Include="..\Shared\InterningBinaryReader.cs" />
Expand Down
1 change: 1 addition & 0 deletions src/MSBuildTaskHost/MSBuildTaskHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
<Compile Include="..\Shared\ITranslator.cs">
<Link>ITranslator.cs</Link>
</Compile>
<Compile Include="..\Shared\TranslatorHelpers.cs" />
<Compile Include="..\Shared\InternalErrorException.cs">
<Link>InternalErrorException.cs</Link>
</Compile>
Expand Down
Loading