Skip to content

Commit bfa4f5a

Browse files
authored
Merge pull request #8056 from MicrosoftDocs/main637889223036569413
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 116d538 + 10ffbba commit bfa4f5a

5 files changed

+69
-10
lines changed

docs/ide/code-styles-and-code-cleanup.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Code style options and code cleanup
33
description: Learn how to configure Visual Studio to apply code style preferences using the Code Cleanup (Visual Studio 2019) and Format Document (Visual Studio 2017) commands.
44
ms.custom: SEO-VS-2020
5-
ms.date: 03/28/2022
5+
ms.date: 05/20/2022
66
ms.topic: conceptual
77
author: mikejo5000
88
ms.author: mikejo
@@ -37,16 +37,26 @@ You can manually populate your EditorConfig file, or you can automatically gener
3737

3838
::: moniker range=">=vs-2022"
3939

40-
You can manually populate your EditorConfig file, or you can automatically generate the file based on the code style settings you've chosen in the Visual Studio **Options** dialog box. This options page is available at **Tools** > **Options** > **Text Editor** > [**C#** or **Basic**] > **Code Style** > **General**. Click **Generate .editorconfig file from settings** to automatically generate a coding style *.editorconfig* file based on the settings on this **Options** page.
40+
You can manually populate your EditorConfig file, or you can automatically generate the file based on the code style settings you've chosen in the Visual Studio **Options** dialog box. This options page is available at **Tools** > **Options** > **Text Editor** > [**C#** or **Visual Basic**] > **Code Style** > **General**. Click **Generate .editorconfig file from settings** to automatically generate a coding style *.editorconfig* file based on the settings on this **Options** page.
4141

4242
![Screenshot of Generate editorconfig file from settings.](media/vs-2022/generate-editorconfig-file-small.png)
4343

4444
::: moniker-end
4545

4646
## Code styles in the Options dialog box
4747

48+
::: moniker range="vs-2022"
49+
50+
Code style preferences can be set for all of your C# and Visual Basic projects by opening the **Options** dialog box from the **Tools** menu. In the **Options** dialog box, select **Text Editor** > [**C#** or **Visual Basic**] > **Code Style** > **General**.
51+
52+
::: moniker-end
53+
54+
::: moniker range="<=vs-2019"
55+
4856
Code style preferences can be set for all of your C# and Visual Basic projects by opening the **Options** dialog box from the **Tools** menu. In the **Options** dialog box, select **Text Editor** > [**C#** or **Basic**] > **Code Style** > **General**.
4957

58+
::: moniker-end
59+
5060
Each item in the list shows a preview of the preference when selected:
5161

5262
::: moniker range="vs-2017"

docs/ide/common-quick-actions.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Common Quick Actions
33
description: Most popular Quick Actions for C# and Visual Basic including fixing misspelled keywords or symbols, resolving merge conflicts, removing necessary imports, generating types, introducing local variables, etc.
4-
ms.date: 03/28/2018
4+
ms.date: 05/20/2022
55
ms.topic: reference
66
author: TerryGLee
77
ms.author: tglee
@@ -176,7 +176,17 @@ void DoWork(CancellationToken cancellationToken = default) { ... }
176176

177177
### Add usings/imports for types in reference assemblies, NuGet packages, or other types in your solution
178178

179-
Using types located in other projects in your solution will display the Quick Action automatically, however the others need to be enabled from the **Tools > Options > C#** or **Basic > Advanced** tab:
179+
::: moniker range="vs-2022"
180+
181+
Using types located in other projects in your solution will display the Quick Action automatically, however the others need to be enabled from the **Tools > Options > Text Editor > C#** or **Visual Basic > Advanced** tab:
182+
183+
::: moniker-end
184+
185+
::: moniker range="<=vs-2019"
186+
187+
Using types located in other projects in your solution will display the Quick Action automatically, however the others need to be enabled from the **Tools > Options > Text Editor > C#** or **Basic > Advanced** tab:
188+
189+
::: moniker-end
180190

181191
- Suggest usings/imports for types in reference assemblies
182192
- Suggest usings/imports for types in NuGet packages

docs/ide/how-to-manage-editor-modes.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Full screen and virtual space mode
33
description: Learn how to manage the Visual Studio editor modes to display all of the tools and windows in a way that works best for you.
44
ms.custom: SEO-VS-2020
5-
ms.date: 11/04/2016
5+
ms.date: 05/20/2022
66
ms.topic: how-to
77
helpviewer_keywords:
88
- word wrap
@@ -51,6 +51,21 @@ You can choose to hide all tool windows and view only document windows by enabli
5151

5252
In **Virtual Space** mode, spaces are inserted at the end of each line of code. Select this option to position comments at a consistent point next to your code.
5353

