Merge pull request #3144 from craigcaseyMSFT/vcraic1023

TrishaMc · web-flow · commit afccf870dbf1 · 2018-10-29T10:34:52.000-07:00
Text Editor Options - 10 files updated
diff --git a/docs/ide/how-to-track-your-code-by-customizing-the-scrollbar.md b/docs/ide/how-to-track-your-code-by-customizing-the-scrollbar.md
@@ -4,8 +4,6 @@ ms.date: 09/25/2018
 ms.prod: visual-studio-dev15
 ms.technology: vs-ide-general
 ms.topic: conceptual
-f1_keywords:
-  - "VS.ToolsOptionsPages.Text_Editor.All_Languages.Scroll_Bars"
 author: gewarren
 ms.author: gewarren
 manager: douge
diff --git a/docs/ide/reference/options-text-editor-all-languages-scroll-bars.md b/docs/ide/reference/options-text-editor-all-languages-scroll-bars.md
@@ -0,0 +1,62 @@
+---
+title: Options, Text Editor, All Languages, Scroll Bars
+ms.date: 10/25/2018
+ms.prod: visual-studio-dev15
+ms.technology: vs-ide-general
+ms.topic: reference
+f1_keywords:
+  - "VS.ToolsOptionsPages.Text_Editor.All_Languages.Scroll_Bars"
+author: gewarren
+ms.author: gewarren
+manager: douge
+ms.workload:
+  - "multiple"
+---
+# Options, Text Editor, All Languages, Scroll Bars
+This dialog box lets you change the default behavior of the code editor scroll bar. To display these options, select **Options** from the **Tools** menu. Within the **Text Editor** folder, expand the **All Languages** subfolder, and then choose **Scroll Bars**.
+
+> [!CAUTION]
+> This page sets default options for all development languages. Resetting an option in this dialog will reset the Scroll Bars options in all languages to whatever choices are selected here. To change Text Editor options for just one language, expand the subfolder for that language and select its option pages.
+
+## Show horizontal scroll bar
+
+When selected, displays a horizontal scrollbar, which allows you to scroll from side-to-side to view elements that fall outside the viewing area of the Editor. If horizontal scrollbars are unavailable, you can use the cursor keys to scroll.
+
+## Show vertical scroll bar
+
+When selected, displays a vertical scrollbar, which allows you to scroll up and down to view elements that fall outside the viewing area of the Editor. If vertical scrollbars are not available, you can use the Page Up, Page Down and cursor keys to scroll.
+
+## Display
+
+### Show annotations over vertical scroll bar
+
+Select whether the vertical scroll bar shows the following annotations:
+
+- changes
+- marks
+- errors
+- caret position
+
+> [!TIP]
+> The **Show marks** option includes breakpoints and bookmarks.
+
+Try it out by opening a large code file and replacing some text that occurs in several places in the file. The scroll bar shows you the effect of the replacements, so you can back out your changes if you replaced something you shouldn't have.
+
+## Behavior
+
+The scroll bar has two modes: bar mode and map mode.
+
+### Use bar mode for vertical scroll bar
+
+*Bar mode* displays annotation indicators on the scroll bar. Clicking on the scroll bar scrolls the page up or down but does not jump to that location in the file.
+
+### Use map mode for vertical scroll bar
+
+In *map mode*, when you click a location on the scroll bar, the cursor jumps to that location in the file instead of just scrolling up or down a page. Lines of code are shown, in miniature, on the scroll bar. You can choose how wide the map column is by selecting a value in **Source overview**. To enable a larger preview of the code when you rest the pointer on the map, select the **Show Preview Tooltip** option. Collapsed regions are shaded differently and expand when you double-click them.
+
+> [!TIP]
+> You can turn the miniature code view off in map mode by setting **Source overview** to **Off**. If **Show Preview Tooltip** is selected, you still see a preview of the code at that location when you hover your pointer on the scroll bar, and the cursor still jumps to that location in the file when you click.
+
+## See also
+
+- [How to: Customize the scroll bar](../how-to-track-your-code-by-customizing-the-scrollbar.md)
diff --git a/docs/ide/reference/options-text-editor-all-languages.md b/docs/ide/reference/options-text-editor-all-languages.md
@@ -7,7 +7,7 @@ ms.topic: reference
 f1_keywords:
   - "VS.ToolsOptionsPages.Text_Editor.JavaScript.General"
   - "VS.ToolsOptionsPages.Text_Editor.ResJSON.General"
