fix bug in ref diagnostic being thrown

microsoft · Jan 25, 2021 · 31fe428 · 31fe428
1 parent 00da995
commit 31fe428
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/src/Authoring/WinRT.SourceGenerator/DiagnosticHelpers.cs b/src/Authoring/WinRT.SourceGenerator/DiagnosticHelpers.cs
@@ -193,7 +193,7 @@ private void ParameterHasAttributeErrors(MethodDeclarationSyntax method)
  // Nothing can be marked `ref`
  if (HasModifier(param, SyntaxKind.RefKeyword))
  {
- Report(WinRTRules.RefParameterFound, method.GetLocation(), param.Identifier); 
+ Report(WinRTRules.RefParameterFound, method.GetLocation(), method.Identifier, param.Identifier); 
  } 
 
  if (ParamHasInOrOutAttribute(param))

diff --git a/src/Authoring/WinRT.SourceGenerator/Generator.cs b/src/Authoring/WinRT.SourceGenerator/Generator.cs
@@ -78,12 +78,12 @@ private static string GetCsWinRTWindowsMetadata(GeneratorExecutionContext contex
  return cswinrtWindowsMetadata;
  }
 
- private static string GetCsWinRTDependentMetadata(GeneratorExecutionContext context)
- {
- context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.CsWinRTAuthoringInputs", out var winmds);
- return winmds;
- }
-
+ private static string GetCsWinRTDependentMetadata(GeneratorExecutionContext context)
+ {
+ context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.CsWinRTAuthoringInputs", out var winmds);
+ return winmds;
+ }
+
  private string GetTempFolder(bool clearSourceFilesFromFolder = false)
  {
  if(_tempFolder == null || !File.Exists(_tempFolder))
@@ -113,15 +113,15 @@ private void GenerateSources(GeneratorExecutionContext context)
  string winmdFile = GetWinmdOutputFile(context);
  string outputDir = GetTempFolder(true);
  string windowsMetadata = GetCsWinRTWindowsMetadata(context);
- string winmds = GetCsWinRTDependentMetadata(context);
-
- string arguments = string.Format(
- "-component -input \"{0}\" -input {1} -include {2} -output \"{3}\" -input {4} -verbose",
- winmdFile,
- windowsMetadata,
- assemblyName,
- outputDir,
- winmds);
+ string winmds = GetCsWinRTDependentMetadata(context);
+
+ string arguments = string.Format(
+ "-component -input \"{0}\" -input {1} -include {2} -output \"{3}\" -input {4} -verbose",
+ winmdFile,
+ windowsMetadata,
+ assemblyName,
+ outputDir,
+ winmds);
  Logger.Log("Running " + cswinrtExe + " " + arguments);
 
  var processInfo = new ProcessStartInfo
@@ -201,7 +201,7 @@ public void Execute(GeneratorExecutionContext context)
  {
  return;
  }
-
+ 
  Logger.Initialize(context);
 
 

diff --git a/src/Authoring/WinRT.SourceGenerator/WinRTRules.cs b/src/Authoring/WinRT.SourceGenerator/WinRTRules.cs
@@ -56,9 +56,9 @@ private static DiagnosticDescriptor MakeRule(string id, string title, string mes
  public static DiagnosticDescriptor UnsupportedTypeRule = MakeRule(
  "CsWinRT1006",
  "Exposing unsupported type",
- "The member '{0}' has the type '{1}' in its signature. The type '{1}' is not a valid Windows Runtime type\n" 
- + "Yet, the type (or its generic parameters) implement interfaces that are valid Windows Runtime types\n" 
- + "Consider changing the type '{1} in the member signature to one of the following types from System.Collections.Generic:\n{2}");
+ "The member '{0}' has the type '{1}' in its signature. The type '{1}' is not a valid Windows Runtime type. " 
+ + "Yet, the type (or its generic parameters) implement interfaces that are valid Windows Runtime types. " 
+ + "Consider changing the type '{1} in the member signature to one of the following types from System.Collections.Generic: {2}.");
 
  public static DiagnosticDescriptor StructWithNoFieldsRule = MakeRule(
  "CsWinRT1007",