Make renderTooltip render code part too

TypeStrong · Nov 27, 2019 · 6a6b24e · 6a6b24e
1 parent 3d3ee83
commit 6a6b24e
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 22 deletions.
diff --git a/dist/main/atom-ide/datatipProvider.js b/dist/main/atom-ide/datatipProvider.js
diff --git a/dist/main/atom-ide/datatipProvider.js.map b/dist/main/atom-ide/datatipProvider.js.map
diff --git a/dist/main/atom/tooltips/tooltipRenderer.js b/dist/main/atom/tooltips/tooltipRenderer.js
diff --git a/dist/main/atom/tooltips/tooltipRenderer.js.map b/dist/main/atom/tooltips/tooltipRenderer.js.map
diff --git a/dist/main/atom/tooltips/tooltipView.js b/dist/main/atom/tooltips/tooltipView.js
diff --git a/dist/main/atom/tooltips/tooltipView.js.map b/dist/main/atom/tooltips/tooltipView.js.map
diff --git a/lib/main/atom-ide/datatipProvider.tsx b/lib/main/atom-ide/datatipProvider.tsx
@@ -48,7 +48,7 @@ export class TSDatatipProvider implements DatatipProvider {
       })
       const data = result.body!
       const code = await highlightCode(data.displayString.replace(/^\(.+?\)\s+/, ""))
-      const [kind, docs] = renderTooltip(data, etch)
+      const [, kind, docs] = renderTooltip(data, etch)
       return {
         component: () => (
           <div className="atom-typescript-datatip-tooltip">

diff --git a/lib/main/atom/tooltips/tooltipRenderer.tsx b/lib/main/atom/tooltips/tooltipRenderer.tsx
@@ -1,4 +1,10 @@
 export function renderTooltip(data: protocol.QuickInfoResponseBody, etch: any) {
+  const code = (
+    <div className="atom-typescript-tooltip-tooltip-code">
+      {data.displayString.replace(/^\(.+?\)\s+/, "")}
+    </div>
+  )
+
   const kind = (
     <div className="atom-typescript-datatip-tooltip-kind">
       {data.kind}
@@ -25,7 +31,7 @@ export function renderTooltip(data: protocol.QuickInfoResponseBody, etch: any) {
     </div>
   )
 
-  return [kind, docs]
+  return [code, kind, docs]
 }
 
 function formatTagText(etch: any, tagText?: string) {

diff --git a/lib/main/atom/tooltips/tooltipView.tsx b/lib/main/atom/tooltips/tooltipView.tsx
@@ -43,18 +43,10 @@ export class TooltipView implements JSX.ElementClass {
   }
 
   public render() {
-    const code = this.props.info ? (
-      <div className="atom-typescript-tooltip-tooltip-code">
-        {this.props.info.displayString.replace(/^\(.+?\)\s+/, "")}
-      </div>
-    ) : null
-    const [kind, docs] = this.props.info ? renderTooltip(this.props.info, etch) : [null, null]
     return (
       <div className="atom-typescript-tooltip tooltip">
         <div className="tooltip-inner">
-          {code}
-          {kind}
-          {docs}
+          {this.props.info ? renderTooltip(this.props.info, etch) : null}
         </div>
       </div>
     )