Merge pull request #133 from lierdakil/cleanup-module-augments

refactor: clean-up module augments

Author: aminya

lib/adapters/notifications-adapter.ts

@@ -5,7 +5,7 @@ import {
   ShowMessageParams,
   ShowMessageRequestParams,
 } from "../languageclient"
-import { Notification, NotificationOptions, NotificationExt } from "atom"
+import { Notification, NotificationOptions } from "atom"
 
 export interface NotificationButton {
   text: string
@@ -109,7 +109,7 @@ function addNotificationForMessage(
   message: string,
   options: NotificationOptions
 ): Notification | null {
-  function isDuplicate(note: NotificationExt): boolean {
+  function isDuplicate(note: Notification): boolean {
     const noteDismissed = note.isDismissed && note.isDismissed()
     const noteOptions = (note.getOptions && note.getOptions()) || {}
     return (

lib/utils.ts

@@ -1,6 +1,6 @@
 import { join, resolve } from "path"
 import { existsSync } from "fs"
-import { Point, TextBuffer, TextEditor, TextEditorExt, Range, BufferScanResult } from "atom"
+import { Point, TextBuffer, TextEditor, Range, BufferScanResult } from "atom"
 import { CancellationToken, CancellationTokenSource } from "vscode-jsonrpc"
 
 export type ReportBusyWhile = <T>(title: string, f: () => Promise<T>) => Promise<T>
@@ -10,7 +10,7 @@ export type ReportBusyWhile = <T>(title: string, f: () => Promise<T>) => Promise
  * Uses the non-word characters from the position's grammar scope.
  */
 export function getWordAtPosition(editor: TextEditor, position: Point): Range {
-  const nonWordCharacters = escapeRegExp((editor as TextEditorExt).getNonWordCharacters(position))
+  const nonWordCharacters = escapeRegExp(editor.getNonWordCharacters(position))
   const range = _getRegexpRangeAtPosition(
     editor.getBuffer(),
     position,

package.json

@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@atom/mocha-test-runner": "^1.6.1",
-    "@types/atom": "^1.40.9",
+    "@types/atom": "^1.40.10",
     "@types/chai": "^4.2.14",
     "@types/mocha": "^8.2.0",
     "@types/node": "14.14.22",

pnpm-lock.yaml

@@ -1,12 +1,20 @@
+/* eslint-disable no-shadow, @typescript-eslint/no-unused-vars */
 import { Point, Notification, NotificationOptions, TextEditor } from "atom"
 
-declare module "atom" {
-  interface TextEditorExt extends TextEditor {
+// NOTE: due to a bug in how TypeScript resolves ambient augments,
+// need to be more specific here for TextEditor to keep its "class"
+// status and not be demoted to "interface". Should revert this
+// once the issue is fixed.
+declare module "atom/src/text-editor" {
+  interface TextEditor {
     getNonWordCharacters(position: Point): string
   }
+}
 
+// NOTE: same here
+declare module "atom/src/notification" {
   /** Non-public Notification api */
-  interface NotificationExt extends Notification {
+  interface Notification {
     isDismissed?: () => boolean
     getOptions?: () => NotificationOptions | null
   }