From 151c443411dc2908c2356a2eaf79f5d2747ac44f Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 29 Apr 2020 08:27:23 -0700 Subject: [PATCH] Use a non-wrapping markdown code block for env vars Fixes #96250 --- .../browser/environmentVariableInfo.ts | 69 ++++++++++--------- .../terminal/browser/widgets/hoverWidget.ts | 13 +++- 2 files changed, 50 insertions(+), 32 deletions(-) diff --git a/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.ts b/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.ts index d1d970c82b3..09750a14e65 100644 --- a/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.ts +++ b/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.ts @@ -19,8 +19,37 @@ export class EnvironmentVariableInfoStale implements IEnvironmentVariableInfo { } getInfo(): string { - let info = localize('extensionEnvironmentContribution', "Extensions want to make the following changes to the terminal's environment:"); - info += `\n\n${this._summarizeDiff()}`; + const addsAndChanges: string[] = []; + const removals: string[] = []; + this._diff.added.forEach((mutators, variable) => { + mutators.forEach(mutator => addsAndChanges.push(mutatorTypeLabel(mutator.type, mutator.value, variable))); + }); + this._diff.changed.forEach((mutators, variable) => { + mutators.forEach(mutator => addsAndChanges.push(mutatorTypeLabel(mutator.type, mutator.value, variable))); + }); + this._diff.removed.forEach((mutators, variable) => { + mutators.forEach(mutator => removals.push(mutatorTypeLabel(mutator.type, mutator.value, variable))); + }); + + let info: string = ''; + + if (addsAndChanges.length > 0) { + info = localize('extensionEnvironmentContributionChanges', "Extensions want to make the following changes to the terminal's environment:"); + info += '\n\n'; + info += '```\n'; + info += addsAndChanges.join('\n'); + info += '\n```'; + } + + if (removals.length > 0) { + info += info.length > 0 ? '\n\n' : ''; + info += localize('extensionEnvironmentContributionRemoval', "Extensions want to remove these existing changes from the terminal's environment:"); + info += '\n\n'; + info += '```\n'; + info += removals.join('\n'); + info += '\n```'; + } + return info; } @@ -35,27 +64,6 @@ export class EnvironmentVariableInfoStale implements IEnvironmentVariableInfo { commandId: TERMINAL_COMMAND_ID.RELAUNCH }]; } - - private _summarizeDiff(): string { - const summary: string[] = []; - this._diff.added.forEach((mutators, variable) => { - mutators.forEach(mutator => { - summary.push(`- ${mutatorTypeLabel(mutator.type, mutator.value, variable)}`); - }); - }); - this._diff.changed.forEach((mutators, variable) => { - mutators.forEach(mutator => { - summary.push(`- ${mutatorTypeLabel(mutator.type, mutator.value, variable)}`); - }); - }); - this._diff.removed.forEach((mutators, variable) => { - mutators.forEach(mutator => { - const removePrefixText = localize('removeEnvironmentVariableChange', "Remove: {0}", mutatorTypeLabel(mutator.type, mutator.value, variable)); - summary.push(`- ${removePrefixText}`); - }); - }); - return summary.join('\n'); - } } export class EnvironmentVariableInfoChangesActive implements IEnvironmentVariableInfo { @@ -67,13 +75,12 @@ export class EnvironmentVariableInfoChangesActive implements IEnvironmentVariabl } getInfo(): string { - const info: string[] = ['Extensions have made changes to this terminal\'s environment:', '']; + const changes: string[] = []; this._collection.map.forEach((mutators, variable) => { - mutators.forEach(mutator => { - info.push(`- ${mutatorTypeLabel(mutator.type, mutator.value, variable)}`); - }); + mutators.forEach(mutator => changes.push(mutatorTypeLabel(mutator.type, mutator.value, variable))); }); - return info.join('\n'); + const message = localize('extensionEnvironmentContributionInfo', "Extensions have made changes to this terminal's environment"); + return message + '\n\n```\n' + changes.join('\n') + '\n```'; } getIcon(): string { @@ -83,8 +90,8 @@ export class EnvironmentVariableInfoChangesActive implements IEnvironmentVariabl function mutatorTypeLabel(type: EnvironmentVariableMutatorType, value: string, variable: string): string { switch (type) { - case EnvironmentVariableMutatorType.Prepend: return localize('prependValueToEnvironmentVariableMarkdown', "Add `{0}` to the beginning of `{1}`", value, variable); - case EnvironmentVariableMutatorType.Append: return localize('appendValueToEnvironmentVariableMarkdown', "Add `{0}` to the end of `{1}`", value, variable); - default: return localize('replaceEnvironmentVariableWithValueMarkdown', "Replace `{1}`\'s value with `{0}`", value, variable); + case EnvironmentVariableMutatorType.Prepend: return `${variable}=${value}\${env:${variable}}`; + case EnvironmentVariableMutatorType.Append: return `${variable}=\${env:${variable}}${value}`; + default: return `${variable}=${value}`; } } diff --git a/src/vs/workbench/contrib/terminal/browser/widgets/hoverWidget.ts b/src/vs/workbench/contrib/terminal/browser/widgets/hoverWidget.ts index 54799091ba2..40a9a34ee0b 100644 --- a/src/vs/workbench/contrib/terminal/browser/widgets/hoverWidget.ts +++ b/src/vs/workbench/contrib/terminal/browser/widgets/hoverWidget.ts @@ -15,6 +15,8 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IHoverTarget, HorizontalAnchorSide, VerticalAnchorSide } from 'vs/workbench/contrib/terminal/browser/widgets/widgets'; import { KeyCode } from 'vs/base/common/keyCodes'; import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; +import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; +import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions'; const $ = dom.$; @@ -39,7 +41,8 @@ export class HoverWidget extends Widget { private _text: IMarkdownString, private _linkHandler: (url: string) => void, private _actions: { label: string, iconClass?: string, run: (target: HTMLElement) => void, commandId: string }[] | undefined, - @IKeybindingService private readonly _keybindingService: IKeybindingService + @IKeybindingService private readonly _keybindingService: IKeybindingService, + @IConfigurationService private readonly _configurationService: IConfigurationService ) { super(); this._containerDomNode = document.createElement('div'); @@ -71,6 +74,14 @@ export class HoverWidget extends Widget { actionHandler: { callback: (content) => this._linkHandler(content), disposeables: this._messageListeners + }, + codeBlockRenderer: async (_, value) => { + const fontFamily = this._configurationService.getValue('editor').fontFamily || EDITOR_FONT_DEFAULTS.fontFamily; + return `${value.replace(/\n/g, '
')}`; + }, + codeBlockRenderCallback: () => { + contentsElement.classList.add('code-hover-contents'); + this.layout(); } }); contentsElement.appendChild(markdownElement); -- GitLab