-  - "vs.toolsoptionspages.text_editor.all_languages.scrollbars"
+  - "VS.ToolsOptionsPages.Text_Editor.All_Languages.General"
 helpviewer_keywords:
   - "Text Editor Options dialog box"
   - "statement completion"
@@ -36,32 +36,32 @@ This dialog box allows you to change the default behavior of the Code Editor. Th
 
 
 ## Statement Completion
- Auto list members
+ **Auto list members**
 
  When selected, pop-up lists of available members, properties, values, or methods are displayed by IntelliSense as you type in the editor. Choose any item from the pop-up list to insert the item into your code. Selecting this option enables the **Hide advanced members** option.
 
- Hide advanced members
+ **Hide advanced members**
 
  When selected, shortens pop-up statement completion lists by displaying only those items most commonly used. Other items are filtered from the list.
 
- Parameter information
+ **Parameter information**
 
  When selected, the complete syntax for the current declaration or procedure is displayed under the insertion point in the editor, with all of its available parameters. The next parameter you can assign is displayed in bold.
 
 ## Settings
- Enable virtual space
+ **Enable virtual space**
 
  When this option is selected and **Word wrap** is cleared, you can click anywhere beyond the end of a line in the Code Editor and type. This feature can be used to position comments at a consistent point next to your code.
 
- Word wrap
+ **Word wrap**
 
  When selected, any portion of a line that extends horizontally beyond the viewable editor area is automatically displayed on the next line. Selecting this option enables the **Show visual glyphs for word wrap** option.
 
 > [!NOTE]
 > The **Virtual Space** feature is turned off while **Word Wrap** is on.
 
 
- Show visual glyphs for word wrap
+ **Show visual glyphs for word wrap**
 
  When selected, a return-arrow indicator is displayed where a long line wraps onto a second line.
 
@@ -73,36 +73,34 @@ This dialog box allows you to change the default behavior of the Code Editor. Th
 > These reminder arrows are not added to your code, and do not print. They are for reference only.
 
 
- Apply Cut or Copy commands to blank lines when there is no selection
+**Line numbers**
 
- This option sets the behavior of the editor when you place the insertion point on a blank line, select nothing, and then Copy or Cut.
-
--   When this option is selected, the blank line is copied or cut. If you then Paste, a new, blank line is inserted.
+ When selected, a line number appears next to each line of code.
 
--   When this option is cleared, the Cut command removes blank lines. However, the data on the Clipboard is preserved. Therefore, if you then use the Paste command, the content most recently copied onto the Clipboard is pasted. If nothing has been copied previously, nothing is pasted.
+> [!NOTE]
+> These line numbers are not added to your code, and do not print. They are for reference only.
 
-This setting has no effect on Copy or Cut when a line is not blank. If nothing is selected, the entire line is copied or cut. If you then Paste, the text of the entire line and its endline character are pasted.
 
-> [!TIP]
-> To display indicators for spaces, tabs, and line ends, and thus distinguish indented lines from lines that are entirely blank, select **Advanced** from the **Edit** menu and choose **View White Space**.
+ **Enable single-click URL navigation**
 
+ When selected, the mouse cursor changes to a pointing hand as it passes over a URL in the editor. You can click the URL to display the indicated page in your web browser.
 
-## Display
- Line numbers
+ **Navigation bar**
 
- When selected, a line number appears next to each line of code.
+ When selected, displays the **Navigation bar** at the top of the code editor. Its dropdown **Objects** and **Members** lists allow you to choose a particular object in your code, select from its members, and navigates to the declaration of the selected member in the Code Editor.
 
-> [!NOTE]
-> These line numbers are not added to your code, and do not print. They are for reference only.
+**Apply Cut or Copy commands to blank lines when there is no selection**
 
+ This option sets the behavior of the editor when you place the insertion point on a blank line, select nothing, and then Copy or Cut.
 
