Skip to content

Commit f95bfda

Browse files
authored
Merge pull request microsoft#164401 from hughlilly/comma-splice-fixes
Fix comma splices in descriptions in `src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts`
2 parents a8c16a0 + c22980c commit f95bfda

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ const terminalConfiguration: IConfigurationNode = {
7373
default: 'singleTerminal',
7474
},
7575
[TerminalSettingId.TabsShowActiveTerminal]: {
76-
description: localize('terminal.integrated.tabs.showActiveTerminal', 'Shows the active terminal information in the view, this is particularly useful when the title within the tabs aren\'t visible.'),
76+
description: localize('terminal.integrated.tabs.showActiveTerminal', 'Shows the active terminal information in the view. This is particularly useful when the title within the tabs aren\'t visible.'),
7777
type: 'string',
7878
enum: ['always', 'singleTerminal', 'singleTerminalOrNarrow', 'never'],
7979
enumDescriptions: [
@@ -157,7 +157,7 @@ const terminalConfiguration: IConfigurationNode = {
157157
default: true
158158
},
159159
[TerminalSettingId.FontFamily]: {
160-
markdownDescription: localize('terminal.integrated.fontFamily', "Controls the font family of the terminal, this defaults to {0}'s value.", '`#editor.fontFamily#`'),
160+
markdownDescription: localize('terminal.integrated.fontFamily', "Controls the font family of the terminal. Defaults to {0}'s value.", '`#editor.fontFamily#`'),
161161
type: 'string'
162162
},
163163
// TODO: Support font ligatures
@@ -174,12 +174,12 @@ const terminalConfiguration: IConfigurationNode = {
174174
maximum: 100
175175
},
176176
[TerminalSettingId.LetterSpacing]: {
177-
description: localize('terminal.integrated.letterSpacing', "Controls the letter spacing of the terminal, this is an integer value which represents the amount of additional pixels to add between characters."),
177+
description: localize('terminal.integrated.letterSpacing', "Controls the letter spacing of the terminal. This is an integer value which represents the number of additional pixels to add between characters."),
178178
type: 'number',
179179
default: DEFAULT_LETTER_SPACING
180180
},
181181
[TerminalSettingId.LineHeight]: {
182-
description: localize('terminal.integrated.lineHeight', "Controls the line height of the terminal, this number is multiplied by the terminal font size to get the actual line-height in pixels."),
182+
description: localize('terminal.integrated.lineHeight', "Controls the line height of the terminal. This number is multiplied by the terminal font size to get the actual line-height in pixels."),
183183
type: 'number',
184184
default: DEFAULT_LINE_HEIGHT
185185
},
@@ -258,7 +258,7 @@ const terminalConfiguration: IConfigurationNode = {
258258
default: 1
259259
},
260260
[TerminalSettingId.Scrollback]: {
261-
description: localize('terminal.integrated.scrollback', "Controls the maximum amount of lines the terminal keeps in its buffer."),
261+
description: localize('terminal.integrated.scrollback', "Controls the maximum number of lines the terminal keeps in its buffer."),
262262
type: 'number',
263263
default: 1000
264264
},
@@ -344,7 +344,7 @@ const terminalConfiguration: IConfigurationNode = {
344344
default: 'editor'
345345
},
346346
[TerminalSettingId.EnableBell]: {
347-
description: localize('terminal.integrated.enableBell', "Controls whether the terminal bell is enabled, this shows up as a visual bell next to the terminal's name."),
347+
description: localize('terminal.integrated.enableBell', "Controls whether the terminal bell is enabled. This shows up as a visual bell next to the terminal's name."),
348348
type: 'boolean',
349349
default: false
350350
},
@@ -451,8 +451,8 @@ const terminalConfiguration: IConfigurationNode = {
451451
type: 'string',
452452
enum: ['6', '11'],
453453
enumDescriptions: [
454-
localize('terminal.integrated.unicodeVersion.six', "Version 6 of unicode, this is an older version which should work better on older systems."),
455-
localize('terminal.integrated.unicodeVersion.eleven', "Version 11 of unicode, this version provides better support on modern systems that use modern versions of unicode.")
454+
localize('terminal.integrated.unicodeVersion.six', "Version 6 of unicode; this is an older version which should work better on older systems."),
455+
localize('terminal.integrated.unicodeVersion.eleven', "Version 11 of unicode; this version provides better support on modern systems that use modern versions of unicode.")
456456
],
457457
default: '11',
458458
description: localize('terminal.integrated.unicodeVersion', "Controls what version of unicode to use when evaluating the width of characters in the terminal. If you experience emoji or other wide characters not taking up the right amount of space or backspace either deleting too much or too little then you may want to try tweaking this setting.")
@@ -505,7 +505,7 @@ const terminalConfiguration: IConfigurationNode = {
505505
default: true
506506
},
507507
[TerminalSettingId.PersistentSessionReviveProcess]: {
508-
markdownDescription: localize('terminal.integrated.persistentSessionReviveProcess', "When the terminal process must be shutdown (eg. on window or application close), this determines when the previous terminal session contents/history should be restored and processes be recreated when the workspace is next opened.\n\nCaveats:\n\n- Restoring of the process current working directory depends on whether it is supported by the shell.\n- Time to persist the session during shutdown is limited, so it may be aborted when using high-latency remote connections."),
508+
markdownDescription: localize('terminal.integrated.persistentSessionReviveProcess', "When the terminal process must be shut down (eg. on window or application close), this determines when the previous terminal session contents/history should be restored and processes be recreated when the workspace is next opened.\n\nCaveats:\n\n- Restoring of the process current working directory depends on whether it is supported by the shell.\n- Time to persist the session during shutdown is limited, so it may be aborted when using high-latency remote connections."),
509509
type: 'string',
510510
enum: ['onExit', 'onExitAndWindowClose', 'never'],
511511
markdownEnumDescriptions: [
@@ -521,7 +521,7 @@ const terminalConfiguration: IConfigurationNode = {
521521
default: true
522522
},
523523
[TerminalSettingId.AutoReplies]: {
524-
markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that when encountered in the terminal will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VS Code if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'),
524+
markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VS Code if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'),
525525
type: 'object',
526526
additionalProperties: {
527527
oneOf: [{

0 commit comments

Comments
 (0)