chore: import code-action and diagnostic types from atom-ide-base

Author: aminya

lib/adapters/code-action-adapter.ts

@@ -1,4 +1,4 @@
-import * as atomIde from 'atom-ide';
+import { CodeAction as AtomCodeAction, Diagnostic } from 'atom-ide-base';
 import LinterPushV2Adapter from './linter-push-v2-adapter';
 import assert = require('assert');
 import Convert from '../convert';
@@ -43,8 +43,8 @@ export default class CodeActionAdapter {
     linterAdapter: LinterPushV2Adapter | undefined,
     editor: TextEditor,
     range: Range,
-    diagnostics: atomIde.Diagnostic[],
-  ): Promise<atomIde.CodeAction[]> {
+    diagnostics: Diagnostic[],
+  ): Promise<AtomCodeAction[]> {
     if (linterAdapter == null) {
       return [];
     }
@@ -58,7 +58,7 @@ export default class CodeActionAdapter {
   private static createCodeAction(
     action: Command | CodeAction,
     connection: LanguageClientConnection,
-  ): atomIde.CodeAction {
+  ): AtomCodeAction {
     return {
       async apply() {
         if (CodeAction.is(action)) {
@@ -99,7 +99,7 @@ export default class CodeActionAdapter {
     linterAdapter: LinterPushV2Adapter,
     editor: TextEditor,
     range: Range,
-    diagnostics: atomIde.Diagnostic[],
+    diagnostics: Diagnostic[],
   ): CodeActionParams {
     return {
       textDocument: Convert.editorToTextDocumentIdentifier(editor),

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, DefinitionQueryResult, FindReferencesProvider, FindReferencesReturn, Datatip, DatatipService, TextEdit, RangeCodeFormatProvider, FileCodeFormatProvider, OnSaveCodeFormatProvider, OnTypeCodeFormatProvider, CodeHighlightProvider } from 'atom-ide-base';
+import type { OutlineProvider, Outline, DefinitionProvider, DefinitionQueryResult, FindReferencesProvider, FindReferencesReturn, Datatip, DatatipService, TextEdit, RangeCodeFormatProvider, FileCodeFormatProvider, OnSaveCodeFormatProvider, OnTypeCodeFormatProvider, CodeAction, CodeHighlightProvider, CodeActionProvider, Diagnostic } from 'atom-ide-base';
 import * as linter from 'atom/linter';
 import Convert from './convert.js';
 import ApplyEditAdapter from './adapters/apply-edit-adapter';
@@ -42,7 +42,6 @@ import {
   TextEditor,
 } from 'atom';
 import * as ac from 'atom/autocomplete-plus';
-import { CodeAction } from 'atom-ide';
 
 export { ActiveServer, LanguageClientConnection, LanguageServerProcess };
 export type ConnectionType = 'stdio' | 'socket' | 'ipc';
@@ -733,7 +732,7 @@ export default class AutoLanguageClient {
     return CodeHighlightAdapter.highlight(server.connection, server.capabilities, editor, position);
   }
 
-  public provideCodeActions(): atomIde.CodeActionProvider {
+  public provideCodeActions(): CodeActionProvider {
     return {
       grammarScopes: this.getGrammarScopes(),
       priority: 1,
@@ -746,7 +745,7 @@ export default class AutoLanguageClient {
   protected async getCodeActions(
     editor: TextEditor,
     range: Range,
-    diagnostics: atomIde.Diagnostic[]
+    diagnostics: Diagnostic[]
   ): Promise<CodeAction[] | null> {
     const server = await this._serverManager.getServer(editor);
     if (server == null || !CodeActionAdapter.canAdapt(server.capabilities)) {

lib/convert.ts

@@ -1,4 +1,4 @@
-import { TextEdit } from 'atom-ide-base';
+import { TextEdit, Diagnostic, DiagnosticType } from 'atom-ide-base';
 import * as ls from './languageclient';
 import * as URL from 'url';
 import {
@@ -7,10 +7,6 @@ import {
   Range,
   TextEditor,
 } from 'atom';
-import {
-  Diagnostic,
-  DiagnosticType,
-} from 'atom-ide';
 
 /**
  * Public: Class that contains a number of helper methods for general conversions

typings/atom-ide/index.d.ts

@@ -1,36 +1,10 @@
 declare module 'atom-ide' {
-  import { Disposable, Point, Range, TextEditor } from 'atom';
+  import { Disposable, Point, TextEditor } from 'atom';
   import * as ac from 'atom/autocomplete-plus';
   import { TextEdit } from 'atom-ide-base';
 
   export type IdeUri = string;
 
-  export type DiagnosticType = 'Error' | 'Warning' | 'Info';
-
-  export interface Diagnostic {
-    providerName: string;
-    type: DiagnosticType;
-    filePath: string;
-    text?: string;
-    range: Range;
-  }
-
-  export interface CodeAction {
-    apply(): Promise<void>;
-    getTitle(): Promise<string>;
-    dispose(): void;
-  }
-
-  export interface CodeActionProvider {
-    grammarScopes: string[];
-    priority: number;
-    getCodeActions(
-      editor: TextEditor,
-      range: Range,
-      diagnostics: Diagnostic[],
-    ): Promise<CodeAction[] | null>;
-  }
-
   export interface RefactorProvider {
     grammarScopes: string[];
     priority: number;