Merge pull request #121 from atom-community/use-atom-ide-base

aminya · web-flow · commit c0e3c5d752ed · 2021-02-19T14:59:25.000-06:00
diff --git a/lib/adapters/apply-edit-adapter.ts b/lib/adapters/apply-edit-adapter.ts
@@ -1,4 +1,4 @@
-import * as atomIde from 'atom-ide';
+import type * as atomIde from 'atom-ide-base';
 import Convert from '../convert';
 import {
   LanguageClientConnection,
diff --git a/lib/adapters/code-action-adapter.ts b/lib/adapters/code-action-adapter.ts
@@ -1,4 +1,4 @@
-import * as atomIde from 'atom-ide';
+import type * as atomIde from 'atom-ide-base';
 import LinterPushV2Adapter from './linter-push-v2-adapter';
 import assert = require('assert');
 import Convert from '../convert';
diff --git a/lib/adapters/code-format-adapter.ts b/lib/adapters/code-format-adapter.ts
@@ -1,4 +1,4 @@
-import * as atomIde from 'atom-ide';
+import type * as atomIde from 'atom-ide-base';
 import Convert from '../convert';
 import {
   LanguageClientConnection,
diff --git a/lib/adapters/datatip-adapter.ts b/lib/adapters/datatip-adapter.ts
@@ -1,4 +1,4 @@
-import * as atomIde from 'atom-ide';
+import type * as atomIde from 'atom-ide-base';
 import Convert from '../convert';
 import * as Utils from '../utils';
 import {
diff --git a/lib/adapters/definition-adapter.ts b/lib/adapters/definition-adapter.ts
@@ -1,4 +1,4 @@
-import * as atomIde from 'atom-ide';
+import type * as atomIde from 'atom-ide-base';
 import Convert from '../convert';
 import * as Utils from '../utils';
 import {
diff --git a/lib/adapters/find-references-adapter.ts b/lib/adapters/find-references-adapter.ts
@@ -1,4 +1,4 @@
-import * as atomIde from 'atom-ide';
+import type * as atomIde from 'atom-ide-base';
 import Convert from '../convert';
 import {
   Point,
diff --git a/lib/adapters/logging-console-adapter.ts b/lib/adapters/logging-console-adapter.ts
@@ -1,4 +1,4 @@
-import { ConsoleApi } from 'atom-ide';
+import type * as atomIde from 'atom-ide-base';
 import {
   LanguageClientConnection,
   LogMessageParams,
@@ -7,7 +7,7 @@ import {
 
 /** Adapts Atom's user notifications to those of the language server protocol. */
 export default class LoggingConsoleAdapter {
-  private _consoles: Set<ConsoleApi> = new Set();
+  private _consoles: Set<atomIde.ConsoleApi> = new Set();
 
   /**
    * Create a new {LoggingConsoleAdapter} that will listen for log messages
@@ -25,15 +25,15 @@ export default class LoggingConsoleAdapter {
   }
 
   /**
-   * Public: Attach this {LoggingConsoleAdapter} to a given {ConsoleApi}.
+   * Public: Attach this {LoggingConsoleAdapter} to a given {atomIde.ConsoleApi}.
    *
-   * @param console A {ConsoleApi} that wants to receive messages.
+   * @param console A {atomIde.ConsoleApi} that wants to receive messages.
    */
-  public attach(console: ConsoleApi): void {
+  public attach(console: atomIde.ConsoleApi): void {
     this._consoles.add(console);
   }
 
-  /** Public: Remove all {ConsoleApi}'s attached to this adapter. */
+  /** Public: Remove all {atomIde.ConsoleApi}'s attached to this adapter. */
   public detachAll(): void {
     this._consoles.clear();
   }
diff --git a/lib/adapters/notifications-adapter.ts b/lib/adapters/notifications-adapter.ts
@@ -10,9 +10,10 @@ import {
   NotificationOptions,
   NotificationExt,
 } from 'atom';
-import {
-  NotificationButton,
-} from 'atom-ide';
+
+export interface NotificationButton {
+  text: string
+}
 
 /** Public: Adapts Atom's user notifications to those of the language server protocol. */
 export default class NotificationsAdapter {
diff --git a/lib/adapters/outline-view-adapter.ts b/lib/adapters/outline-view-adapter.ts
@@ -1,4 +1,4 @@
-import * as atomIde from 'atom-ide';
+import type * as atomIde from 'atom-ide-base';
 import Convert from '../convert';
 import * as Utils from '../utils';
 import { CancellationTokenSource } from 'vscode-jsonrpc';
diff --git a/lib/adapters/rename-adapter.ts b/lib/adapters/rename-adapter.ts
@@ -1,4 +1,4 @@
-import * as atomIde from 'atom-ide';
+import type * as atomIde from 'atom-ide-base';
 import Convert from '../convert';
 import {
   Point,
diff --git a/lib/adapters/signature-help-adapter.ts b/lib/adapters/signature-help-adapter.ts
@@ -1,4 +1,4 @@
-import * as atomIde from 'atom-ide';
+import type * as atomIde from 'atom-ide-base';
 import assert = require('assert');
 import Convert from '../convert';
 import { ActiveServer } from '../server-manager';
diff --git a/lib/auto-languageclient.ts b/lib/auto-languageclient.ts
@@ -2,7 +2,7 @@ import * as cp from 'child_process';
 import * as ls from './languageclient';
 import * as rpc from 'vscode-jsonrpc';
 import * as path from 'path';
-import * as atomIde from 'atom-ide';
+import type * as atomIde from 'atom-ide-base';
 import * as linter from 'atom/linter';
 import Convert from './convert.js';
 import ApplyEditAdapter from './adapters/apply-edit-adapter';
@@ -41,7 +41,6 @@ import {
   TextEditor,
 } from 'atom';
 import * as ac from 'atom/autocomplete-plus';
-import { TextEdit, CodeAction } from 'atom-ide';
 
 export { ActiveServer, LanguageClientConnection, LanguageServerProcess };
 export type ConnectionType = 'stdio' | 'socket' | 'ipc';
@@ -518,6 +517,7 @@ export default class AutoLanguageClient {
       name: this.name,
       priority: 20,
       grammarScopes: this.getGrammarScopes(),
+      wordRegExp: null, // TODO pass RegExp
       getDefinition: this.getDefinition.bind(this),
     };
   }
@@ -745,7 +745,7 @@ export default class AutoLanguageClient {
     editor: TextEditor,
     range: Range,
     diagnostics: atomIde.Diagnostic[]
-  ): Promise<CodeAction[] | null> {
+  ): Promise<atomIde.CodeAction[] | null> {
     const server = await this._serverManager.getServer(editor);
     if (server == null || !CodeActionAdapter.canAdapt(server.capabilities)) {
       return null;
@@ -773,7 +773,7 @@ export default class AutoLanguageClient {
     editor: TextEditor,
     position: Point,
     newName: string
-  ): Promise<Map<string, TextEdit[]> | null> {
+  ): Promise<Map<string, atomIde.TextEdit[]> | null> {
     const server = await this._serverManager.getServer(editor);
     if (server == null || !RenameAdapter.canAdapt(server.capabilities)) {
       return null;
diff --git a/lib/convert.ts b/lib/convert.ts
@@ -1,4 +1,4 @@
-
+import type * as atomIde from 'atom-ide-base';
 import * as ls from './languageclient';
 import * as URL from 'url';
 import {
@@ -7,11 +7,6 @@ import {
   Range,
   TextEditor,
 } from 'atom';
-import {
-  Diagnostic,
-  DiagnosticType,
-  TextEdit,
-} from 'atom-ide';
 
 /**
  * Public: Class that contains a number of helper methods for general conversions
@@ -196,7 +191,7 @@ export default class Convert {
     }
   }
 
-  public static atomIdeDiagnosticToLSDiagnostic(diagnostic: Diagnostic): ls.Diagnostic {
+  public static atomIdeDiagnosticToLSDiagnostic(diagnostic: atomIde.Diagnostic): ls.Diagnostic {
     return {
       range: Convert.atomRangeToLSRange(diagnostic.range),
       severity: Convert.diagnosticTypeToLSSeverity(diagnostic.type),
@@ -205,7 +200,7 @@ export default class Convert {
     };
   }
 
-  public static diagnosticTypeToLSSeverity(type: DiagnosticType): ls.DiagnosticSeverity {
+  public static diagnosticTypeToLSSeverity(type: atomIde.DiagnosticType): ls.DiagnosticSeverity {
     switch (type) {
       case 'Error':
         return ls.DiagnosticSeverity.Error;
@@ -219,24 +214,24 @@ export default class Convert {
   }
 
   /**
-   * Public: Convert an array of language server protocol {TextEdit} objects to an
-   * equivalent array of Atom {TextEdit} objects.
+   * Public: Convert an array of language server protocol {atomIde.TextEdit} objects to an
+   * equivalent array of Atom {atomIde.TextEdit} objects.
    *
-   * @param textEdits The language server protocol {TextEdit} objects to convert.
-   * @returns An {Array} of Atom {TextEdit} objects.
+   * @param textEdits The language server protocol {atomIde.TextEdit} objects to convert.
+   * @returns An {Array} of Atom {atomIde.TextEdit} objects.
    */
-  public static convertLsTextEdits(textEdits: ls.TextEdit[] | null): TextEdit[] {
+  public static convertLsTextEdits(textEdits: ls.TextEdit[] | null): atomIde.TextEdit[] {
     return (textEdits || []).map(Convert.convertLsTextEdit);
   }
 
   /**
-   * Public: Convert a language server protocol {TextEdit} object to the
-   * Atom equivalent {TextEdit}.
+   * Public: Convert a language server protocol {atomIde.TextEdit} object to the
+   * Atom equivalent {atomIde.TextEdit}.
    *
-   * @param textEdits The language server protocol {TextEdit} objects to convert.
-   * @returns An Atom {TextEdit} object.
+   * @param textEdits The language server protocol {atomIde.TextEdit} objects to convert.
+   * @returns An Atom {atomIde.TextEdit} object.
    */
-  public static convertLsTextEdit(textEdit: ls.TextEdit): TextEdit {
+  public static convertLsTextEdit(textEdit: ls.TextEdit): atomIde.TextEdit {
     return {
       oldRange: Convert.lsRangeToAtomRange(textEdit.range),
       newText: textEdit.newText,
diff --git a/package.json b/package.json
@@ -24,10 +24,11 @@
   },
   "atomTestRunner": "./test/runner",
   "dependencies": {
-    "zadeh": "^2.0.2",
+    "atom-ide-base": "^2.4.0",
     "vscode-jsonrpc": "5.0.1",
     "vscode-languageserver-protocol": "3.15.3",
-    "vscode-languageserver-types": "3.15.1"
+    "vscode-languageserver-types": "3.15.1",
+    "zadeh": "^2.0.2"
   },
   "devDependencies": {
     "@atom/mocha-test-runner": "^1.6.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/adapters/datatip-adapter.test.ts b/test/adapters/datatip-adapter.test.ts
diff --git a/typings/atom-ide/index.d.ts b/typings/atom-ide/index.d.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import * as atomIde from 'atom-ide';`
	`1`	`+import type * as atomIde from 'atom-ide-base';`
`2`	`2`	`import Convert from '../convert';`
`3`	`3`	`import {`
`4`	`4`	`LanguageClientConnection,`