Merge pull request #123 from atom-community/type-errors

Author: aminya

lib/adapters/autocomplete-adapter.ts

@@ -20,7 +20,7 @@ import {
   TextEditor,
 } from 'atom';
 import * as ac from 'atom/autocomplete-plus';
-import { Suggestion, TextSuggestion, SnippetSuggestion } from 'atom-ide';
+import { Suggestion, TextSuggestion, SnippetSuggestion } from '../types/autocomplete-extended';
 
 /**
  * Holds a list of suggestions generated from the CompletionItem[]

lib/types/autocomplete-extended.ts

@@ -0,0 +1,25 @@
+// Autocomplete extention (the properties added by atom-languageclient)
+// See this PR: https://github.com/DefinitelyTyped/DefinitelyTyped/pull/51284
+
+import * as ac from 'atom/autocomplete-plus';
+
+/** Adds LSP specific properties to the Atom SuggestionBase type */
+interface SuggestionBase extends ac.SuggestionBase {
+  /**
+   * A string that is used when filtering and sorting a set of
+   * completion items with a prefix present. When `falsy` the
+   * [displayText](#ac.SuggestionBase.displayText) is used. When
+   * no prefix, the `sortText` property is used.
+   */
+  filterText?: string;
+
+  /**
+   * String representing the replacement prefix from the suggestion's
+   * custom start point to the original buffer position the suggestion
+   * was gathered from.
+   */
+  customReplacmentPrefix?: string;
+}
+export type TextSuggestion = SuggestionBase & ac.TextSuggestion;
+export type SnippetSuggestion = SuggestionBase & ac.SnippetSuggestion;
+export type Suggestion =  TextSuggestion | SnippetSuggestion;

package.json

@@ -16,9 +16,10 @@
     "test.format": "prettier . --check",
     "lint": "eslint . --fix --ext .ts",
     "test.lint": "eslint . --ext .ts",
-    "clean": "rimraf build",
-    "compile": "tsc",
-    "watch": "tsc -watch",
+    "clean": "shx rm -rf build && mkdirp build",
+    "copy.typings": "shx cp -r ./typings ./build",
+    "compile": "npm run copy.typings && tsc",
+    "watch": "npm run compile -- --watch",
     "prepare": "npm run clean && npm run compile",
     "test": "npm run compile && atom --test build/test"
   },
@@ -43,7 +44,7 @@
     "eslint": "^7.18.0",
     "mocha": "^8.2.1",
     "mocha-appveyor-reporter": "^0.4.2",
-    "rimraf": "^3.0.2",
+    "shx": "^0.3.3",
     "sinon": "^9.2.4",
     "typescript": "~4.1.3"
   }

pnpm-lock.yaml

@@ -9,7 +9,7 @@ import {
 import * as ac from 'atom/autocomplete-plus';
 import { expect } from 'chai';
 import { createSpyConnection, createFakeEditor } from '../helpers.js';
-import { TextSuggestion, SnippetSuggestion } from 'atom-ide';
+import { TextSuggestion, SnippetSuggestion } from '../../lib/types/autocomplete-extended';
 import { CompletionItem, MarkupContent, InsertTextFormat, TextEdit, Command } from '../../lib/languageclient';
 
 function createRequest({

test/adapters/autocomplete-adapter.test.ts

@@ -12,11 +12,14 @@
         "noFallthroughCasesInSwitch": true,
         "noImplicitReturns": true,
         "noUnusedLocals": true,
-        "baseUrl": "./"
+        "typeRoots": [
+            "./node_modules/@types",
+            "./typings"
+        ]
     },
     "include": [
-        "typings/**/*.ts",
-        "lib/**/*.ts",
-        "test/**/*.ts"
+        "typings",
+        "lib",
+        "test"
     ]
 }

tsconfig.json

@@ -1,36 +1,4 @@
 declare module 'atom-ide' {
-
   // atom-ide-base types for backward compatibility
   export * from "atom-ide-base/types-packages/main"
-
-  // NotificationButton for backward compatibility (moved to "../../lib/adapters/notifications-adapter")
-  export interface NotificationButton {
-    text: string
-  }
-
-  // Autocomplete extention (the properties added by atom-languageclient)
-  // See this PR: https://github.com/DefinitelyTyped/DefinitelyTyped/pull/51284
-
-  import * as ac from 'atom/autocomplete-plus';
-
-  /** Adds LSP specific properties to the Atom SuggestionBase type */
-  interface SuggestionBase extends ac.SuggestionBase {
-    /**
-     * A string that is used when filtering and sorting a set of
-     * completion items with a prefix present. When `falsy` the
-     * [displayText](#ac.SuggestionBase.displayText) is used. When
-     * no prefix, the `sortText` property is used.
-     */
-    filterText?: string;
-
-    /**
-     * String representing the replacement prefix from the suggestion's
-     * custom start point to the original buffer position the suggestion
-     * was gathered from.
-     */
-    customReplacmentPrefix?: string;
-  }
-  export type TextSuggestion = SuggestionBase & ac.TextSuggestion;
-  export type SnippetSuggestion = SuggestionBase & ac.SnippetSuggestion;
-  export type Suggestion =  TextSuggestion | SnippetSuggestion;
 }