Split MarkdownRenderOptions from FormattedTextRenderOptions

src/vs/base/browser/formattedTextRenderer.ts

@@ -4,20 +4,41 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from 'vs/base/browser/dom';
-import { createElement, IContentActionHandler, RenderOptions } from 'vs/base/browser/htmlContentRenderer';
+import { IMouseEvent } from 'vs/base/browser/mouseEvent';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 
-export function renderText(text: string, options: RenderOptions = {}): HTMLElement {
+export interface IContentActionHandler {
+	callback: (content: string, event?: IMouseEvent) => void;
+	readonly disposeables: DisposableStore;
+}
+
+export interface FormattedTextRenderOptions {
+	readonly className?: string;
+	readonly inline?: boolean;
+	readonly actionHandler?: IContentActionHandler;
+}
+
+export function renderText(text: string, options: FormattedTextRenderOptions = {}): HTMLElement {
 	const element = createElement(options);
 	element.textContent = text;
 	return element;
 }
 
-export function renderFormattedText(formattedText: string, options: RenderOptions = {}): HTMLElement {
+export function renderFormattedText(formattedText: string, options: FormattedTextRenderOptions = {}): HTMLElement {
 	const element = createElement(options);
 	_renderFormattedText(element, parseFormattedText(formattedText), options.actionHandler);
 	return element;
 }
 
+export function createElement(options: FormattedTextRenderOptions): HTMLElement {
+	const tagName = options.inline ? 'span' : 'div';
+	const element = document.createElement(tagName);
+	if (options.className) {
+		element.className = options.className;
+	}
+	return element;
+}
+
 class StringStream {
 	private source: string;
 	private index: number;
@@ -64,7 +85,7 @@ interface IFormatParseTree {
 	children?: IFormatParseTree[];
 }
 
-export function _renderFormattedText(element: Node, treeNode: IFormatParseTree, actionHandler?: IContentActionHandler) {
+function _renderFormattedText(element: Node, treeNode: IFormatParseTree, actionHandler?: IContentActionHandler) {
 	let child: Node | undefined;
 
 	if (treeNode.type === FormatType.Text) {
@@ -98,7 +119,7 @@ export function _renderFormattedText(element: Node, treeNode: IFormatParseTree,
 	}
 }
 
-export function parseFormattedText(content: string): IFormatParseTree {
+function parseFormattedText(content: string): IFormatParseTree {
 
 	const root: IFormatParseTree = {
 		type: FormatType.Root,

src/vs/base/browser/htmlContentRenderer.ts

@@ -4,43 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from 'vs/base/browser/dom';
+import { createElement, FormattedTextRenderOptions } from 'vs/base/browser/formattedTextRenderer';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { IMarkdownString, parseHrefAndDimensions, removeMarkdownEscapes } from 'vs/base/common/htmlContent';
 import { defaultGenerator } from 'vs/base/common/idGenerator';
-import { escape } from 'vs/base/common/strings';
-import { removeMarkdownEscapes, IMarkdownString, parseHrefAndDimensions } from 'vs/base/common/htmlContent';
 import * as marked from 'vs/base/common/marked/marked';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { URI } from 'vs/base/common/uri';
 import { parse } from 'vs/base/common/marshalling';
 import { cloneAndChange } from 'vs/base/common/objects';
+import { escape } from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';
 
-export interface IContentActionHandler {
-	callback: (content: string, event?: IMouseEvent) => void;
-	readonly disposeables: DisposableStore;
-}
-
-export interface RenderOptions {
-	className?: string;
-	inline?: boolean;
-	actionHandler?: IContentActionHandler;
+export interface MarkdownRenderOptions extends FormattedTextRenderOptions {
 	codeBlockRenderer?: (modeId: string, value: string) => Promise<string>;
 	codeBlockRenderCallback?: () => void;
 }
 
-export function createElement(options: RenderOptions): HTMLElement {
-	const tagName = options.inline ? 'span' : 'div';
-	const element = document.createElement(tagName);
-	if (options.className) {
-		element.className = options.className;
-	}
-	return element;
-}
-
 /**
  * Create html nodes for the given content element.
  */
-export function renderMarkdown(markdown: IMarkdownString, options: RenderOptions = {}): HTMLElement {
+export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRenderOptions = {}): HTMLElement {
 	const element = createElement(options);
 
 	const _uriMassage = function (part: string): string {

src/vs/base/browser/ui/inputbox/inputBox.ts

@@ -8,7 +8,7 @@ import 'vs/css!./inputBox';
 import * as nls from 'vs/nls';
 import * as Bal from 'vs/base/browser/browser';
 import * as dom from 'vs/base/browser/dom';
-import { RenderOptions } from 'vs/base/browser/htmlContentRenderer';
+import { MarkdownRenderOptions } from 'vs/base/browser/htmlContentRenderer';
 import { renderFormattedText, renderText } from 'vs/base/browser/formattedTextRenderer';
 import * as aria from 'vs/base/browser/ui/aria/aria';
 import { IAction } from 'vs/base/common/actions';
@@ -439,7 +439,7 @@ export class InputBox extends Widget {
 				div = dom.append(container, $('.monaco-inputbox-container'));
 				layout();
 
-				const renderOptions: RenderOptions = {
+				const renderOptions: MarkdownRenderOptions = {
 					inline: true,
 					className: 'monaco-inputbox-message'
 				};

src/vs/editor/contrib/markdown/markdownRenderer.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IMarkdownString } from 'vs/base/common/htmlContent';
-import { renderMarkdown, RenderOptions } from 'vs/base/browser/htmlContentRenderer';
+import { renderMarkdown, MarkdownRenderOptions } from 'vs/base/browser/htmlContentRenderer';
 import { IOpenerService, NullOpenerService } from 'vs/platform/opener/common/opener';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { URI } from 'vs/base/common/uri';
@@ -33,7 +33,7 @@ export class MarkdownRenderer extends Disposable {
 		super();
 	}
 
-	private getOptions(disposeables: DisposableStore): RenderOptions {
+	private getOptions(disposeables: DisposableStore): MarkdownRenderOptions {
 		return {
 			codeBlockRenderer: (languageAlias, value) => {
 				// In markdown,