Skip to content

Initial stab at F# attribute generation for CoreCLR #2058

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
baronfel wants to merge 1 commit into from
Closed

Initial stab at F# attribute generation for CoreCLR #2058

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 39 additions & 14 deletions src/Tasks/WriteCodeFragment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public ITaskItem OutputDirectory
/// The path to the file that was generated.
/// If this is set, and a file name, the destination folder will be prepended.
/// If this is set, and is rooted, the destination folder will be ignored.
/// If this is not set, the destination folder will be used, an arbitrary file name will be used, and
/// If this is not set, the destination folder will be used, an arbitrary file name will be used, and
/// the default extension for the language selected.
/// </summary>
[Output]
Expand Down Expand Up @@ -292,7 +292,7 @@ private string GenerateCodeCoreClr(out string extension)
switch (Language.ToLowerInvariant())
{
case "c#":
if (AssemblyAttributes == null) return string.Empty;
if (AssemblyAttributes == null) return string.Empty;

extension = "cs";
code.AppendLine("// " + ResourceUtilities.FormatResourceString("WriteCodeFragment.Comment"));
Expand Down Expand Up @@ -334,14 +334,35 @@ private string GenerateCodeCoreClr(out string extension)
haveGeneratedContent = true;
}
break;
case "f#":
case "fsharp":
if (AssemblyAttributes == null) return string.Empty;

extension = "fs";
code.AppendLine("// " + ResourceUtilities.FormatResourceString("WriteCodeFragment.Comment"));
code.AppendLine();
code.AppendLine("using System;");
code.AppendLine("using System.Reflection;");
code.AppendLine();

foreach (ITaskItem attributeItem in AssemblyAttributes)
{
string args = GetAttributeArguments(attributeItem, "=", QuoteSnippetStringFSharp);
if (args == null) return null;

code.AppendLine(string.Format($"[<assembly: {attributeItem.ItemSpec}({args})>]"));
haveGeneratedContent = true;
}
code.Append("do()");
break;
default:
Log.LogErrorWithCodeFromResources("WriteCodeFragment.CouldNotCreateProvider", Language, string.Empty);
return null;
}

// If we just generated infrastructure, don't bother returning anything
// as there's no point writing the file
return haveGeneratedContent ? code.ToString() : string.Empty;
return haveGeneratedContent ? code.ToString() : string.Empty;
}

private string GetAttributeArguments(ITaskItem attributeItem, string namedArgumentString, Func<string, string> quoteString)
Expand All @@ -350,7 +371,7 @@ private string GetAttributeArguments(ITaskItem attributeItem, string namedArgume
// To set those, use metadata names like "_Parameter1", "_Parameter2" etc.
// If a parameter index is skipped, it's an error.
IDictionary customMetadata = attributeItem.CloneCustomMetadata();

// Initialize count + 1 to access starting at 1
List<string> orderedParameters = new List<string>(new string[customMetadata.Count + 1]);
List<string> namedParameters = new List<string>();
Expand Down Expand Up @@ -386,7 +407,7 @@ private string GetAttributeArguments(ITaskItem attributeItem, string namedArgume
}

bool encounteredNull = false;

for (int i = 0; i < orderedParameters.Count; i++)
{
if (orderedParameters[i] == null)
Expand Down Expand Up @@ -467,11 +488,11 @@ private string QuoteSnippetStringCStyle(string value)
if (i > 0 && i%MaxLineLength == 0)
{
//
// If current character is a high surrogate and the following
// character is a low surrogate, don't break them.
// Otherwise when we write the string to a file, we might lose
// If current character is a high surrogate and the following
// character is a low surrogate, don't break them.
// Otherwise when we write the string to a file, we might lose
// the characters.
//
//
if (Char.IsHighSurrogate(value[i])
&& (i < value.Length - 1)
&& Char.IsLowSurrogate(value[i + 1]))
Expand Down Expand Up @@ -527,7 +548,7 @@ private string QuoteSnippetStringVisualBasic(string value)
switch (ch)
{
case '\"':
// These are the inward sloping quotes used by default in some cultures like CHS.
// These are the inward sloping quotes used by default in some cultures like CHS.
// VBC.EXE does a mapping ANSI that results in it treating these as syntactically equivalent to a
// regular double quote.
case '\u201C':
Expand Down Expand Up @@ -572,11 +593,11 @@ private string QuoteSnippetStringVisualBasic(string value)
if (i > 0 && i%MaxLineLength == 0)
{
//
// If current character is a high surrogate and the following
// character is a low surrogate, don't break them.
// Otherwise when we write the string to a file, we might lose
// If current character is a high surrogate and the following
// character is a low surrogate, don't break them.
// Otherwise when we write the string to a file, we might lose
// the characters.
//
//
if (Char.IsHighSurrogate(value[i])
&& (i < value.Length - 1)
&& Char.IsLowSurrogate(value[i + 1]))
Expand All @@ -601,6 +622,10 @@ private string QuoteSnippetStringVisualBasic(string value)
return b.ToString();
}

private string QuoteSnippetStringFSharp(string value) {
return QuoteSnippetStringCSharp(value);
}

private void EnsureNotInDoubleQuotes(ref bool fInDoubleQuotes, StringBuilder b)
{
if (!fInDoubleQuotes) return;
Expand Down