chore: import Definition, DefinitionQueryResult from atom-ide-base

Author: aminya

lib/adapters/definition-adapter.ts

@@ -1,4 +1,4 @@
-import * as atomIde from 'atom-ide';
+import type { Definition, DefinitionQueryResult } from 'atom-ide-base';
 import Convert from '../convert';
 import * as Utils from '../utils';
 import {
@@ -49,7 +49,7 @@ export default class DefinitionAdapter {
     languageName: string,
     editor: TextEditor,
     point: Point,
-  ): Promise<atomIde.DefinitionQueryResult | null> {
+  ): Promise<DefinitionQueryResult | null> {
     const documentPositionParams = Convert.editorToTextDocumentPositionParams(editor, point);
     const definitionLocations = DefinitionAdapter.normalizeLocations(
       await connection.gotoDefinition(documentPositionParams),
@@ -93,7 +93,7 @@ export default class DefinitionAdapter {
    * @param languageName The name of the language these objects are written in.
    * @returns An {Array} of {Definition}s that represented the converted {Location}s.
    */
-  public static convertLocationsToDefinitions(locations: Location[], languageName: string): atomIde.Definition[] {
+  public static convertLocationsToDefinitions(locations: Location[], languageName: string): Definition[] {
     return locations.map((d) => ({
       path: Convert.uriToPath(d.uri),
       position: Convert.positionToPoint(d.range.start),

lib/auto-languageclient.ts

@@ -3,7 +3,7 @@ import * as ls from './languageclient';
 import * as rpc from 'vscode-jsonrpc';
 import * as path from 'path';
 import * as atomIde from 'atom-ide';
-import type { OutlineProvider, Outline, DefinitionProvider } from 'atom-ide-base';
+import type { OutlineProvider, Outline, DefinitionProvider, DefinitionQueryResult } from 'atom-ide-base';
 import * as linter from 'atom/linter';
 import Convert from './convert.js';
 import ApplyEditAdapter from './adapters/apply-edit-adapter';
@@ -523,7 +523,7 @@ export default class AutoLanguageClient {
     };
   }
 
-  protected async getDefinition(editor: TextEditor, point: Point): Promise<atomIde.DefinitionQueryResult | null> {
+  protected async getDefinition(editor: TextEditor, point: Point): Promise<DefinitionQueryResult | null> {
     const server = await this._serverManager.getServer(editor);
     if (server == null || !DefinitionAdapter.canAdapt(server.capabilities)) {
       return null;

typings/atom-ide/index.d.ts

@@ -4,21 +4,6 @@ declare module 'atom-ide' {
 
   export type IdeUri = string;
 
-  export interface Definition {
-    path: IdeUri;
-    position: Point;
-    range?: Range;
-    id?: string;
-    name?: string;
-    language: string;
-    projectRoot?: IdeUri;
-  }
-
-  export interface DefinitionQueryResult {
-    queryRange: Range[];
-    definitions: Definition[];
-  }
-
   export interface FindReferencesProvider {
     /** Return true if your provider supports finding references for the provided TextEditor. */
     isEditorSupported(editor: TextEditor): boolean | Promise<boolean>;