Merge pull request #106 from atom-community/dependencies

Author: aminya

lib/datatip-manager.ts

@@ -93,7 +93,7 @@ export class DataTipManager {
     this.subscriptions.add(
       atom.workspace.observeTextEditors((editor) => {
         const disposable = this.watchEditor(editor)
-        editor.onDidDestroy(() => disposable.dispose())
+        editor.onDidDestroy(() => disposable?.dispose())
       }),
       atom.commands.add("atom-text-editor", {
         "datatip:toggle": (evt) => this.onCommandEvt(evt),
@@ -136,7 +136,6 @@ export class DataTipManager {
 
   /**
    * returns the provider registry as a consumable service
-   * @return {ProviderRegistry<DatatipProvider>} [description]
    */
   get datatipService() {
     return this.providerRegistry
@@ -184,7 +183,7 @@ export class DataTipManager {
    * it has been decided to track this instance
    * @param editor the Atom Text editor instance to be tracked
    */
-  updateCurrentEditor(editor: TextEditor) {
+  updateCurrentEditor(editor: TextEditor | null) {
     if (editor === this.editor) {
       return
     }
@@ -198,7 +197,7 @@ export class DataTipManager {
     this.editor = null
     this.editorView = null
 
-    if (!atom.workspace.isTextEditor(editor)) {
+    if (editor == null || !atom.workspace.isTextEditor(editor)) {
       return
     }
 
@@ -221,7 +220,7 @@ export class DataTipManager {
         this.unmountDataTip()
       }),
       new Disposable(() => {
-        this.editorView.removeEventListener("mousemove", this.onMouseMoveEvt)
+        this.editorView?.removeEventListener("mousemove", this.onMouseMoveEvt)
       })
     )
   }
@@ -243,7 +242,7 @@ export class DataTipManager {
         const editor = evt.cursor.editor
         const position = evt.cursor.getBufferPosition()
         if (this.currentMarkerRange === null || !this.currentMarkerRange.containsPoint(position)) {
-          this.showDataTip(editor, position, evt)
+          this.showDataTip(editor, position)
         }
       },
       this.hoverTime,
@@ -261,7 +260,7 @@ export class DataTipManager {
 
     this.mouseMoveTimer = setTimeout(
       (evt) => {
-        if (this.editorView === null) {
+        if (this.editorView == null || this.editor == null) {
           return
         }
 
@@ -280,13 +279,14 @@ export class DataTipManager {
         // means the mouse event occured quite far away from where the text ends on that row. Do not
         // show the datatip in such situations and hide any existing datatips (the mouse moved more to
         // the right, away from the actual text)
+        // @ts-ignore: internal API
         if (distance >= this.editor.getDefaultCharWidth()) {
           return this.unmountDataTip()
         }
 
         const point = this.editor.bufferPositionForScreenPosition(screenPosition)
         if (this.currentMarkerRange === null || !this.currentMarkerRange.containsPoint(point)) {
-          this.showDataTip(this.editor, point, evt)
+          this.showDataTip(this.editor, point)
         }
       },
       this.hoverTime,
@@ -306,7 +306,7 @@ export class DataTipManager {
    * the central command event handler
    * @param evt command event
    */
-  onCommandEvt(evt: CommandEvent) {
+  onCommandEvt(evt: CommandEvent<TextEditorElement>) {
     const editor = evt.currentTarget.getModel()
 
     if (atom.workspace.isTextEditor(editor)) {
@@ -317,7 +317,7 @@ export class DataTipManager {
         return this.unmountDataTip()
       }
 
-      this.showDataTip(editor, position, undefined)
+      this.showDataTip(editor, position)
     }
   }
 
@@ -331,12 +331,11 @@ export class DataTipManager {
   async showDataTip(
     editor: TextEditor,
     position: Point,
-    evt: CursorPositionChangedEvent | MouseEvent | null
   ): Promise<void> {
     try {
       let datatip: Datatip | null = null
       for (const provider of this.providerRegistry.getAllProvidersForEditor(editor)) {
-        const providerTip = await provider.datatip(editor, position, evt)
+        const providerTip = await provider.datatip(editor, position)
         if (providerTip) {
           datatip = providerTip
           break
@@ -473,19 +472,19 @@ export class DataTipManager {
     disposables.add(new Disposable(() => overlayMarker.destroy()))
 
     view.element.addEventListener("mouseenter", () => {
-      this.editorView.removeEventListener("mousemove", this.onMouseMoveEvt)
+      this.editorView?.removeEventListener("mousemove", this.onMouseMoveEvt)
     })
 
     view.element.addEventListener("mouseleave", () => {
-      this.editorView.addEventListener("mousemove", this.onMouseMoveEvt)
+      this.editorView?.addEventListener("mousemove", this.onMouseMoveEvt)
     })
 
     // TODO move this code to atom-ide-base
     view.element.addEventListener("mousewheel", this.onMouseWheel, { passive: true })
 
     disposables.add(
       new Disposable(() => {
-        this.editorView.addEventListener("mousemove", this.onMouseMoveEvt)
+        this.editorView?.addEventListener("mousemove", this.onMouseMoveEvt)
         view.destroy()
       })
     )

package.json

@@ -28,26 +28,26 @@
     "busy-signal"
   ],
   "dependencies": {
-    "atom-package-deps": "^7.1.0",
-    "atom-ide-base": "^2.1.1"
+    "atom-ide-base": "^2.1.1",
+    "atom-package-deps": "^7.1.0"
   },
   "devDependencies": {
     "@types/atom": "^1.40.7",
-    "@types/node": "^14.14.2",
-    "atom-languageclient": "^1.0.0",
-    "@types/jasmine": "^3.5.14",
-    "atom-jasmine3-test-runner": "^5.1.4",
-    "typescript": "^4.0.3",
-    "tslib": "^2.0.3",
-    "prettier": "^2.1.2",
-    "eslint": "7.11.0",
-    "eslint-config-atomic": "^1.5.0",
+    "@types/jasmine": "^3.6.3",
+    "@types/node": "^14.14.22",
+    "atom-jasmine3-test-runner": "^5.1.8",
+    "atom-languageclient": "^1.0.6",
+    "build-commit": "^0.1.4",
+    "cross-env": "latest",
+    "eslint": "7.18.0",
+    "eslint-config-atomic": "^1.5.1",
+    "npm-check-updates": "^11.0.2",
+    "prettier": "^2.2.1",
     "rollup": "^2.38.0",
     "rollup-plugin-atomic": "^2.0.1",
-    "shx": "^0.3.2",
-    "cross-env": "latest",
-    "npm-check-updates": "^9.1.2",
-    "build-commit": "^0.1.1"
+    "shx": "^0.3.3",
+    "tslib": "^2.1.0",
+    "typescript": "^4.1.3"
   },
   "atomTestRunner": "./spec/runner",
   "activationHooks": [