- Enable single-click URL navigation
+-   When this option is selected, the blank line is copied or cut. If you then Paste, a new, blank line is inserted.
 
- When selected, the mouse cursor changes to a pointing hand as it passes over a URL in the editor. You can click the URL to display the indicated page in your web browser.
+-   When this option is cleared, the Cut command removes blank lines. However, the data on the Clipboard is preserved. Therefore, if you then use the Paste command, the content most recently copied onto the Clipboard is pasted. If nothing has been copied previously, nothing is pasted.
 
- Navigation bar
+This setting has no effect on Copy or Cut when a line is not blank. If nothing is selected, the entire line is copied or cut. If you then Paste, the text of the entire line and its endline character are pasted.
 
- When selected, displays the **Navigation bar** at the top of the code editor. Its dropdown **Objects** and **Members** lists allow you to choose a particular object in your code, select from its members, and navigates to the declaration of the selected member in the Code Editor.
+> [!TIP]
+> To display indicators for spaces, tabs, and line ends, and thus distinguish indented lines from lines that are entirely blank, select **Advanced** from the **Edit** menu and choose **View White Space**.
 
 ## See Also
 
diff --git a/docs/ide/reference/options-text-editor-basic-visual-basic.md b/docs/ide/reference/options-text-editor-basic-visual-basic.md
@@ -67,16 +67,6 @@ The text editor indicates visual scope of procedures. A line is drawn in the *.v
 
 When you commit an `Implements` statement or an `Inherits` statement for a class, the text editor inserts prototypes for the members that have to be implemented or overridden, respectively.
 
-**Show procedure line separators**
-
-The text editor indicates visual scope of procedures. A line is drawn in the .vb source files of your project at locations listed in the following table:
-
-|Location in .vb Source File|Example of Line Location|
-| - | - |
-|After the close of a block declaration construct|-   At the end of a class, structure, module, interface, or enum<br />-   After a property, function, or sub<br />-   Not between the get and set clauses in a property|
-|After a set of single line constructs|-   After the import statements, before a type definition in a class file<br />-   After variables declared in a class, before any procedures|
-|After single line declarations (non-block level declarations)|-   Following import statements, inherits statements, variable declarations, event declarations, delegate declarations, and DLL declare statements|
-
 **Enable error correction suggestions**
 
 The text editor can suggest solutions to common errors and allow you to select the appropriate correction, which is then applied to your code.
diff --git a/docs/ide/reference/options-text-editor-c-cpp-advanced.md b/docs/ide/reference/options-text-editor-c-cpp-advanced.md
@@ -128,6 +128,12 @@ By changing these options, you can change the behavior related to IntelliSense a
 
  Disables IntelliSense error squiggles. The red "squiggles" don't show in the editor window, but the error will still appear in the Error List window.
 
+ **Auto Tune Max Cached Translation Units**
+
+ The maximum number of translation units that will be kept active at any one time for IntelliSense requests. You must specify a value between 2 and 15. This number directly relates to the maximum number of VCPkgSrv.exe processes that will run (for a given instance of Visual Studio). The default value is 2, but if you have available memory, you can increase this value and possibly achieve slightly better performance on IntelliSense.
+
+ For more information about translation units, see [Phases of Translation](/cpp/preprocessor/phases-of-translation).
+
  **Disable #include Auto Complete**
 
  Disables auto-completion of `#include` statements.
@@ -136,16 +142,6 @@ By changing these options, you can change the behavior related to IntelliSense a
 
  Triggers auto-completion of `#include` statements when "/" is used. The default delimiter is backslash '\'. The compiler can accept either, so use this option to specify what your code base uses.
 
- **Max Cached Translation Units**
-
- The maximum number of translation units that will be kept active at any one time for IntelliSense requests. You must specify a value between 2 and 15. This number directly relates to the maximum number of VCPkgSrv.exe processes that will run (for a given instance of Visual Studio). The default value is 2, but if you have available memory, you can increase this value and possibly achieve slightly better performance on IntelliSense.
-
- For more information about translation units, see [Phases of Translation](/cpp/preprocessor/phases-of-translation).
-
- **Member List Dot-To-Arrow**
-
- Replaces '.' with '->' when applicable for Member List.
-
  **Disable Aggressive Member List**
 
  The member list doesn't appear while you type the name of a type or variable. The list appears only after you type one of the commit characters, as defined in the **Member List Commit Characters** option.
