Merge pull request #100 from atom-ide-community/atom-ide-base

Author: aminya

lib/datatip-manager.js

@@ -3,9 +3,6 @@
 import { CompositeDisposable, Disposable, Range, Point, TextEditor, CursorPositionChangedEventommandEvent } from "atom"
 import type { DatatipProvider, MarkdownService } from "atom-ide-base"
 import { ViewContainer } from "atom-ide-base/commons-ui/float-pane/ViewContainer"
-import { getDocumentationHtml } from "atom-ide-base/commons-ui/float-pane/HTMLView"
-import { getSnippetHtml } from "atom-ide-base/commons-ui/float-pane/SnippetView"
-
 import { ProviderRegistry } from "atom-ide-base/commons-atom/ProviderRegistry"
 
 export class DataTipManager {
@@ -77,23 +74,18 @@ export class DataTipManager {
      * only if the cursor is not moving for more than hoverTime the data tip functionality is triggered
      */
     this.cursorMoveTimer = null
-    /**
-     * a reference to the markdown rendering service
-     * @type {MarkdownService}
-     */
-    this.renderer = null
 
     /** The time that the mouse/cursor should hover/stay to show a datatip. Also specifies the time that the datatip is still shown when the mouse/cursor moves [ms]. */
     this.hoverTime = atom.config.get("atom-ide-datatip.hoverTime")
+
+    // glow on hover
+    this.glowClass = atom.config.get("atom-ide-datatip.glowOnHover") ? "datatip-glow" : ""
   }
 
   /**
    * initialization routine retrieving a reference  to the markdown service
-   * @param {MarkdownService} renderer the markdown rendering service reference
    */
-  initialize(renderer) {
-    this.renderer = renderer
-
+  initialize() {
     this.subscriptions.add(
       atom.workspace.observeTextEditors((editor) => {
         const disposable = this.watchEditor(editor)
@@ -357,36 +349,45 @@ export class DataTipManager {
         if (datatip.component) {
           const dataTipView = new ViewContainer({
             component: {
-              element: datatip.component,
+              component: datatip.component,
               containerClassName: "datatip-container",
               contentClassName: "datatip-content",
             },
+            className: this.glowClass
           })
           this.dataTipMarkerDisposables = this.mountDataTipWithMarker(editor, datatip.range, position, dataTipView)
         } else if (datatip.markedStrings.length > 0) {
           const grammar = editor.getGrammar().scopeName.toLowerCase()
-          const snippetHtml = await getSnippetHtml(
-            datatip.markedStrings.filter((t) => t.type === "snippet").map((t) => t.value),
-            grammar,
-            this.renderer
-          )
-          const documentationHtml = await getDocumentationHtml(
-            datatip.markedStrings.filter((t) => t.type === "markdown").map((t) => t.value),
-            grammar,
-            this.renderer
-          )
-          const dataTipView = new ViewContainer({
-            snippet: {
-              element: snippetHtml,
+
+          let snippetData: string[] = []
+          let markdownData: string[] = []
+          for (const markedString of datatip.markedStrings) {
+            if (markedString.type === "snippet") {
+              snippetData.push(markedString.value)
+            } else if (markedString.type === "markdown") {
+              markdownData.push(markedString.value)
+            }
+          }
+
+          let snippet, markdown = undefined
+          if (snippetData.length > 0) {
+            snippet = {
+              snippet: snippetData,
+              grammarName: grammar,
               containerClassName: "datatip-container",
               contentClassName: "datatip-snippet",
-            },
-            html: {
-              element: documentationHtml,
+            }
+          }
+          if (markdownData.length > 0) {
+            markdown = {
+              markdown: markdownData,
+              grammarName: grammar,
               containerClassName: "datatip-container",
               contentClassName: "datatip-marked",
-            },
-          })
+            }
+          }
+
+          const dataTipView = new ViewContainer({ snippet, markdown, className: this.glowClass })
           this.dataTipMarkerDisposables = this.mountDataTipWithMarker(editor, datatip.range, position, dataTipView)
         }
       }

lib/main.js

@@ -2,7 +2,7 @@
 
 import { CompositeDisposable } from "atom"
 import { DataTipManager } from "./datatip-manager"
-import type { DatatipService, MarkdownService } from "atom-ide-base"
+import type { DatatipService } from "atom-ide-base"
 
 /**
  * the Atom IDE data tip plugin
@@ -19,11 +19,6 @@ let subscriptions
  * @type {DataTipManager}
  */
 let datatipManager
-/**
- * a reference to the markdown rendering service
- * @type {MarkdownService}
- */
-let renderer = null
 
 /**
  * called by Atom when activating an extension
@@ -36,13 +31,13 @@ export async function activate(state) {
   subscriptions.add(datatipManager)
 
   install_deps().then(() => {
-    datatipManager.initialize(renderer)
+    datatipManager.initialize()
   })
 }
 
 async function install_deps() {
   // install package-deps if not loaded
-  if (!(atom.packages.isPackageLoaded("atom-ide-markdown-service") && atom.packages.isPackageLoaded("busy-signal"))) {
+  if (!(atom.packages.isPackageLoaded("busy-signal"))) {
     // Dynamic import https://mariusschulz.com/blog/dynamic-import-expressions-in-typescript
     await import("atom-package-deps").then((atom_package_deps) => {
       atom_package_deps.install("atom-ide-datatip")
@@ -69,14 +64,6 @@ export function provideDatatipService() {
   return datatipManager.datatipService
 }
 
-/**
- * retrieves a reference to the markdown rendering service that should be used
- * @param  {MarkdownService} markdownService the service for rendering markdown text
- */
-export function consumeMarkdownRenderer(markdownService) {
-  renderer = markdownService
-}
-
 export const config = {
   showDataTipOnCursorMove: {
     title: 'Show datatip automatically on "cursor" stay',

package.json

@@ -27,11 +27,10 @@
     "atom": ">=1.0.0 <2.0.0"
   },
   "package-deps": [
-    "atom-ide-markdown-service",
     "busy-signal"
   ],
   "dependencies": {
-    "atom-ide-base": "^1.11.2",
+    "atom-ide-base": "^2.0.0",
     "atom-package-deps": "^6.0.0"
   },
   "devDependencies": {
@@ -65,12 +64,5 @@
         "0.1.0": "provideDatatipService"
       }
     }
-  },
-  "consumedServices": {
-    "markdown-renderer": {
-      "versions": {
-        "1.0.0": "consumeMarkdownRenderer"
-      }
-    }
   }
 }

pnpm-lock.yaml

@@ -30,7 +30,7 @@
   // glow on hover
   transition: background-color 0.15s ease;
   &:hover {
-    background-color: mix(@syntax-background-color, @syntax-selection-color, 50%);
+    background-color: mix(@syntax-background-color, @syntax-selection-color, 95%);
   }
 }