Skip to content

Fix comma splices in descriptions in src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts #164401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Daniel Imms (Tyriar) merged 9 commits into from
Oct 24, 2022
Merged

Fix comma splices in descriptions in src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts #164401

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
213309e
update `terminal.integrated.fontFamily` desc
hughlilly Oct 23, 2022
40572df
fix four instances of comma splices
hughlilly Oct 23, 2022
8f41635
change "amount" to "number"
hughlilly Oct 23, 2022
751054c
change "shutdown" (noun) to "shut down" (verb)
hughlilly Oct 23, 2022
8b399f1
add commas to create subclause
hughlilly Oct 23, 2022
e901b76
fix comma splices with semicolon
hughlilly Oct 23, 2022
c147e2d
Merge branch 'main' into comma-splice-fixes
hughlilly Oct 24, 2022
a3890d7
Merge branch 'main' into comma-splice-fixes
hughlilly Oct 24, 2022
c22980c
change “amount of” to “number of"
hughlilly Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const terminalConfiguration: IConfigurationNode = {
default: 'singleTerminal',
},
[TerminalSettingId.TabsShowActiveTerminal]: {
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.'),
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.'),
type: 'string',
enum: ['always', 'singleTerminal', 'singleTerminalOrNarrow', 'never'],
enumDescriptions: [
Expand Down Expand Up @@ -157,7 +157,7 @@ const terminalConfiguration: IConfigurationNode = {
default: true
},
[TerminalSettingId.FontFamily]: {
markdownDescription: localize('terminal.integrated.fontFamily', "Controls the font family of the terminal, this defaults to {0}'s value.", '`#editor.fontFamily#`'),
markdownDescription: localize('terminal.integrated.fontFamily', "Controls the font family of the terminal. Defaults to {0}'s value.", '`#editor.fontFamily#`'),
type: 'string'
},
// TODO: Support font ligatures
Expand All @@ -174,12 +174,12 @@ const terminalConfiguration: IConfigurationNode = {
maximum: 100
},
[TerminalSettingId.LetterSpacing]: {
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."),
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."),
type: 'number',
default: DEFAULT_LETTER_SPACING
},
[TerminalSettingId.LineHeight]: {
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."),
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."),
type: 'number',
default: DEFAULT_LINE_HEIGHT
},
Expand Down Expand Up @@ -344,7 +344,7 @@ const terminalConfiguration: IConfigurationNode = {
default: 'editor'
},
[TerminalSettingId.EnableBell]: {
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."),
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."),
type: 'boolean',
default: false
},
Expand Down Expand Up @@ -451,8 +451,8 @@ const terminalConfiguration: IConfigurationNode = {
type: 'string',
enum: ['6', '11'],
enumDescriptions: [
localize('terminal.integrated.unicodeVersion.six', "Version 6 of unicode, this is an older version which should work better on older systems."),
localize('terminal.integrated.unicodeVersion.eleven', "Version 11 of unicode, this version provides better support on modern systems that use modern versions of unicode.")
localize('terminal.integrated.unicodeVersion.six', "Version 6 of unicode; this is an older version which should work better on older systems."),
localize('terminal.integrated.unicodeVersion.eleven', "Version 11 of unicode; this version provides better support on modern systems that use modern versions of unicode.")
],
default: '11',
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.")
Expand Down Expand Up @@ -505,7 +505,7 @@ const terminalConfiguration: IConfigurationNode = {
default: true
},
[TerminalSettingId.PersistentSessionReviveProcess]: {
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."),
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."),
type: 'string',
enum: ['onExit', 'onExitAndWindowClose', 'never'],
markdownEnumDescriptions: [
Expand All @@ -521,7 +521,7 @@ const terminalConfiguration: IConfigurationNode = {
default: true
},
[TerminalSettingId.AutoReplies]: {
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"`'),
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"`'),
type: 'object',
additionalProperties: {
oneOf: [{
Expand Down