@@ -158,21 +154,25 @@ By changing these options, you can change the behavior related to IntelliSense a
 
  Code snippets don't appear in member list suggestions.
 
+ **Member List Filter Mode**
+
+ Sets the type of matching algorithm. **Fuzzy** finds the most possible matches because it uses an algorithm that's similar to a spell-checker to find matches that are similar but not identical. **Smart filtering** matches substrings even if they're not at the start of a word. **Prefix** only matches on identical substrings that start at the beginning of the word.
+
  **Disable Semantic Colorization**
 
  Turns off all code colorization except for language keywords, strings, and comments.
 
- **Smart Member List Commit**
+ **Member List Commit Characters**
 
- Adds a line when you choose the Enter key at the end of a fully typed word.
+ Specifies the characters that cause the currently highlighted Member List suggestion to be committed. You can add or remove characters from this list.
 
- **Member List Filter Mode**
+ **Smart Member List Commit**
 
- Sets the type of matching algorithm. **Fuzzy** finds the most possible matches because it uses an algorithm that's similar to a spell-checker to find matches that are similar but not identical. **Smart filtering** matches substrings even if they're not at the start of a word. **Prefix** only matches on identical substrings that start at the beginning of the word.
+ Adds a line when you choose the Enter key at the end of a fully typed word.
 
- **Member List Commit Characters**
+ **Enable Member List Dot-To-Arrow**
 
- Specifies the characters that cause the currently highlighted Member List suggestion to be committed. You can add or remove characters from this list.
+ Replaces '.' with '->' when applicable for Member List.
 
 ## References
  **Disable Resolving**
@@ -185,12 +185,14 @@ By changing these options, you can change the behavior related to IntelliSense a
 
  **Disable Reference Highlighting**
 
+By default, when you select some text, all instances of the same text are automatically highlighted in the current document. You can disable this feature by setting **Disable Reference Highlighting** to **True**.
+
  ## Text Editor
- **Enable Expand Scopes**
+ **Enable Surround with Braces**
 
  If enabled, you can surround selected text with curly braces by typing '{' into the text editor.
 
- **Enable Expand Precedence**
+ **Enable Surround with Parentheses**
 
  If enabled, you can surround selected text with parentheses by typing '(' into the text editor.
 
diff --git a/docs/ide/reference/options-text-editor-c-cpp-experimental.md b/docs/ide/reference/options-text-editor-c-cpp-experimental.md
@@ -29,12 +29,12 @@ These features are available in a Visual Studio 2017 installation.
 
 Predictive IntelliSense limits the number of results displayed in the IntelliSense dropdown list so that you see only results that are relevant in the context. For example, if you type <code>int x =</code> and invoke the IntelliSense dropdown, you will see only integers or functions that return integers. Predictive IntelliSense is turned off by default.
 
-## Enable Faster Project Load
+## Enable faster project load
 
 **Visual Studio 2017 version 15.3 and later**: This feature is now called **Enable Project Caching** and has moved to the [VC++ Project Settings](vcpp-project-settings-projects-and-solutions-options-dialog-box.md) property page.
 This option enables Visual Studio to cache project data so that when you open the project the next time, it can load that cached data rather than re-computing it from the project files. Using cached data can speed up the project load time significantly.
 
