From 66b2ea14496e5064f6cb53fd63aea807abde6826 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 2 Jul 2025 14:26:28 +0000 Subject: [PATCH 1/3] Initial plan From 05c81dfeaead009968312f69d20acca557b080f5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 3 Jul 2025 13:59:18 +0000 Subject: [PATCH 2/3] Add F1 keywords for enum, in, new, out, ref, and this tokens Co-authored-by: BillWagner <493969+BillWagner@users.noreply.github.com> --- docs/csharp/language-reference/builtin-types/enum.md | 1 + .../csharp/language-reference/builtin-types/ref-struct.md | 6 ++++++ docs/csharp/language-reference/keywords/extension.md | 4 ++++ docs/csharp/language-reference/keywords/from-clause.md | 1 + .../language-reference/keywords/in-generic-modifier.md | 4 ++++ docs/csharp/language-reference/keywords/join-clause.md | 1 + .../language-reference/keywords/method-parameters.md | 8 ++++++++ docs/csharp/language-reference/keywords/new-constraint.md | 4 ++++ docs/csharp/language-reference/keywords/new-modifier.md | 4 ++++ .../language-reference/keywords/out-generic-modifier.md | 4 ++++ 10 files changed, 37 insertions(+) diff --git a/docs/csharp/language-reference/builtin-types/enum.md b/docs/csharp/language-reference/builtin-types/enum.md index 2fb7ebfa3eea2..0fd026d47aae1 100644 --- a/docs/csharp/language-reference/builtin-types/enum.md +++ b/docs/csharp/language-reference/builtin-types/enum.md @@ -5,6 +5,7 @@ ms.date: 12/13/2019 f1_keywords: - "enum" - "enum_CSharpKeyword" + - "enumconstraint" helpviewer_keywords: - "enum keyword [C#]" - "enum type [C#]" diff --git a/docs/csharp/language-reference/builtin-types/ref-struct.md b/docs/csharp/language-reference/builtin-types/ref-struct.md index bdb072b47737e..7f8e1be6093a1 100644 --- a/docs/csharp/language-reference/builtin-types/ref-struct.md +++ b/docs/csharp/language-reference/builtin-types/ref-struct.md @@ -2,6 +2,12 @@ title: "ref struct types" description: Learn about the ref struct type in C# ms.date: 01/27/2025 +f1_keywords: + - "refstruct" + - "refstruct_CSharpKeyword" + - "ref_CSharpKeyword" +helpviewer_keywords: + - "ref struct [C#]" --- # `ref` structure types (C# reference) diff --git a/docs/csharp/language-reference/keywords/extension.md b/docs/csharp/language-reference/keywords/extension.md index a743f23b6b990..6fd2ef78ea522 100644 --- a/docs/csharp/language-reference/keywords/extension.md +++ b/docs/csharp/language-reference/keywords/extension.md @@ -5,6 +5,10 @@ ms.date: 04/17/2025 f1_keywords: - "extension_CSharpKeyword" - "extension" + - "this_CSharpKeyword" +helpviewer_keywords: + - "extension methods [C#]" + - "this parameter modifier [C#]" --- # Extension declaration (C# Reference) diff --git a/docs/csharp/language-reference/keywords/from-clause.md b/docs/csharp/language-reference/keywords/from-clause.md index c65aeb5c7480e..a5f986f327079 100644 --- a/docs/csharp/language-reference/keywords/from-clause.md +++ b/docs/csharp/language-reference/keywords/from-clause.md @@ -5,6 +5,7 @@ ms.date: 07/20/2015 f1_keywords: - "from_CSharpKeyword" - "from" + - "in_CSharpKeyword" helpviewer_keywords: - "from clause [C#]" - "from keyword [C#]" diff --git a/docs/csharp/language-reference/keywords/in-generic-modifier.md b/docs/csharp/language-reference/keywords/in-generic-modifier.md index 656c395785123..0a47750682362 100644 --- a/docs/csharp/language-reference/keywords/in-generic-modifier.md +++ b/docs/csharp/language-reference/keywords/in-generic-modifier.md @@ -2,6 +2,10 @@ description: "in (Generic Modifier) - C# Reference" title: "in (Generic Modifier)" ms.date: 07/20/2015 +f1_keywords: + - "ingenericmodifier" + - "ingenericmodifier_CSharpKeyword" + - "in_CSharpKeyword" helpviewer_keywords: - "contravariance, in keyword [C#]" - "in keyword [C#]" diff --git a/docs/csharp/language-reference/keywords/join-clause.md b/docs/csharp/language-reference/keywords/join-clause.md index fc0433d3f96e8..618fa1075e140 100644 --- a/docs/csharp/language-reference/keywords/join-clause.md +++ b/docs/csharp/language-reference/keywords/join-clause.md @@ -5,6 +5,7 @@ ms.date: 07/20/2015 f1_keywords: - "join" - "join_CSharpKeyword" + - "in_CSharpKeyword" helpviewer_keywords: - "join clause [C#]" - "join keyword [C#]" diff --git a/docs/csharp/language-reference/keywords/method-parameters.md b/docs/csharp/language-reference/keywords/method-parameters.md index 187d2c450bb57..3e1757fd27758 100644 --- a/docs/csharp/language-reference/keywords/method-parameters.md +++ b/docs/csharp/language-reference/keywords/method-parameters.md @@ -2,6 +2,14 @@ title: "Method parameters and modifiers" description: "Parameter modifiers enable pass-by-reference semantics, with distinctions for read-only, and `out` parameters. The `params` modifier allows optional arguments." ms.date: 11/19/2024 +f1_keywords: + - "in_CSharpKeyword" + - "out_CSharpKeyword" + - "ref_CSharpKeyword" + - "params_CSharpKeyword" + - "inparametermodifier" + - "outparametermodifier" + - "refparametermodifier" helpviewer_keywords: - "methods [C#], parameters" - "method parameters [C#]" diff --git a/docs/csharp/language-reference/keywords/new-constraint.md b/docs/csharp/language-reference/keywords/new-constraint.md index b7824b7ab4ab5..fe9d2377d9908 100644 --- a/docs/csharp/language-reference/keywords/new-constraint.md +++ b/docs/csharp/language-reference/keywords/new-constraint.md @@ -2,6 +2,10 @@ description: "new constraint - C# Reference" title: "new constraint" ms.date: 07/20/2015 +f1_keywords: + - "newconstraint" + - "newconstraint_CSharpKeyword" + - "new_CSharpKeyword" helpviewer_keywords: - "new constraint keyword [C#]" ms.assetid: 58850b64-cb97-4136-be50-1f3bc7fc1da9 diff --git a/docs/csharp/language-reference/keywords/new-modifier.md b/docs/csharp/language-reference/keywords/new-modifier.md index 13ad27d9e7214..1a116f66c0d0d 100644 --- a/docs/csharp/language-reference/keywords/new-modifier.md +++ b/docs/csharp/language-reference/keywords/new-modifier.md @@ -2,6 +2,10 @@ description: "new modifier - C# Reference" title: "new modifier" ms.date: 07/20/2015 +f1_keywords: + - "newmodifier" + - "newmodifier_CSharpKeyword" + - "new_CSharpKeyword" helpviewer_keywords: - "new modifier keyword [C#]" ms.assetid: a2e20856-33b9-4620-b535-a60dbce8349b diff --git a/docs/csharp/language-reference/keywords/out-generic-modifier.md b/docs/csharp/language-reference/keywords/out-generic-modifier.md index 580d58ce3db60..d1d3d24582759 100644 --- a/docs/csharp/language-reference/keywords/out-generic-modifier.md +++ b/docs/csharp/language-reference/keywords/out-generic-modifier.md @@ -2,6 +2,10 @@ description: "out keyword (generic modifier) - C# Reference" title: "out keyword (generic modifier)" ms.date: 07/20/2015 +f1_keywords: + - "outgenericmodifier" + - "outgenericmodifier_CSharpKeyword" + - "out_CSharpKeyword" helpviewer_keywords: - "covariance, out keyword [C#]" - "out keyword [C#]" From 60776753eb7463b03e3b31dbc405b1ade60759c7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 3 Jul 2025 15:54:35 +0000 Subject: [PATCH 3/3] Remove conflicting F1 keywords from specific usage files Co-authored-by: BillWagner <493969+BillWagner@users.noreply.github.com> --- docs/csharp/language-reference/builtin-types/ref-struct.md | 1 - docs/csharp/language-reference/keywords/extension.md | 1 - docs/csharp/language-reference/keywords/from-clause.md | 1 - docs/csharp/language-reference/keywords/in-generic-modifier.md | 1 - docs/csharp/language-reference/keywords/join-clause.md | 1 - docs/csharp/language-reference/keywords/method-parameters.md | 3 --- docs/csharp/language-reference/keywords/new-constraint.md | 1 - docs/csharp/language-reference/keywords/new-modifier.md | 1 - .../csharp/language-reference/keywords/out-generic-modifier.md | 3 +-- 9 files changed, 1 insertion(+), 12 deletions(-) diff --git a/docs/csharp/language-reference/builtin-types/ref-struct.md b/docs/csharp/language-reference/builtin-types/ref-struct.md index 7f8e1be6093a1..038ad47a7544e 100644 --- a/docs/csharp/language-reference/builtin-types/ref-struct.md +++ b/docs/csharp/language-reference/builtin-types/ref-struct.md @@ -5,7 +5,6 @@ ms.date: 01/27/2025 f1_keywords: - "refstruct" - "refstruct_CSharpKeyword" - - "ref_CSharpKeyword" helpviewer_keywords: - "ref struct [C#]" --- diff --git a/docs/csharp/language-reference/keywords/extension.md b/docs/csharp/language-reference/keywords/extension.md index 6fd2ef78ea522..05ca6c04cae09 100644 --- a/docs/csharp/language-reference/keywords/extension.md +++ b/docs/csharp/language-reference/keywords/extension.md @@ -5,7 +5,6 @@ ms.date: 04/17/2025 f1_keywords: - "extension_CSharpKeyword" - "extension" - - "this_CSharpKeyword" helpviewer_keywords: - "extension methods [C#]" - "this parameter modifier [C#]" diff --git a/docs/csharp/language-reference/keywords/from-clause.md b/docs/csharp/language-reference/keywords/from-clause.md index a5f986f327079..c65aeb5c7480e 100644 --- a/docs/csharp/language-reference/keywords/from-clause.md +++ b/docs/csharp/language-reference/keywords/from-clause.md @@ -5,7 +5,6 @@ ms.date: 07/20/2015 f1_keywords: - "from_CSharpKeyword" - "from" - - "in_CSharpKeyword" helpviewer_keywords: - "from clause [C#]" - "from keyword [C#]" diff --git a/docs/csharp/language-reference/keywords/in-generic-modifier.md b/docs/csharp/language-reference/keywords/in-generic-modifier.md index 0a47750682362..4865c1686c51e 100644 --- a/docs/csharp/language-reference/keywords/in-generic-modifier.md +++ b/docs/csharp/language-reference/keywords/in-generic-modifier.md @@ -5,7 +5,6 @@ ms.date: 07/20/2015 f1_keywords: - "ingenericmodifier" - "ingenericmodifier_CSharpKeyword" - - "in_CSharpKeyword" helpviewer_keywords: - "contravariance, in keyword [C#]" - "in keyword [C#]" diff --git a/docs/csharp/language-reference/keywords/join-clause.md b/docs/csharp/language-reference/keywords/join-clause.md index 618fa1075e140..fc0433d3f96e8 100644 --- a/docs/csharp/language-reference/keywords/join-clause.md +++ b/docs/csharp/language-reference/keywords/join-clause.md @@ -5,7 +5,6 @@ ms.date: 07/20/2015 f1_keywords: - "join" - "join_CSharpKeyword" - - "in_CSharpKeyword" helpviewer_keywords: - "join clause [C#]" - "join keyword [C#]" diff --git a/docs/csharp/language-reference/keywords/method-parameters.md b/docs/csharp/language-reference/keywords/method-parameters.md index 3e1757fd27758..0fa47a91c6440 100644 --- a/docs/csharp/language-reference/keywords/method-parameters.md +++ b/docs/csharp/language-reference/keywords/method-parameters.md @@ -3,9 +3,6 @@ title: "Method parameters and modifiers" description: "Parameter modifiers enable pass-by-reference semantics, with distinctions for read-only, and `out` parameters. The `params` modifier allows optional arguments." ms.date: 11/19/2024 f1_keywords: - - "in_CSharpKeyword" - - "out_CSharpKeyword" - - "ref_CSharpKeyword" - "params_CSharpKeyword" - "inparametermodifier" - "outparametermodifier" diff --git a/docs/csharp/language-reference/keywords/new-constraint.md b/docs/csharp/language-reference/keywords/new-constraint.md index fe9d2377d9908..cc1d336fa4194 100644 --- a/docs/csharp/language-reference/keywords/new-constraint.md +++ b/docs/csharp/language-reference/keywords/new-constraint.md @@ -5,7 +5,6 @@ ms.date: 07/20/2015 f1_keywords: - "newconstraint" - "newconstraint_CSharpKeyword" - - "new_CSharpKeyword" helpviewer_keywords: - "new constraint keyword [C#]" ms.assetid: 58850b64-cb97-4136-be50-1f3bc7fc1da9 diff --git a/docs/csharp/language-reference/keywords/new-modifier.md b/docs/csharp/language-reference/keywords/new-modifier.md index 1a116f66c0d0d..7ae091a314f04 100644 --- a/docs/csharp/language-reference/keywords/new-modifier.md +++ b/docs/csharp/language-reference/keywords/new-modifier.md @@ -5,7 +5,6 @@ ms.date: 07/20/2015 f1_keywords: - "newmodifier" - "newmodifier_CSharpKeyword" - - "new_CSharpKeyword" helpviewer_keywords: - "new modifier keyword [C#]" ms.assetid: a2e20856-33b9-4620-b535-a60dbce8349b diff --git a/docs/csharp/language-reference/keywords/out-generic-modifier.md b/docs/csharp/language-reference/keywords/out-generic-modifier.md index d1d3d24582759..020b6430aefce 100644 --- a/docs/csharp/language-reference/keywords/out-generic-modifier.md +++ b/docs/csharp/language-reference/keywords/out-generic-modifier.md @@ -4,8 +4,7 @@ title: "out keyword (generic modifier)" ms.date: 07/20/2015 f1_keywords: - "outgenericmodifier" - - "outgenericmodifier_CSharpKeyword" - - "out_CSharpKeyword" + - "outgenericmodifier_CSharpKeyword" helpviewer_keywords: - "covariance, out keyword [C#]" - "out keyword [C#]"