Merge branch 'fbp-features-dll' into fbp-live-directive-diagnostics

Author: RikkiGibson

src/EditorFeatures/CSharpTest/Completion/CompletionProviders/AppDirectiveCompletionProviderTests.cs

@@ -51,6 +51,8 @@ internal override Type GetCompletionProviderType()
 
 public abstract class AbstractAppDirectiveCompletionProviderTests : AbstractCSharpCompletionProviderTests
 {
+    /// <summary>The directive kind. For example, `package` in `#:package MyNugetPackage@Version`.</summary>
+    /// <remarks>Term defined in feature doc: https://github.com/dotnet/sdk/blob/main/documentation/general/dotnet-run-file.md#directives-for-project-metadata</remarks>
     protected abstract string DirectiveKind { get; }
 
     protected static string GetMarkup(string code, string features = "FileBasedProgram=true") => $$"""

src/EditorFeatures/CSharpTest/Completion/CompletionProviders/CompletionProviderOrderTests.cs

@@ -74,7 +74,7 @@ public void TestCompletionProviderOrder()
             // File-based programs providers
             typeof(SdkAppDirectiveCompletionProvider),
             typeof(PropertyAppDirectiveCompletionProvider),
-            typeof(PropertyAppDirectiveCompletionProvider),
+            typeof(PackageAppDirectiveCompletionProvider),
             typeof(ProjectAppDirectiveCompletionProvider),
 
             // Marker for end of built-in completion providers

src/Features/CSharp/Portable/CSharpFeaturesResources.resx

@@ -593,13 +593,17 @@
   </data>
   <data name="Build_property_name" xml:space="preserve">
     <value>Name</value>
-    <comment>'Name' is a placeholder for a property, package, sdk name in a directive like '#:property Name=Value'.</comment>
+    <comment>'Name' is a placeholder for a property name in a directive like '#:property Name=Value'.</comment>
+  </data>
+  <data name="Package_name" xml:space="preserve">
+    <value>Name</value>
+    <comment>'Name' is a placeholder for a package or sdk name in a directive like '#:package Name@Version'.</comment>
   </data>
   <data name="Package_version" xml:space="preserve">
     <value>Version</value>
     <comment>'Version' is a placeholder for a package or sdk version in a directive like '#:package Name@Version'.</comment>
   </data>
-  <data name="File_path" xml:space="preserve">
+  <data name="Project_directive_file_path" xml:space="preserve">
     <value>path</value>
     <comment>'path' is a placeholder for a project file or directory path in a directive like '#:project path'.</comment>
   </data>

src/Features/CSharp/Portable/Completion/CompletionProviders/FileBasedPrograms/AbstractAppDirectiveCompletionProvider.cs

@@ -27,6 +27,8 @@ namespace Microsoft.CodeAnalysis.CSharp.Completion.Providers;
 /// </summary>
 internal abstract class AbstractAppDirectiveCompletionProvider : LSPCompletionProvider
 {
+    /// <summary>The directive kind. For example, `package` in `#:package MyNugetPackage@Version`.</summary>
+    /// <remarks>Term defined in feature doc: https://github.com/dotnet/sdk/blob/main/documentation/general/dotnet-run-file.md#directives-for-project-metadata</remarks>
     protected abstract string DirectiveKind { get; }
 
     public sealed override bool IsInsertionTrigger(SourceText text, int characterPosition, CompletionOptions options)

src/Features/CSharp/Portable/Completion/CompletionProviders/FileBasedPrograms/PackageAppDirectiveCompletionProvider.cs

@@ -32,7 +32,7 @@ protected sealed override void AddDirectiveKindCompletion(CompletionContext cont
             description: [
                 new(SymbolDisplayPartKind.Keyword, symbol: null, "#:package"),
                 new(SymbolDisplayPartKind.Space, symbol: null, " "),
-                new(SymbolDisplayPartKind.StringLiteral, symbol: null, CSharpFeaturesResources.Build_property_name),
+                new(SymbolDisplayPartKind.StringLiteral, symbol: null, CSharpFeaturesResources.Package_name),
                 new(SymbolDisplayPartKind.StringLiteral, symbol: null, "@"),
                 new(SymbolDisplayPartKind.StringLiteral, symbol: null, CSharpFeaturesResources.Package_version),
                 new(SymbolDisplayPartKind.LineBreak, symbol: null, ""),

src/Features/CSharp/Portable/Completion/CompletionProviders/FileBasedPrograms/ProjectAppDirectiveCompletionProvider.cs

@@ -32,7 +32,7 @@ protected sealed override void AddDirectiveKindCompletion(CompletionContext cont
             description: [
                 new(SymbolDisplayPartKind.Keyword, symbol: null, "#:project"),
                 new(SymbolDisplayPartKind.Space, symbol: null, " "),
-                new(SymbolDisplayPartKind.StringLiteral, symbol: null, CSharpFeaturesResources.File_path),
+                new(SymbolDisplayPartKind.StringLiteral, symbol: null, CSharpFeaturesResources.Project_directive_file_path),
                 new(SymbolDisplayPartKind.LineBreak, symbol: null, ""),
                 new(SymbolDisplayPartKind.Text, symbol: null, CSharpFeaturesResources.Adds_a_project_reference),
                 ]));

src/Features/CSharp/Portable/Completion/CompletionProviders/FileBasedPrograms/SdkAppDirectiveCompletionProvider.cs

@@ -32,7 +32,7 @@ protected sealed override void AddDirectiveKindCompletion(CompletionContext cont
             description: [
                 new(SymbolDisplayPartKind.Keyword, symbol: null, "#:sdk"),
                 new(SymbolDisplayPartKind.Space, symbol: null, " "),
-                new(SymbolDisplayPartKind.StringLiteral, symbol: null, CSharpFeaturesResources.Build_property_name),
+                new(SymbolDisplayPartKind.StringLiteral, symbol: null, CSharpFeaturesResources.Package_name),
                 new(SymbolDisplayPartKind.StringLiteral, symbol: null, "@"),
                 new(SymbolDisplayPartKind.StringLiteral, symbol: null, CSharpFeaturesResources.Package_version),
                 new(SymbolDisplayPartKind.LineBreak, symbol: null, ""),