From 4fed4a37f8a8d6acd646c10c7413eefdae1c399a Mon Sep 17 00:00:00 2001 From: Hugh Lilly Date: Sat, 19 Nov 2022 11:14:50 +1300 Subject: [PATCH 1/5] hyphenate "double-clicking" in settings descriptions --- src/vs/editor/common/config/editorConfigurationSchema.ts | 2 +- .../contrib/search/browser/search.contribution.ts | 8 ++++---- .../contrib/terminal/common/terminalConfiguration.ts | 2 +- src/vs/workbench/electron-sandbox/desktop.contribution.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/vs/editor/common/config/editorConfigurationSchema.ts b/src/vs/editor/common/config/editorConfigurationSchema.ts index b6f8d6ad7fa..10d75f22d2c 100644 --- a/src/vs/editor/common/config/editorConfigurationSchema.ts +++ b/src/vs/editor/common/config/editorConfigurationSchema.ts @@ -88,7 +88,7 @@ const editorConfiguration: IConfigurationNode = { 'editor.stablePeek': { type: 'boolean', default: false, - markdownDescription: nls.localize('stablePeek', "Keep peek editors open even when double clicking their content or when hitting `Escape`.") + markdownDescription: nls.localize('stablePeek', "Keep peek editors open even when double-clicking their content or when hitting `Escape`.") }, 'editor.maxTokenizationLineLength': { type: 'integer', diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts index b6f74172133..ab9eb74421a 100644 --- a/src/vs/workbench/contrib/search/browser/search.contribution.ts +++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts @@ -300,11 +300,11 @@ configurationRegistry.registerConfiguration({ enum: ['selectWord', 'goToLocation', 'openLocationToSide'], default: 'goToLocation', enumDescriptions: [ - nls.localize('search.searchEditor.doubleClickBehaviour.selectWord', "Double clicking selects the word under the cursor."), - nls.localize('search.searchEditor.doubleClickBehaviour.goToLocation', "Double clicking opens the result in the active editor group."), - nls.localize('search.searchEditor.doubleClickBehaviour.openLocationToSide', "Double clicking opens the result in the editor group to the side, creating one if it does not yet exist."), + nls.localize('search.searchEditor.doubleClickBehaviour.selectWord', "double-clicking selects the word under the cursor."), + nls.localize('search.searchEditor.doubleClickBehaviour.goToLocation', "double-clicking opens the result in the active editor group."), + nls.localize('search.searchEditor.doubleClickBehaviour.openLocationToSide', "double-clicking opens the result in the editor group to the side, creating one if it does not yet exist."), ], - markdownDescription: nls.localize('search.searchEditor.doubleClickBehaviour', "Configure effect of double clicking a result in a search editor.") + markdownDescription: nls.localize('search.searchEditor.doubleClickBehaviour', "Configure effect of double-clicking a result in a search editor.") }, 'search.searchEditor.reusePriorSearchConfiguration': { type: 'boolean', diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts index adfc5269b62..44c11825dbd 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts @@ -121,7 +121,7 @@ const terminalConfiguration: IConfigurationNode = { enum: ['singleClick', 'doubleClick'], enumDescriptions: [ localize('terminal.integrated.tabs.focusMode.singleClick', "Focus the terminal when clicking a terminal tab"), - localize('terminal.integrated.tabs.focusMode.doubleClick', "Focus the terminal when double clicking a terminal tab") + localize('terminal.integrated.tabs.focusMode.doubleClick', "Focus the terminal when double-clicking a terminal tab") ], default: 'doubleClick', description: localize('terminal.integrated.tabs.focusMode', "Controls whether focusing the terminal of a tab happens on double or single click.") diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts index 125e0a8a3c0..db923c96fc2 100644 --- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts +++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts @@ -196,7 +196,7 @@ import product from 'vs/platform/product/common/product'; 'type': 'boolean', 'default': false, 'scope': ConfigurationScope.APPLICATION, - 'markdownDescription': localize('window.doubleClickIconToClose', "If enabled, double clicking the application icon in the title bar will close the window and the window cannot be dragged by the icon. This setting only has an effect when `#window.titleBarStyle#` is set to `custom`.") + 'markdownDescription': localize('window.doubleClickIconToClose', "If enabled, double-clicking the application icon in the title bar will close the window and the window cannot be dragged by the icon. This setting only has an effect when `#window.titleBarStyle#` is set to `custom`.") }, 'window.titleBarStyle': { 'type': 'string', From f7cb6e80274d8f45144b44001e06381d7aa36286 Mon Sep 17 00:00:00 2001 From: Hugh Lilly Date: Sat, 19 Nov 2022 11:16:20 +1300 Subject: [PATCH 2/5] copyedit `window.doubleClickIconToClose` string --- src/vs/workbench/electron-sandbox/desktop.contribution.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts index db923c96fc2..cc78aa89b04 100644 --- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts +++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts @@ -196,7 +196,7 @@ import product from 'vs/platform/product/common/product'; 'type': 'boolean', 'default': false, 'scope': ConfigurationScope.APPLICATION, - 'markdownDescription': localize('window.doubleClickIconToClose', "If enabled, double-clicking the application icon in the title bar will close the window and the window cannot be dragged by the icon. This setting only has an effect when `#window.titleBarStyle#` is set to `custom`.") + 'markdownDescription': localize('window.doubleClickIconToClose', "If enabled, this setting will close the window when the application icon in the title bar is double-clicked. The window will not be able to be dragged by the icon. This setting is effective only if `#window.titleBarStyle#` is set to `custom`.") }, 'window.titleBarStyle': { 'type': 'string', From 0a35108ac667519a4d6cba3d66b6e7ef8c1bcfb4 Mon Sep 17 00:00:00 2001 From: Hugh Lilly Date: Sat, 19 Nov 2022 11:17:10 +1300 Subject: [PATCH 3/5] hyphenate "double-clicking" in 3 comments --- src/vs/editor/standalone/browser/standaloneCodeEditor.ts | 2 +- src/vs/monaco.d.ts | 2 +- src/vs/workbench/browser/parts/editor/tabsTitleControl.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts index 9f15f355956..dfa8aa29f3f 100644 --- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts +++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts @@ -132,7 +132,7 @@ export interface IGlobalEditorOptions { */ 'semanticHighlighting.enabled'?: true | false | 'configuredByTheme'; /** - * Keep peek editors open even when double clicking their content or when hitting `Escape`. + * Keep peek editors open even when double-clicking their content or when hitting `Escape`. * Defaults to false. */ stablePeek?: boolean; diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index e2f32ae9995..adcead8c6c9 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -1247,7 +1247,7 @@ declare namespace monaco.editor { */ 'semanticHighlighting.enabled'?: true | false | 'configuredByTheme'; /** - * Keep peek editors open even when double clicking their content or when hitting `Escape`. + * Keep peek editors open even when double-clicking their content or when hitting `Escape`. * Defaults to false. */ stablePeek?: boolean; diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index 399fc584408..479acefdd8d 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -240,7 +240,7 @@ export class TabsTitleControl extends TitleControl { } })); - // New file when double clicking on tabs container (but not tabs) + // New file when double-clicking on tabs container (but not tabs) for (const eventType of [TouchEventType.Tap, EventType.DBLCLICK]) { this._register(addDisposableListener(tabsContainer, eventType, (e: MouseEvent | GestureEvent) => { if (eventType === EventType.DBLCLICK) { From 20d8a0c78ded2a490539406be7e7b56bad608b5d Mon Sep 17 00:00:00 2001 From: Hugh Lilly Date: Tue, 22 Nov 2022 08:29:33 +1300 Subject: [PATCH 4/5] preserve case --- .../workbench/contrib/search/browser/search.contribution.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts index ab9eb74421a..4ae3790e06f 100644 --- a/src/vs/workbench/contrib/search/browser/search.contribution.ts +++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts @@ -300,9 +300,9 @@ configurationRegistry.registerConfiguration({ enum: ['selectWord', 'goToLocation', 'openLocationToSide'], default: 'goToLocation', enumDescriptions: [ - nls.localize('search.searchEditor.doubleClickBehaviour.selectWord', "double-clicking selects the word under the cursor."), - nls.localize('search.searchEditor.doubleClickBehaviour.goToLocation', "double-clicking opens the result in the active editor group."), - nls.localize('search.searchEditor.doubleClickBehaviour.openLocationToSide', "double-clicking opens the result in the editor group to the side, creating one if it does not yet exist."), + nls.localize('search.searchEditor.doubleClickBehaviour.selectWord', "Double-clicking selects the word under the cursor."), + nls.localize('search.searchEditor.doubleClickBehaviour.goToLocation', "Double-clicking opens the result in the active editor group."), + nls.localize('search.searchEditor.doubleClickBehaviour.openLocationToSide', "Double-clicking opens the result in the editor group to the side, creating one if it does not yet exist."), ], markdownDescription: nls.localize('search.searchEditor.doubleClickBehaviour', "Configure effect of double-clicking a result in a search editor.") }, From 925b335bb9dd30554ae898f4512b5b78931d772a Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Thu, 15 Dec 2022 10:54:54 -0800 Subject: [PATCH 5/5] Replace other non-hyphenated double-click cases I used ^[^*\/\/]+double click to find the non-comment cases --- extensions/markdown-language-features/package.nls.json | 2 +- src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.ts | 2 +- src/vs/workbench/browser/workbench.contribution.ts | 6 +++--- .../contrib/notebook/browser/view/cellParts/codeCell.ts | 2 +- .../notebook/browser/view/cellParts/collapsedCellOutput.ts | 2 +- .../contrib/notebook/browser/view/cellParts/markupCell.ts | 2 +- .../notebook/browser/view/renderers/backLayerWebView.ts | 2 +- .../contrib/terminal/common/terminalConfiguration.ts | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json index 28a176adf22..676d875d3b9 100644 --- a/extensions/markdown-language-features/package.nls.json +++ b/extensions/markdown-language-features/package.nls.json @@ -4,7 +4,7 @@ "markdown.preview.breaks.desc": "Sets how line-breaks are rendered in the Markdown preview. Setting it to 'true' creates a
for newlines inside paragraphs.", "markdown.preview.linkify": "Convert URL-like text to links in the Markdown preview.", "markdown.preview.typographer": "Enable some language-neutral replacement and quotes beautification in the Markdown preview.", - "markdown.preview.doubleClickToSwitchToEditor.desc": "Double click in the Markdown preview to switch to the editor.", + "markdown.preview.doubleClickToSwitchToEditor.desc": "Double-click in the Markdown preview to switch to the editor.", "markdown.preview.fontFamily.desc": "Controls the font family used in the Markdown preview.", "markdown.preview.fontSize.desc": "Controls the font size in pixels used in the Markdown preview.", "markdown.preview.lineHeight.desc": "Controls the line height used in the Markdown preview. This number is relative to the font size.", diff --git a/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.ts b/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.ts index f9781fcf029..4b33142996d 100644 --- a/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.ts +++ b/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.ts @@ -96,7 +96,7 @@ export class InlayHintsHover extends MarkdownHoverParticipant implements IEditor } // (1.2) Inlay dbl-click gesture if (isNonEmptyArray(part.item.hint.textEdits)) { - executor.emitOne(new MarkdownHover(this, anchor.range, [new MarkdownString().appendText(localize('hint.dbl', "Double click to insert"))], false, 10001)); + executor.emitOne(new MarkdownHover(this, anchor.range, [new MarkdownString().appendText(localize('hint.dbl', "Double-click to insert"))], false, 10001)); } // (2) Inlay Label Part Tooltip diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts index c8825372a32..2d2eb4b0df9 100644 --- a/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts @@ -187,17 +187,17 @@ const registry = Registry.as(ConfigurationExtensions.Con }, 'workbench.editor.enablePreview': { 'type': 'boolean', - 'description': localize('enablePreview', "Controls whether opened editors show as preview editors. Preview editors do not stay open, are reused until explicitly set to be kept open (via double click or editing), and show file names in italics."), + 'description': localize('enablePreview', "Controls whether opened editors show as preview editors. Preview editors do not stay open, are reused until explicitly set to be kept open (via double-click or editing), and show file names in italics."), 'default': true }, 'workbench.editor.enablePreviewFromQuickOpen': { 'type': 'boolean', - 'markdownDescription': localize('enablePreviewFromQuickOpen', "Controls whether editors opened from Quick Open show as preview editors. Preview editors do not stay open, and are reused until explicitly set to be kept open (via double click or editing). When enabled, hold Ctrl before selection to open an editor as a non-preview. This value is ignored when `#workbench.editor.enablePreview#` is disabled."), + 'markdownDescription': localize('enablePreviewFromQuickOpen', "Controls whether editors opened from Quick Open show as preview editors. Preview editors do not stay open, and are reused until explicitly set to be kept open (via double-click or editing). When enabled, hold Ctrl before selection to open an editor as a non-preview. This value is ignored when `#workbench.editor.enablePreview#` is disabled."), 'default': false }, 'workbench.editor.enablePreviewFromCodeNavigation': { 'type': 'boolean', - 'markdownDescription': localize('enablePreviewFromCodeNavigation', "Controls whether editors remain in preview when a code navigation is started from them. Preview editors do not stay open, and are reused until explicitly set to be kept open (via double click or editing). This value is ignored when `#workbench.editor.enablePreview#` is disabled."), + 'markdownDescription': localize('enablePreviewFromCodeNavigation', "Controls whether editors remain in preview when a code navigation is started from them. Preview editors do not stay open, and are reused until explicitly set to be kept open (via double-click or editing). This value is ignored when `#workbench.editor.enablePreview#` is disabled."), 'default': false }, 'workbench.editor.closeOnFileDelete': { diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts index fbf438f5162..d81095cba2c 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts @@ -373,7 +373,7 @@ export class CodeCell extends Disposable { const expandIcon = DOM.$('span.expandInputIcon'); const keybinding = this.keybindingService.lookupKeybinding(EXPAND_CELL_INPUT_COMMAND_ID); if (keybinding) { - element.title = localize('cellExpandInputButtonLabelWithDoubleClick', "Double click to expand cell input ({0})", keybinding.getLabel()); + element.title = localize('cellExpandInputButtonLabelWithDoubleClick', "Double-click to expand cell input ({0})", keybinding.getLabel()); expandIcon.title = localize('cellExpandInputButtonLabel', "Expand Cell Input ({0})", keybinding.getLabel()); } diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.ts index 96cda1a0fcb..f14f9750842 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.ts @@ -27,7 +27,7 @@ export class CollapsedCellOutput extends CellContentPart { const keybinding = keybindingService.lookupKeybinding(EXPAND_CELL_OUTPUT_COMMAND_ID); if (keybinding) { - placeholder.title = localize('cellExpandOutputButtonLabelWithDoubleClick', "Double click to expand cell output ({0})", keybinding.getLabel()); + placeholder.title = localize('cellExpandOutputButtonLabelWithDoubleClick', "Double-click to expand cell output ({0})", keybinding.getLabel()); cellOutputCollapseContainer.title = localize('cellExpandOutputButtonLabel', "Expand Cell Output (${0})", keybinding.getLabel()); } diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.ts index 212fc821b70..112dd56ed1a 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.ts @@ -267,7 +267,7 @@ export class MarkupCell extends Disposable { expandIcon.classList.add(...CSSIcon.asClassNameArray(Codicon.more)); const keybinding = this.keybindingService.lookupKeybinding(EXPAND_CELL_INPUT_COMMAND_ID); if (keybinding) { - element.title = localize('cellExpandInputButtonLabelWithDoubleClick', "Double click to expand cell input ({0})", keybinding.getLabel()); + element.title = localize('cellExpandInputButtonLabelWithDoubleClick', "Double-click to expand cell input ({0})", keybinding.getLabel()); expandIcon.title = localize('cellExpandInputButtonLabel', "Expand Cell Input ({0})", keybinding.getLabel()); } diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts index 4743e6b7640..97021445aea 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts @@ -249,7 +249,7 @@ export class BackLayerWebView extends Themable { 'notebook-cell-output-line-height': `${this.options.outputLineHeight}px`, 'notebook-cell-output-max-height': `${this.options.outputLineHeight * this.options.outputLineLimit}px`, 'notebook-cell-output-font-family': this.options.outputFontFamily || this.options.fontFamily, - 'notebook-cell-markup-empty-content': nls.localize('notebook.emptyMarkdownPlaceholder', "Empty markdown cell, double click or press enter to edit."), + 'notebook-cell-markup-empty-content': nls.localize('notebook.emptyMarkdownPlaceholder', "Empty markdown cell, double-click or press enter to edit."), 'notebook-cell-renderer-not-found-error': nls.localize({ key: 'notebook.error.rendererNotFound', comment: ['$0 is a placeholder for the mime type'] diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts index 16eb2b36950..72193e83c6d 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts @@ -437,7 +437,7 @@ const terminalConfiguration: IConfigurationNode = { default: true }, [TerminalSettingId.WordSeparators]: { - description: localize('terminal.integrated.wordSeparators', "A string containing all characters to be considered word separators by the double click to select word feature."), + description: localize('terminal.integrated.wordSeparators', "A string containing all characters to be considered word separators by the double-click to select word feature."), type: 'string', // allow-any-unicode-next-line default: ' ()[]{}\',"`─‘’'