cleanup

Author: nightwing

.github/workflows/nodejs.yml

@@ -52,6 +52,7 @@ jobs:
         fi
     # - run: npm run lint
     - run: node_modules/.bin/tsc --noImplicitAny --strict --noUnusedLocals --noImplicitReturns --noUnusedParameters --noImplicitThis ace.d.ts
+    - run: npm run typecheck
     - uses: codecov/codecov-action@v3
       with:
         token: d8edca4b-8e97-41e5-b54e-34c7cf3b2d47

Makefile.dryice.js

@@ -179,7 +179,7 @@ function buildTypes() {
     var aceCodeExtensionDefinitions = '/// <reference path="./ace-extensions.d.ts" />';
     // ace-builds package has different structure and can't use mode types defined for the ace-code.
     // ace-builds modes are declared along with other modules in the ace-modules.d.ts file below.
-    var definitions = fs.readFileSync(ACE_HOME + '/ace-internal.d.ts', 'utf8').replace(aceCodeModeDefinitions, '').replace(aceCodeExtensionDefinitions, '');
+    var definitions = fs.readFileSync(ACE_HOME + '/ace.d.ts', 'utf8').replace(aceCodeModeDefinitions, '').replace(aceCodeExtensionDefinitions, '');
     var paths = fs.readdirSync(BUILD_DIR + '/src-noconflict');
     var moduleRef = '/// <reference path="./ace-modules.d.ts" />';
 

package.json

@@ -44,6 +44,7 @@
         "cover": "istanbul cover src/test/all.js",
         "lint": "eslint \"src/**/*.js\"",
         "fix": "eslint --fix \"src/**/*.js\"",
+        "typecheck": "tsc -p tsconfig.json",
         "changelog": "standard-version",
         "prepack": "node tool/esm_resolver_generator.js && node Makefile.dryice.js css --target build-styles && rm -rf styles && mv build-styles/css styles"
     },

src/ace.js

@@ -9,8 +9,8 @@
 var dom = require("./lib/dom");
 
 var Range = require("./range").Range;
-var EditSession = require("./edit_session").EditSession;
 var Editor = require("./editor").Editor;
+var EditSession = require("./edit_session").EditSession;
 var UndoManager = require("./undomanager").UndoManager;
 var Renderer = require("./virtual_renderer").VirtualRenderer;
 
@@ -86,5 +86,4 @@ exports.Editor = Editor;
 exports.EditSession = EditSession;
 exports.UndoManager = UndoManager;
 exports.VirtualRenderer = Renderer;
-let version= exports.config.version;
-exports.version = version;
+exports.version = exports.config.version;

src/autocomplete.js

@@ -1,6 +1,8 @@
 "use strict";
 /**
  * @typedef {import("./editor").Editor} Editor
+ * @typedef {import("../ace-internal").Ace.CompletionProviderOptions} CompletionProviderOptions
+ * @typedef {import("../ace-internal").Ace.CompletionOptions} CompletionOptions
  */
 var HashHandler = require("./keyboard/hash_handler").HashHandler;
 var AcePopup = require("./autocomplete/popup").AcePopup;
@@ -450,7 +452,7 @@ class Autocomplete {
     /**
      * This is the entry point for the autocompletion class, triggers the actions which collect and display suggestions
      * @param {Editor} editor
-     * @param {import("../ace-internal").Ace.CompletionOptions} options
+     * @param {CompletionOptions} options
      */
     showPopup(editor, options) {
         if (this.editor)
@@ -490,7 +492,7 @@ class Autocomplete {
 
     /**
      * @param {boolean} keepPopupPosition
-     * @param {import("../ace-internal").Ace.CompletionOptions} options
+     * @param {CompletionOptions} options
      */
     updateCompletions(keepPopupPosition, options) {
         if (keepPopupPosition && this.base && this.completions) {
@@ -783,7 +785,7 @@ class CompletionProvider {
     /**
      * @param {Editor} editor
      * @param {number} index
-     * @param {import("../ace-internal").Ace.CompletionProviderOptions} [options]
+     * @param {CompletionProviderOptions} [options]
      * @returns {boolean}
      */
     insertByIndex(editor, index, options) {
@@ -796,7 +798,7 @@ class CompletionProvider {
     /**
      * @param {Editor} editor
      * @param {Completion} data
-     * @param {import("../ace-internal").Ace.CompletionProviderOptions} [options]
+     * @param {CompletionProviderOptions} [options]
      * @returns {boolean}
      */
     insertMatch(editor, data, options) {
@@ -898,7 +900,7 @@ class CompletionProvider {
      * This is the entry point to the class, it gathers, then provides the completions asynchronously via callback.
      * The callback function may be called multiple times, the last invokation is marked with a `finished` flag
      * @param {Editor} editor
-     * @param {import("../ace-internal").Ace.CompletionProviderOptions} options
+     * @param {CompletionProviderOptions} options
      * @param {(err: Error | undefined, completions: FilteredList | [], finished: boolean) => void} callback
      */
     provideCompletions(editor, options, callback) {