-## Additional Features in the Visual Studio Marketplace
+## Additional features in the Visual Studio Marketplace
 
 You can browse additional text editor features in the [Visual Studio Marketplace](https://marketplace.visualstudio.com/search?target=VS&category=Tools&vsVersion=&subCategory=All&sortBy=Downloads). An example is [C++ Quick Fixes](https://marketplace.visualstudio.com/items?itemName=VisualCppDevLabs.CQuickFixes2017), which supports the following:
 
diff --git a/docs/ide/reference/options-text-editor-csharp-formatting.md b/docs/ide/reference/options-text-editor-csharp-formatting.md
@@ -11,6 +11,7 @@ f1_keywords:
   - "VS.ToolsOptionsPages.Text_Editor.CSharp.Formatting.Wrapping"
   - "VS.ToolsOptionsPages.Text_Editor.CSharp.Formatting"
   - "VS.ToolsOptionsPages.Text_Editor.CSharp.Formatting.General"
+  - "VS.ToolsOptionsPages.Text_Editor.CSharp.Code_Style.Formatting.General"
 helpviewer_keywords:
   - "formatting options [C#]"
   - "Text editor Options dialog box, formatting"
@@ -20,7 +21,7 @@ manager: douge
 ms.workload:
   - "dotnet"
 ---
-# Options, Text Editor, C#, Formatting
+# Options, Text Editor, C#, Code Style, Formatting
 
 Use the **Formatting** options page to set options for formatting code in the code editor. To access this options page, choose **Tools** > **Options**. In the **Options** dialog box, choose **Text Editor** > **C#** > **Code Style** > **Formatting**.
 
diff --git a/docs/ide/reference/options-text-editor-file-extension.md b/docs/ide/reference/options-text-editor-file-extension.md
@@ -5,7 +5,7 @@ ms.prod: visual-studio-dev15
 ms.technology: vs-ide-general
 ms.topic: reference
 f1_keywords:
-  - "vs.toolsoptionspages.text_editor.file_extension"
+  - "VS.ToolsOptionsPages.Text_Editor.File_Extension"
 helpviewer_keywords:
   - "file extensions, associating to editor"
   - "Editing Experience"
diff --git a/docs/ide/reference/options-text-editor-general.md b/docs/ide/reference/options-text-editor-general.md
@@ -89,14 +89,6 @@ When selected, displays a vertical margin along the left edge of the editor's te
 
 When selected, displays a vertical margin outside the left edge of the editor's text area. When you click in this margin, an icon and ToolTip that are related to the text appear. For example, breakpoint or task list shortcuts appear in the indicator margin. Indicator Margin information does not print.
 
-### Vertical scroll bar
-
-When selected, displays a vertical scrollbar which allows you to scroll up and down to view elements that fall outside the viewing area of the Editor. If vertical scrollbars are not available, you can use the Page Up, Page Down and cursor keys to scroll.
-
-### Horizontal scroll bar
-
-When selected, displays a horizontal scrollbar which allows you to scroll from side-to-side to view elements that fall outside the viewing area of the Editor. If horizontal scrollbars are unavailable, you can use the cursor keys to scroll.
-
 ### Highlight current line
 
 When selected, displays a gray box around the line of code in which the cursor is located.
diff --git a/docs/ide/reference/options-text-editor-javascript-formatting.md b/docs/ide/reference/options-text-editor-javascript-formatting.md
@@ -8,6 +8,9 @@ f1_keywords:
   - "VS.ToolsOptionsPages.Text_Editor.JavaScript.Formatting.Spacing"
   - "VS.ToolsOptionsPages.Text_Editor.JavaScript.Formatting.General"
   - "VS.ToolsOptionsPages.Text_Editor.JavaScript.Formatting.New_Lines"
+  - "VS.ToolsOptionsPages.Text_Editor.TypeScript.Formatting.Spacing"
+  - "VS.ToolsOptionsPages.Text_Editor.TypeScript.Formatting.General"
+  - "VS.ToolsOptionsPages.Text_Editor.TypeScript.Formatting.New_Lines"
 ms.assetid: 28a0aef1-9353-4d94-95a5-54b42e15c0dc
 author: gewarren
 ms.author: gewarren
diff --git a/docs/ide/reference/options-text-editor-javascript-intellisense.md b/docs/ide/reference/options-text-editor-javascript-intellisense.md
@@ -7,6 +7,7 @@ ms.topic: reference
 f1_keywords:
   - "VS.ToolsOptionsPages.Text_Editor.JavaScript.Intellisense.References"
   - "VS.ToolsOptionsPages.Text_Editor.JavaScript.Intellisense.General"
+  - "VS.ToolsOptionsPages.Text_Editor.TypeScript.IntelliSense.General"
 ms.assetid: b4a9816d-cf87-4dc6-a8d4-1591d6a48103
 author: gewarren
 ms.author: gewarren
diff --git a/docs/toc.yml b/docs/toc.yml
