diff --git a/doc/org.eclipse.cdt.doc.user/images/code_templates.png b/doc/org.eclipse.cdt.doc.user/images/code_templates.png index b445cae88cb..edfc7c103fc 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/code_templates.png and b/doc/org.eclipse.cdt.doc.user/images/code_templates.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/contentAssist_adv_preferences.png b/doc/org.eclipse.cdt.doc.user/images/contentAssist_adv_preferences.png new file mode 100644 index 00000000000..fcbd4da8a54 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/contentAssist_adv_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/contentAssist_preferences.png b/doc/org.eclipse.cdt.doc.user/images/contentAssist_preferences.png index 629953e4093..bed8a92890d 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/contentAssist_preferences.png and b/doc/org.eclipse.cdt.doc.user/images/contentAssist_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_folding_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_folding_preferences.png new file mode 100644 index 00000000000..1b89829abba Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/editor_folding_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_general_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_general_preferences.png index a8311436908..4a2002d8573 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/editor_general_preferences.png and b/doc/org.eclipse.cdt.doc.user/images/editor_general_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_hover_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_hover_preferences.png index d4822914d19..39e38a02de6 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/editor_hover_preferences.png and b/doc/org.eclipse.cdt.doc.user/images/editor_hover_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_typing_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_typing_preferences.png new file mode 100644 index 00000000000..5d65cddc34a Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/editor_typing_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm index fdf73a98ac2..c7f19386222 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm @@ -14,12 +14,14 @@

This section describes how to set preferences for the C/C++ editor.

- General preferences
- Color preferences
+ Editor preferences
Content Assist preferences
- Hover preferences
- Navigation preferences
- +     Advanced preferences
+ Folding preferences
+ Hovers preferences
+ Syntax Coloring preferences
+ Templates preferences
+ Typing preferences

IBM Copyright Statement

diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist.htm index 840b6f448b3..22cb25e9ec9 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist.htm @@ -11,43 +11,49 @@

Content Assist preferences

-

You can customize the Content Assist feature on the Contents Assist page of the C/C++ Editor Preferences window. To change the Content Assist preferences click -Window > Preferences > C/C++ > C++ Editor > Content Assist.

+

You can customize the Content Assist feature on the Contents Assist panel of the Preferences window. To change the Content Assist preferences click +Window > Preferences > C/C++ > Editor > Content Assist.

Content Assist Preferences Dialog Box

-
-

Search scope for completion proposals
-
You can configure the Content Assist feature to select proposals from items contained only in the current file and included files, or from the current project.
- -

Insert single proposals automatically
-
Inserts an element into your code when the Content Assist feature finds only one proposal.
- -

Present proposals in alphabetical order
-
Proposals, by default, appear in order of relevance determined by context, scope and prefix. Alternatively, you can configure the Content Assist feature to order its proposals alphabetically.
- -

Content Assist parsing timeout (ms) -
For very large projects, the Content Assist feature might slow the response of the plug-in as the Content Assist feature parses the project for proposals. This setting stops the Content Assist parse when it reaches the specified threshold.
- -

Auto activation
-
Certain predefined triggers force the Content Assist feature to activate. You can disable the predefined triggers with these checkboxes. - -

Auto activation delay
-
Specifies the number of milliseconds before Content Assist is activated, in Autoactivation mode.
- -

Background for completion proposals
-
Specifies the background color of the Content Assist dialog box.
- -

Foreground for completion proposals
-
Specifies the foreground color of the Content Assist dialog box.
- -

Completion Proposal Filter
-
Completion proposal filters may have been supplied with your eclipse CDT distribution. - Completion proposal filters can sort and order the proposals - provided by the Content Assist feature to best suit your needs. - Select the desired content assist filter from the list of available filters. -
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Content Assist Preference Options
Insert single proposals automatically
Inserts an element into your code when the Content Assist feature finds only one proposal.
Insert common prefixes automatically
Inserts common prefixes.
Completion Proposal Filter
Completion proposal filters may have been supplied with your Eclipse CDT distribution. + Completion proposal filters can sort and order the proposals provided by the Content Assist feature to best suit your needs. + Select the desired content assist filter from the list of available filters.
Enable "." as trigger
Enable to use "." as a trigger for auto-completion.
Enable "->" as trigger
Enable to use "->" as a trigger for auto-completion.
Enable "::" as trigger
Enable to use "::" as a trigger for auto-completion.
delay (ms)
Specifies the number of milliseconds before Content Assist is activated.

