chore: use atomIde namespace instead of importing individual types

Author: aminya

lib/adapters/apply-edit-adapter.ts

@@ -1,4 +1,4 @@
-import type { TextEdit } from 'atom-ide-base';
+import type * as atomIde from 'atom-ide-base';
 import Convert from '../convert';
 import {
   LanguageClientConnection,
@@ -23,13 +23,13 @@ export default class ApplyEditAdapter {
    */
   public static applyEdits(
     buffer: TextBuffer,
-    edits: TextEdit[],
+    edits: atomIde.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: TextEdit | null, current) => {
+      edits.reduce((previous: atomIde.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: TextEdit,
-    prevEdit: TextEdit | null,
+    edit: atomIde.TextEdit,
+    prevEdit: atomIde.TextEdit | null,
   ): void {
     const path = buffer.getPath() || '';
     if (prevEdit && edit.oldRange.end.compare(prevEdit.oldRange.start) > 0) {

lib/adapters/code-action-adapter.ts

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

lib/adapters/code-format-adapter.ts

@@ -1,4 +1,4 @@
-import type { TextEdit } from 'atom-ide-base';
+import type * as atomIde 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<TextEdit[]> {
+  ): Promise<atomIde.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<TextEdit[]> {
+  ): Promise<atomIde.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<TextEdit[]> {
+  ): Promise<atomIde.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<TextEdit[]> {
+  ): Promise<atomIde.TextEdit[]> {
     const edits = await connection.documentOnTypeFormatting(
       CodeFormatAdapter.createDocumentOnTypeFormattingParams(editor, point, character),
     );

lib/adapters/datatip-adapter.ts

@@ -1,4 +1,4 @@
-import type { MarkedString as AtomMarkedString, Datatip } from 'atom-ide-base'
+import type * as atomIde from 'atom-ide-base';
 import Convert from '../convert';
 import * as Utils from '../utils';
 import {
@@ -44,7 +44,7 @@ export default class DatatipAdapter {
     connection: LanguageClientConnection,
     editor: TextEditor,
     point: Point,
-  ): Promise<Datatip | null> {
+  ): Promise<atomIde.Datatip | null> {
     const documentPositionParams = Convert.editorToTextDocumentPositionParams(editor, point);
 
     const hover = await connection.hover(documentPositionParams);
@@ -72,7 +72,7 @@ export default class DatatipAdapter {
   private static convertMarkedString(
     editor: TextEditor,
     markedString: MarkedString | MarkupContent,
-  ): AtomMarkedString {
+  ): atomIde.MarkedString {
     if (typeof markedString === 'string') {
       return { type: 'markdown', value: markedString };
     }

lib/adapters/definition-adapter.ts

@@ -1,4 +1,4 @@
-import type { Definition, DefinitionQueryResult } from 'atom-ide-base';
+import type * as atomIde 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<DefinitionQueryResult | null> {
+  ): Promise<atomIde.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): Definition[] {
+  public static convertLocationsToDefinitions(locations: Location[], languageName: string): atomIde.Definition[] {
     return locations.map((d) => ({
       path: Convert.uriToPath(d.uri),
       position: Convert.positionToPoint(d.range.start),

lib/adapters/find-references-adapter.ts

@@ -1,4 +1,4 @@
-import type { Reference, FindReferencesReturn } from 'atom-ide-base';
+import type * as atomIde from 'atom-ide-base';
 import Convert from '../convert';
 import {
   Point,
@@ -44,15 +44,15 @@ export default class FindReferencesAdapter {
     editor: TextEditor,
     point: Point,
     projectRoot: string | null,
-  ): Promise<FindReferencesReturn | null> {
+  ): Promise<atomIde.FindReferencesReturn | null> {
     const locations = await connection.findReferences(
       FindReferencesAdapter.createReferenceParams(editor, point),
     );
     if (locations == null) {
       return null;
     }
 
-    const references: Reference[] = locations.map(FindReferencesAdapter.locationToReference);
+    const references: atomIde.Reference[] = locations.map(FindReferencesAdapter.locationToReference);
     return {
       type: 'data',
       baseUri: projectRoot || '',
@@ -82,7 +82,7 @@ export default class FindReferencesAdapter {
    * @param location A {Location} to convert.
    * @returns A {Reference} equivalent to the given {Location}.
    */
-  public static locationToReference(location: Location): Reference {
+  public static locationToReference(location: Location): atomIde.Reference {
     return {
       uri: Convert.uriToPath(location.uri),
       name: null,
@@ -94,7 +94,7 @@ export default class FindReferencesAdapter {
   public static getReferencedSymbolName(
     editor: TextEditor,
     point: Point,
-    references: Reference[],
+    references: atomIde.Reference[],
   ): string {
     if (references.length === 0) {
       return '';

lib/adapters/logging-console-adapter.ts

@@ -1,4 +1,4 @@
-import type { ConsoleApi } from 'atom-ide-base';
+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();
   }

lib/adapters/outline-view-adapter.ts

@@ -1,4 +1,4 @@
-import type { OutlineTree, Outline, TokenKind } from 'atom-ide-base';
+import type * as atomIde from 'atom-ide-base';
 import Convert from '../convert';
 import * as Utils from '../utils';
 import { CancellationTokenSource } from 'vscode-jsonrpc';
@@ -43,7 +43,7 @@ export default class OutlineViewAdapter {
    * @param editor The Atom {TextEditor} containing the text the Outline should represent.
    * @returns A {Promise} containing the {Outline} of this document.
    */
-  public async getOutline(connection: LanguageClientConnection, editor: TextEditor): Promise<Outline | null> {
+  public async getOutline(connection: LanguageClientConnection, editor: TextEditor): Promise<atomIde.Outline | null> {
     const results = await Utils.doWithCancellationToken(connection, this._cancellationTokens, (cancellationToken) =>
       connection.documentSymbol({ textDocument: Convert.editorToTextDocumentIdentifier(editor) }, cancellationToken),
     );
@@ -78,7 +78,7 @@ export default class OutlineViewAdapter {
    *   should be converted to an {Array} of {OutlineTree}.
    * @returns An {Array} of {OutlineTree} containing the given symbols that the Outline View can display.
    */
-  public static createHierarchicalOutlineTrees(symbols: DocumentSymbol[]): OutlineTree[] {
+  public static createHierarchicalOutlineTrees(symbols: DocumentSymbol[]): atomIde.OutlineTree[] {
     // Sort all the incoming symbols
     symbols.sort((a, b) => {
       if (a.range.start.line !== b.range.start.line) {
@@ -117,7 +117,7 @@ export default class OutlineViewAdapter {
    *   should be converted to an {OutlineTree}.
    * @returns An {OutlineTree} containing the given symbols that the Outline View can display.
    */
-  public static createOutlineTrees(symbols: SymbolInformation[]): OutlineTree[] {
+  public static createOutlineTrees(symbols: SymbolInformation[]): atomIde.OutlineTree[] {
     symbols.sort(
       (a, b) =>
         (a.location.range.start.line === b.location.range.start.line
@@ -146,7 +146,7 @@ export default class OutlineViewAdapter {
       return map;
     }, new Map());
 
-    const roots: OutlineTree[] = [];
+    const roots: atomIde.OutlineTree[] = [];
 
     // Put each item within its parent and extract out the roots
     for (const item of allItems) {
@@ -180,14 +180,14 @@ export default class OutlineViewAdapter {
   }
 
   private static _getClosestParent(
-    candidates: OutlineTree[] | null,
-    child: OutlineTree,
-  ): OutlineTree | null {
+    candidates: atomIde.OutlineTree[] | null,
+    child: atomIde.OutlineTree,
+  ): atomIde.OutlineTree | null {
     if (candidates == null || candidates.length === 0) {
       return null;
     }
 
-    let parent: OutlineTree | undefined;
+    let parent: atomIde.OutlineTree | undefined;
     for (const candidate of candidates) {
       if (
         candidate !== child &&
@@ -218,7 +218,7 @@ export default class OutlineViewAdapter {
    * @param symbol The {DocumentSymbol} to convert to an {OutlineTree}.
    * @returns The {OutlineTree} corresponding to the given {DocumentSymbol}.
    */
-  public static hierarchicalSymbolToOutline(symbol: DocumentSymbol): OutlineTree {
+  public static hierarchicalSymbolToOutline(symbol: DocumentSymbol): atomIde.OutlineTree {
     const icon = OutlineViewAdapter.symbolKindToEntityKind(symbol.kind);
 
     return {
@@ -243,7 +243,7 @@ export default class OutlineViewAdapter {
    * @param symbol The {SymbolInformation} to convert to an {OutlineTree}.
    * @returns The {OutlineTree} equivalent to the given {SymbolInformation}.
    */
-  public static symbolToOutline(symbol: SymbolInformation): OutlineTree {
+  public static symbolToOutline(symbol: SymbolInformation): atomIde.OutlineTree {
     const icon = OutlineViewAdapter.symbolKindToEntityKind(symbol.kind);
     return {
       tokenizedText: [
@@ -321,7 +321,7 @@ export default class OutlineViewAdapter {
    * @param symbol The numeric symbol kind received from the language server.
    * @returns A string representing the equivalent syntax token kind.
    */
-  public static symbolKindToTokenKind(symbol: number): TokenKind {
+  public static symbolKindToTokenKind(symbol: number): atomIde.TokenKind {
     switch (symbol) {
       case SymbolKind.Class:
         return 'type';

lib/adapters/rename-adapter.ts

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

lib/adapters/signature-help-adapter.ts

@@ -1,4 +1,4 @@
-import type { SignatureHelpRegistry } from "atom-ide-base";
+import type * as atomIde from 'atom-ide-base';
 import assert = require('assert');
 import Convert from '../convert';
 import { ActiveServer } from '../server-manager';
@@ -37,7 +37,7 @@ export default class SignatureHelpAdapter {
     this._disposables.dispose();
   }
 
-  public attach(register: SignatureHelpRegistry): void {
+  public attach(register: atomIde.SignatureHelpRegistry): void {
     const { signatureHelpProvider } = this._capabilities;
     assert(signatureHelpProvider != null);