chore: import code-format and text-edit types from atom-ide-base

Author: aminya

lib/adapters/apply-edit-adapter.ts

@@ -1,4 +1,4 @@
-import * as atomIde from 'atom-ide';
+import type { TextEdit } from 'atom-ide-base';
 import Convert from '../convert';
 import {
   LanguageClientConnection,
@@ -23,13 +23,13 @@ export default class ApplyEditAdapter {
    */
   public static applyEdits(
     buffer: TextBuffer,
-    edits: atomIde.TextEdit[],
+    edits: TextEdit[],
   ): number {
     const checkpoint = buffer.createCheckpoint();
     try {
       // Sort edits in reverse order to prevent edit conflicts.
       edits.sort((edit1, edit2) => -edit1.oldRange.compare(edit2.oldRange));
-      edits.reduce((previous: atomIde.TextEdit | null, current) => {
+      edits.reduce((previous: TextEdit | null, current) => {
         ApplyEditAdapter.validateEdit(buffer, current, previous);
         buffer.setTextInRange(current.oldRange, current.newText);
         return current;
@@ -97,8 +97,8 @@ export default class ApplyEditAdapter {
   /** Private: Do some basic sanity checking on the edit ranges. */
   private static validateEdit(
     buffer: TextBuffer,
-    edit: atomIde.TextEdit,
-    prevEdit: atomIde.TextEdit | null,
+    edit: TextEdit,
+    prevEdit: TextEdit | null,
   ): void {
     const path = buffer.getPath() || '';
     if (prevEdit && edit.oldRange.end.compare(prevEdit.oldRange.start) > 0) {

lib/adapters/code-format-adapter.ts

@@ -1,4 +1,4 @@
-import * as atomIde from 'atom-ide';
+import type { TextEdit } from 'atom-ide-base';
 import Convert from '../convert';
 import {
   LanguageClientConnection,
@@ -51,7 +51,7 @@ export default class CodeFormatAdapter {
     serverCapabilities: ServerCapabilities,
     editor: TextEditor,
     range: Range,
-  ): Promise<atomIde.TextEdit[]> {
+  ): Promise<TextEdit[]> {
     if (serverCapabilities.documentRangeFormattingProvider) {
       return CodeFormatAdapter.formatRange(connection, editor, range);
     }
@@ -74,7 +74,7 @@ export default class CodeFormatAdapter {
   public static async formatDocument(
     connection: LanguageClientConnection,
     editor: TextEditor,
-  ): Promise<atomIde.TextEdit[]> {
+  ): Promise<TextEdit[]> {
     const edits = await connection.documentFormatting(CodeFormatAdapter.createDocumentFormattingParams(editor));
     return Convert.convertLsTextEdits(edits);
   }
@@ -107,7 +107,7 @@ export default class CodeFormatAdapter {
     connection: LanguageClientConnection,
     editor: TextEditor,
     range: Range,
-  ): Promise<atomIde.TextEdit[]> {
+  ): Promise<TextEdit[]> {
     const edits = await connection.documentRangeFormatting(
       CodeFormatAdapter.createDocumentRangeFormattingParams(editor, range),
     );
@@ -150,7 +150,7 @@ export default class CodeFormatAdapter {
     editor: TextEditor,
     point: Point,
     character: string,
-  ): Promise<atomIde.TextEdit[]> {
+  ): Promise<TextEdit[]> {
     const edits = await connection.documentOnTypeFormatting(
       CodeFormatAdapter.createDocumentOnTypeFormattingParams(editor, point, character),
     );

lib/adapters/rename-adapter.ts

@@ -1,4 +1,5 @@
 import * as atomIde from 'atom-ide';
+import type { TextEdit as AtomTextEdit } from 'atom-ide-base';
 import Convert from '../convert';
 import {
   Point,
@@ -22,7 +23,7 @@ export default class RenameAdapter {
     editor: TextEditor,
     point: Point,
     newName: string,
-  ): Promise<Map<atomIde.IdeUri, atomIde.TextEdit[]> | null> {
+  ): Promise<Map<atomIde.IdeUri, AtomTextEdit[]> | null> {
     const edit = await connection.rename(
       RenameAdapter.createRenameParams(editor, point, newName),
     );
@@ -49,7 +50,7 @@ export default class RenameAdapter {
 
   public static convertChanges(
     changes: { [uri: string]: TextEdit[] },
-  ): Map<atomIde.IdeUri, atomIde.TextEdit[]> {
+  ): Map<atomIde.IdeUri, AtomTextEdit[]> {
     const result = new Map();
     Object.keys(changes).forEach((uri) => {
       result.set(
@@ -62,7 +63,7 @@ export default class RenameAdapter {
 
   public static convertDocumentChanges(
     documentChanges: TextDocumentEdit[],
-  ): Map<atomIde.IdeUri, atomIde.TextEdit[]> {
+  ): Map<atomIde.IdeUri, AtomTextEdit[]> {
     const result = new Map();
     documentChanges.forEach((documentEdit) => {
       result.set(

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 } from 'atom-ide-base';
+import type { OutlineProvider, Outline, DefinitionProvider, DefinitionQueryResult, FindReferencesProvider, FindReferencesReturn, Datatip, DatatipService, TextEdit, RangeCodeFormatProvider, FileCodeFormatProvider, OnSaveCodeFormatProvider, OnTypeCodeFormatProvider } 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,7 @@ import {
   TextEditor,
 } from 'atom';
 import * as ac from 'atom/autocomplete-plus';
-import { TextEdit, CodeAction } from 'atom-ide';
+import { CodeAction } from 'atom-ide';
 
 export { ActiveServer, LanguageClientConnection, LanguageServerProcess };
 export type ConnectionType = 'stdio' | 'socket' | 'ipc';
@@ -634,15 +634,15 @@ export default class AutoLanguageClient {
   }
 
   // Code Format via LS formatDocument & formatDocumentRange------------
-  public provideCodeFormat(): atomIde.RangeCodeFormatProvider {
+  public provideCodeFormat(): RangeCodeFormatProvider {
     return {
       grammarScopes: this.getGrammarScopes(),
       priority: 1,
       formatCode: this.getCodeFormat.bind(this),
     };
   }
 
-  protected async getCodeFormat(editor: TextEditor, range: Range): Promise<atomIde.TextEdit[]> {
+  protected async getCodeFormat(editor: TextEditor, range: Range): Promise<TextEdit[]> {
     const server = await this._serverManager.getServer(editor);
     if (server == null || !CodeFormatAdapter.canAdapt(server.capabilities)) {
       return [];
@@ -651,15 +651,15 @@ export default class AutoLanguageClient {
     return CodeFormatAdapter.format(server.connection, server.capabilities, editor, range);
   }
 
-  public provideRangeCodeFormat(): atomIde.RangeCodeFormatProvider {
+  public provideRangeCodeFormat(): RangeCodeFormatProvider {
     return {
       grammarScopes: this.getGrammarScopes(),
       priority: 1,
       formatCode: this.getRangeCodeFormat.bind(this),
     };
   }
 
-  protected async getRangeCodeFormat(editor: TextEditor, range: Range): Promise<atomIde.TextEdit[]> {
+  protected async getRangeCodeFormat(editor: TextEditor, range: Range): Promise<TextEdit[]> {
     const server = await this._serverManager.getServer(editor);
     if (server == null || !server.capabilities.documentRangeFormattingProvider) {
       return [];
@@ -668,23 +668,23 @@ export default class AutoLanguageClient {
     return CodeFormatAdapter.formatRange(server.connection, editor, range);
   }
 
-  public provideFileCodeFormat(): atomIde.FileCodeFormatProvider {
+  public provideFileCodeFormat(): FileCodeFormatProvider {
     return {
       grammarScopes: this.getGrammarScopes(),
       priority: 1,
       formatEntireFile: this.getFileCodeFormat.bind(this),
     };
   }
 
-  public provideOnSaveCodeFormat(): atomIde.OnSaveCodeFormatProvider {
+  public provideOnSaveCodeFormat(): OnSaveCodeFormatProvider {
     return {
       grammarScopes: this.getGrammarScopes(),
       priority: 1,
       formatOnSave: this.getFileCodeFormat.bind(this),
     };
   }
 
-  protected async getFileCodeFormat(editor: TextEditor): Promise<atomIde.TextEdit[]> {
+  protected async getFileCodeFormat(editor: TextEditor): Promise<TextEdit[]> {
     const server = await this._serverManager.getServer(editor);
     if (server == null || !server.capabilities.documentFormattingProvider) {
       return [];
@@ -693,7 +693,7 @@ export default class AutoLanguageClient {
     return CodeFormatAdapter.formatDocument(server.connection, editor);
   }
 
-  public provideOnTypeCodeFormat(): atomIde.OnTypeCodeFormatProvider {
+  public provideOnTypeCodeFormat(): OnTypeCodeFormatProvider {
     return {
       grammarScopes: this.getGrammarScopes(),
       priority: 1,
@@ -705,7 +705,7 @@ export default class AutoLanguageClient {
     editor: TextEditor,
     point: Point,
     character: string,
-  ): Promise<atomIde.TextEdit[]> {
+  ): Promise<TextEdit[]> {
     const server = await this._serverManager.getServer(editor);
     if (server == null || !server.capabilities.documentOnTypeFormattingProvider) {
       return [];

lib/convert.ts

@@ -1,4 +1,4 @@
-
+import { TextEdit } from 'atom-ide-base';
 import * as ls from './languageclient';
 import * as URL from 'url';
 import {
@@ -10,7 +10,6 @@ import {
 import {
   Diagnostic,
   DiagnosticType,
-  TextEdit,
 } from 'atom-ide';
 
 /**

typings/atom-ide/index.d.ts

@@ -1,40 +1,10 @@
 declare module 'atom-ide' {
   import { Disposable, Point, Range, TextEditor } from 'atom';
   import * as ac from 'atom/autocomplete-plus';
+  import { TextEdit } from 'atom-ide-base';
 
   export type IdeUri = string;
 
-  export interface FileCodeFormatProvider {
-    formatEntireFile: (editor: TextEditor, range: Range) => Promise<TextEdit[]>;
-    priority: number;
-    grammarScopes: string[];
-  }
-
-  export interface RangeCodeFormatProvider {
-    formatCode: (editor: TextEditor, range: Range) => Promise<TextEdit[]>;
-    priority: number;
-    grammarScopes: string[];
-  }
-
-  export interface OnSaveCodeFormatProvider {
-    formatOnSave: (editor: TextEditor) => Promise<TextEdit[]>;
-    priority: number;
-    grammarScopes: string[];
-  }
-
-  export interface OnTypeCodeFormatProvider {
-    formatAtPosition: (editor: TextEditor, position: Point, character: string) => Promise<TextEdit[]>;
-    priority: number;
-    grammarScopes: string[];
-  }
-
-  export interface TextEdit {
-    oldRange: Range;
-    newText: string;
-    /** If included, this will be used to verify that the edit still applies cleanly. */
-    oldText?: string;
-  }
-
   export interface CodeHighlightProvider {
     highlight(editor: TextEditor, bufferPosition: Point): Promise<Range[] | null>;
     priority: number;