Related concepts
Coding aids

diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist_adv.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist_adv.htm new file mode 100644 index 00000000000..a42bf70ba8f --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist_adv.htm @@ -0,0 +1,56 @@ + + + + + + + Advanced preferences + + + + +

Advanced preferences

+ +

Use the Advanced panel in the Preferences window to configure the behavior of the Content Assist (Ctrl+Space) command.

+

Content Assist Preferences Dialog Box

+ + + + + + + + + + + + + + + + + + + + + + + + + +
Advanced Content Assist Preference Options
Default Proposal Kindsy
Specifies the types of proposals Content Assist uses and the key bindings assigned.
Content Assist Cycling
Specifies the order and types of proposals Content Assist will cycle through.
Up
Moves the selected proposal item up in the cycling list.
Down
Moves the selected proposal item down in the cycling list.
+ +

Related concepts
+Coding aids

+

Related tasks +
+Customizing the C/C++ editor
+Working with Content Assist

+

Related reference +
+C/C++ editor preferences

+IBM Copyright Statement + + + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_folding.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_folding.htm new file mode 100644 index 00000000000..dd8485d3880 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_folding.htm @@ -0,0 +1,94 @@ + + + + + + + Folding preferences + + + + +

Folding preferences

+ +

You can customize the C/C++ editor folding behavior in the Folding panel of the Preferences window.

+

