Format hover with Markdown. See

#102

Author: angelozerr

eclipse/ts.eclipse.ide.ui/META-INF/MANIFEST.MF

@@ -25,7 +25,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.search,
  org.eclipse.debug.ui,
  org.eclipse.core.variables,
- org.eclipse.core.externaltools
+ org.eclipse.core.externaltools,
+ org.eclipse.tm4e.markdown,
+ org.eclipse.tm4e.core,
+ org.eclipse.tm4e.ui
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: ts.eclipse.ide.ui.TypeScriptUIPlugin
 Import-Package: com.eclipsesource.json;version="[0.9.4,0.9.5)"

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/hover/HTMLTypeScriptQuickInfoCollector.java

@@ -1,16 +1,24 @@
 package ts.eclipse.ide.ui.hover;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.text.IDocument;
+
 import ts.client.quickinfo.ITypeScriptQuickInfoCollector;
 import ts.eclipse.ide.ui.utils.HTMLTypeScriptPrinter;
 
 public class HTMLTypeScriptQuickInfoCollector implements ITypeScriptQuickInfoCollector {
 
+	private final IFile tsFile;
 	private String html;
 
+	public HTMLTypeScriptQuickInfoCollector(IFile tsFile) {
+		this.tsFile = tsFile;;
+	}
+
 	@Override
 	public void setInfo(String kind, String kindModifiers, int startLine, int startOffset, int endLine, int endOffset,
 			String displayString, String documentation) {
-		this.html = HTMLTypeScriptPrinter.getQuickInfo(kind, kindModifiers, displayString, documentation);
+		this.html = HTMLTypeScriptPrinter.getQuickInfo(kind, kindModifiers, displayString, documentation, tsFile);
 	}
 
 	public String getInfo() {

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/hover/TypeScriptHover.java

@@ -20,6 +20,7 @@
 import ts.eclipse.ide.core.resources.IIDETypeScriptProject;
 import ts.eclipse.ide.core.utils.TypeScriptResourceUtil;
 import ts.eclipse.ide.ui.TypeScriptUIPlugin;
+import ts.eclipse.ide.ui.preferences.TypeScriptUIPreferenceConstants;
 import ts.eclipse.jface.text.html.TypeScriptBrowserInformationControlInput;
 import ts.resources.ITypeScriptFile;
 import ts.utils.StringUtils;
@@ -52,7 +53,9 @@ public Object getHoverInfo2(ITextViewer textViewer, IRegion hoverRegion) {
 				int position = hoverRegion.getOffset();
 				ITypeScriptFile tsFile = tsProject.openFile(scriptFile, textViewer.getDocument());
 
-				HTMLTypeScriptQuickInfoCollector collector = new HTMLTypeScriptQuickInfoCollector();
+				HTMLTypeScriptQuickInfoCollector collector = new HTMLTypeScriptQuickInfoCollector(
+						TypeScriptUIPlugin.getDefault().getPreferenceStore().getBoolean(
+								TypeScriptUIPreferenceConstants.USE_TEXMATE_FOR_SYNTAX_COLORING) ? scriptFile : null);
 				tsProject.quickInfo(tsFile, position, collector);
 
 				String text = collector.getInfo();

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/utils/HTMLTypeScriptPrinter.java

@@ -5,12 +5,19 @@
 import java.io.InputStreamReader;
 import java.net.URL;
 
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.internal.text.html.HTMLPrinter;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.graphics.RGB;
+import org.eclipse.tm4e.markdown.TMHTMLRenderer;
+import org.eclipse.tm4e.markdown.marked.HTMLRenderer;
+import org.eclipse.tm4e.markdown.marked.IRenderer;
+import org.eclipse.tm4e.markdown.marked.Marked;
+import org.eclipse.tm4e.ui.TMUIPlugin;
+import org.eclipse.tm4e.ui.themes.ITheme;
 import org.osgi.framework.Bundle;
 
 import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
@@ -37,23 +44,34 @@ public static void setColorInfoForeground(RGB colorInfoForeground) {
 		HTMLTypeScriptPrinter.colorInfoForeground = colorInfoForeground;
 	}
 
-	public static String getQuickInfo(String kind, String kindModifiers, String displayString, String documentation) {
+	public static String getQuickInfo(String kind, String kindModifiers, String displayString, String documentation,
+			IFile tsFile) {
 		StringBuffer info = new StringBuffer();
 		ImageDescriptor descriptor = null; // TypeScriptImagesRegistry.getTypeScriptImageDescriptor(kind,
 											// kindModifiers, null);
 		startPage(info, null, descriptor);
 		if (!StringUtils.isEmpty(displayString)) {
-			info.append("<pre class=\"displayString\">");
-			info.append(displayString);
-			info.append("</pre>");
+			if (tsFile == null) {
+				info.append("<pre class=\"displayString\">");
+				info.append(displayString);
+				info.append("</pre>");
+			} else {
+				IRenderer renderer = createMarkdownRenderer(tsFile);
+				info.append(Marked.parse("```ts\n" + displayString + "```", renderer));
+			}
 		}
 		if (!StringUtils.isEmpty(documentation)) {
-			HTMLPrinter.addParagraph(info, documentation);
+			IRenderer renderer = createMarkdownRenderer(tsFile);
+			info.append(Marked.parse(documentation, renderer));
 		}
 		endPage(info);
 		return info.toString();
 	}
 
+	private static IRenderer createMarkdownRenderer(IFile file) {
+		return file != null ? new TMHTMLRenderer(file.getFileExtension()) : new HTMLRenderer();
+	}
+
 	public static String getError(String message) {
 		StringBuffer info = new StringBuffer();
 		ImageDescriptor descriptor = null;
@@ -66,8 +84,9 @@ public static String getError(String message) {
 	}
 
 	public static void endPage(StringBuffer buffer) {
+		ITheme theme = TMUIPlugin.getThemeManager().getDefaultTheme();
 		HTMLPrinter.insertPageProlog(buffer, 0, colorInfoForeground, colorInfoBackround,
-				HTMLTypeScriptPrinter.getStyleSheet());
+				HTMLTypeScriptPrinter.getStyleSheet() + theme.toCSSStyleSheet());
 		HTMLPrinter.addPageEpilog(buffer);
 	}
 
@@ -171,7 +190,8 @@ public static void startPage(StringBuffer buf, String title, ImageDescriptor des
 																									// $NON-NLS-1$
 																									// $NON-NLS-1$
 																									// $NON-NLS-1$
-																									//$NON-NLS-1$ //$NON-NLS-3$
+																									// $NON-NLS-1$
+																									// //$NON-NLS-3$
 			buf.append("<span ").append(tooltip).append("style=\"").append(imageStyle). //$NON-NLS-1$ //$NON-NLS-2$
 					append("filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='").append(imageSrcPath) //$NON-NLS-1$
 					.append("')\"></span>\n"); //$NON-NLS-1$