54+
::: moniker range="vs-2022"
55+
56+
1. Select **Options** from the **Tools** menu.
57+
58+
1. Expand the **Text Editor** folder, and choose **All Languages** to set this option globally, or choose a specific language folder. For example, to turn on line numbers only in Visual Basic, choose the **Visual Basic** > **Text Editor** node.
59+
60+
1. Select **General** options, and under **Settings**, select **Enable Virtual Space**.
61+
62+
> [!NOTE]
63+
> **Virtual Space** is enabled in **Column Selection** mode. When **Virtual Space** mode is not enabled, the insertion point moves from the end of one line directly to the first character of the next.
64+
65+
::: moniker-end
66+
67+
::: moniker range=">=vs-2019"
68+
5469
1. Select **Options** from the **Tools** menu.
5570

5671
2. Expand the **Text Editor** folder, and choose **All Languages** to set this option globally, or choose a specific language folder. For example, to turn on line numbers only in Visual Basic, choose the **Basic** > **Text Editor** node.
@@ -60,6 +75,8 @@ In **Virtual Space** mode, spaces are inserted at the end of each line of code.
6075
> [!NOTE]
6176
> **Virtual Space** is enabled in **Column Selection** mode. When **Virtual Space** mode is not enabled, the insertion point moves from the end of one line directly to the first character of the next.
6277
78+
::: moniker-end
79+
6380
## See also
6481

6582
- [Customize window layouts in Visual Studio](../ide/customizing-window-layouts-in-visual-studio.md)

docs/ide/reference/options-text-editor-basic-visual-basic.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Options, Text Editor, Basic (VB), Advanced
33
description: Learn how to use the Advanced page in the Basic section to change the default settings of the Analysis, Import Directives, and Highlighting properties.
44
ms.custom: SEO-VS-2020
5-
ms.date: 05/13/2022
5+
ms.date: 05/20/2022
66
ms.topic: reference
77
f1_keywords:
88
- VS.ToolsOptionsPages.Visual_Basic.Editor
@@ -24,8 +24,19 @@ ms.workload:
2424
---
2525
# Options, Text Editor, Basic (Visual Basic), Advanced
2626

27+
::: moniker range=">=vs-2022"
28+
29+
[!INCLUDE [Visual Studio](~/includes/applies-to-version/vs-windows-only.md)]
30+
The **VB Specific** property page, in the **Visual Basic** folder of the **Text Editor** folder of the **Options** (**Tools** menu) dialog box, includes the following properties:
31+
32+
::: moniker-end
33+
34+
::: moniker range="<=vs-2019"
35+
2736
[!INCLUDE [Visual Studio](~/includes/applies-to-version/vs-windows-only.md)]
28-
The **VB Specific** property page, in the **Basic** folder of the **Text Editor** folder of the **Options** (**Tools** menu) dialog box includes the following properties:
37+
The **VB Specific** property page, in the **Basic** folder of the **Text Editor** folder of the **Options** (**Tools** menu) dialog box, includes the following properties:
38+
39+
::: moniker-end
2940

3041
## Analysis
3142

@@ -98,8 +109,8 @@ When selected, vertical lines appear in the editor that line up with structured
98109
## Editor Help
99110

100111
::: moniker range=">=vs-2019"
101-
**Inline Parameter Name Hints**
102-
When selected, inserts parameter name hints for literals, casted literals, and object instantiations prior to each argument in function calls.
112+
**Inline Parameter Name Hints**
113+
When selected, inserts parameter name hints for literals, casted literals, and object instantiations prior to each argument in function calls.
103114

104115
![Inline Parameter Name Hints for Visual Basic](media/inline-parameter-name-hints-visualbasic.png)
105116
::: moniker-end

docs/ide/reference/setting-language-specific-editor-options.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Setting Language-Specific Editor Options
33
description: Learn how to set a variety of text editor options that apply to specific programming languages.
44
ms.custom: SEO-VS-2020
5-
ms.date: 11/04/2016
5+
ms.date: 05/20/2022
66
ms.topic: reference
77
helpviewer_keywords:
88
- editor options
@@ -23,9 +23,20 @@ Visual Studio offers a variety of text editor options that apply to specific pro
2323

2424
## Settings available in the Options dialog box
2525

26+
::: moniker range="vs-2022"
27+
28+
[Options, Text Editor, Visual Basic](../../ide/reference/options-text-editor-basic-visual-basic.md)\
29+
Describes settings for end constructs, code reformatting, outlining, and error correction suggestions, among others, for Visual Basic code.
30+
31+
::: moniker-end
32+
33+
::: moniker range="<=vs-2019"
34+
2635
[Options, Text Editor, Basic (Visual Basic)](../../ide/reference/options-text-editor-basic-visual-basic.md)\
2736
Describes settings for end constructs, code reformatting, outlining, and error correction suggestions, among others, for Visual Basic code.
2837

38+
::: moniker-end
39+
2940
[Options, Text Editor, C/C++, Formatting](../../ide/reference/options-text-editor-c-cpp-formatting.md)\
3041
Describes outlining, indenting, Quick Info, and other settings for C and C++ code.
3142

0 commit comments

Comments
 (0)