Editor Folding Preferences Window

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Folding Preference Options
Option
Description
Default
Enable folding when opening a new editor
If enabled, apply folding rules to the new editor. 
Select folding to use
Select the folding to use from the available choices. 
Enable folding of preprocessor branches (#if/#endif)
If enabled, fold preprocessor branches. 
Macros
If enabled, fold macro definitions.On
Functions
If enabled, fold functions.Off
Methods
If enabled, fold methods.Off
Structures
If enabled, fold structures.On
Comments
If enabled, fold comments.Off
Header Comments
If enabled, fold header comments.On
Inactive Preprocessor Branches
If enabled, fold inactive processor branches.On
+ +

Related concepts
+Coding aids

+

Related tasks +
+Customizing the C/C++ editor

+

Related reference +
+C/C++ editor preferences

+IBM Copyright Statement + + + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm index c41b750db97..97d6836fa68 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm @@ -4,44 +4,49 @@ - General preferences + Editor preferences -

General preferences

+

Editor preferences

-

You can customize the appearance of the C/C++ editor on the General page of the Preferences window.

-

Editor General Preferences Dialog Box

- -
-
Displayed tab width
-
Specifies the width of the tab as a number of characters. For example a value of 4, - means that the tab width is 4-characters wide.
-
Print margin column
-
Specifies the width of the print margin as a number of characters. For example a value of - 80 means that the print area is 80-characters wide.
-
Show overview ruler
-
Displays the vertical ruler in the editor view.
-
Show line numbers
-
Displays line numbers in the left margin.
-
Highlight matching brackets
-
When the cursor is beside a bracket, the matching bracket is highlighted.
-
Highlight current line
-
Highlights the line that was last selected.
-
Show print margin
-
Displays the print margin in the editor.
-
Insert space for tabs
-
Inserts a space instead of a tab character when you press Tab.
-
Use custom caret
-
Select a custom caret (vertical bar icon showing cursor position).
-
Enable thick caret
-
Displays a thicker caret (vertical bar icon showing cursor position).
-
Appearance color options
-
Lists the items for which you can specify a color.
-
Color
-
Changes the color of the item that is selected in the list.
-
+

Use the Editor preference panel to control the appearance of text highlighting in C/C++ editors.

+

Editor Preferences Dialog Box

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Editor Preference Options
Smart caret positioning in identifiers
If enabled, there are additional word boundaries inside identifiers.
Highlight matching brackets
When the cursor is beside a bracket, the matching bracket is highlighted.
Highlight inactive code
Highlights inactive code when the cursor is positioned inside it.
Ensure newline at end of file when saving
Checkmark to ensure files always include a newline at the end.
Appearance color options
Lists the items for which you can specify a color.
Color
Specifies the color in which to display the selected item.

Related concepts
Coding aids

@@ -51,6 +56,7 @@

Related reference
C/C++ editor preferences

+
IBM Copyright Statement diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_hov.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_hov.htm index 3ba15fd2bdf..492b82ba59e 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_hov.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_hov.htm @@ -9,16 +9,33 @@ -

Hover preferences

+

Hovers preferences

-

You can customize the appearance of the C/C++ editor hover behavior on the Hovers page of the Preferences window.

+

You can customize the appearance of the C/C++ editor hover behavior on the Hovers panel of the Preferences window.

Editor Hover Preferences Window

- + + + + + + + + + + + + + + + + +
Hovers Preference Options
Enable editor problem annotation
When selected problems found will be highlighted in the editor.
Text Hover key modifier preferences
You can select hot-keys to enable alternate hover behavior. For example, a mouse over while pressing the <Ctrl> key will link to the element's source declaration.
+
-
Enable editor problem annotation
-
When selected problems found will be highlighted in the editor.
-
Text Hover key modifier preferences:
-
You can select hot-keys to enable alternate hover behavior such as a mouse over while pressing the <Ctrl> key will link to the element's source declaration.
+
+
+
+

Related concepts
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm new file mode 100644 index 00000000000..04a876cf692 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm @@ -0,0 +1,71 @@ + + + + + + + Typing preferences + + + + +

Typing preferences

+ +

Use the Typing preference panel to assist in formatting input as you type. Click Window > Preferences > C/C++ > Typing to make changes.

+Typing Preferences + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Typing Preference Options
"Strings"
If enabled, automatically close string quotes.
(Parenthesis) and [square] brackets
If enabled, automatically close parenthesis and square brackets.
<Angle> brackets
If enabled, automatically close angle brackets.
{Braces}
If enabled, automatically close curly braces.
Tab key indents the current line
If enabled, indent the current line when the tab key is pressed.
Adjust indentation
Adjust the indentation of pasted text to match the current indentation level.
Wrap automatically
Enable to automatically wrap string literals when they exceed the max line length.
Escape text when pasting into a literal string
If enabled, special characters in pasted strings are escaped when pasted into an existing string literal.
+ +

Related concepts
+Coding aids

+

Related tasks +
+Customizing the C/C++ editor
+Working with Content Assist

+

Related reference +
+C/C++ editor preferences

+IBM Copyright Statement + + + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm index 80e39c20332..6e1f7983e3c 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm @@ -4,35 +4,57 @@ - Code Templates preferences + Templates preferences -

Code Templates preferences

- -

You can manipulate any of the common code templates that are predefined within the CDT. To modify, delete, export, -import, or create your own templates click Window > Preferences > C/C++ > Code Templates.

+

Templates preferences

+

Use the Templates preference panel to manipulate any of the common code templates predefined within CDT or create your own. To modify, delete, export, +import, or create your own templates click Window > Preferences > C/C++ > Templates.

Code Templates Preferences -
-
New
-
Creates a new code template.
-
Edit
-
Edits the code template that is selected in the list.
-
Remove
-
Removes the selected code templates from the list.
-
Import
-
Imports a code template.
-
Export
-
Exports the selected code templates.
-
Export All
-
Exports all templates in the list.
-
Enable All
-
Makes all templates available when you invoke the Content Assist feature.
-
Disable All
-
Makes all templates unavailable when you invoke the Content Assist feature.
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Templates Preference Options
New...
Opens the New Template dialog to create a new code template.
Edit...
Opens the Edit Template dialog to edit the selected code template.
Remove
Removes the selected code templates from the list.
Restore Removed
Restores templates deleted by the last Remove action.
Revert to Default
Removes the last edits made to the selected template restoring it to it's unmodified state.
Import...
Imports a code template.
Export...
Exports the selected code templates.
Use code formatter
Enable to apply the currently selected code style to the code template.

Related concepts
Coding aids

diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml index c702b05e997..ff027087973 100644 --- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml +++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml @@ -4,6 +4,8 @@ + + @@ -26,6 +28,8 @@ + + @@ -35,36 +39,49 @@ + + + - + + - - - + + + + + - + + + + + + + + @@ -113,6 +130,8 @@ + + @@ -130,6 +149,9 @@ + + + @@ -138,5 +160,6 @@ +