Fix some tslint stuff and remove util.promisify

Author: Levertion

.travis.yml

@@ -8,10 +8,9 @@ branches:
         - master
 sudo: false
 node_js:
-    - stable
-    # Needs to support node 7 for vscode
-    # Possibly irrelevant as of ~1.27
-    - "7"
+    # - stable
+    # For vscode - same as stable
+    - "10"
 before_install:
     - npm install -g npm@6
 install:

package-lock.json

@@ -44,7 +44,6 @@
         "sprintf-js": "^1.1.2",
         "synchronous-promise": "^2.0.6",
         "tslib": "^1.9.3",
-        "util.promisify": "^1.0.0",
         "vscode-json-languageservice": "^3.2.0",
         "vscode-languageserver": "^5.2.1",
         "vscode-uri": "^1.0.6"

package.json

@@ -1,5 +1,6 @@
 // Create global variables
 
+// tslint:disable-next-line:no-namespace
 declare namespace NodeJS {
     interface Global {
         mcLangLog: typeof mcLangLog;
@@ -12,28 +13,23 @@ declare namespace NodeJS {
 declare const mcLangSettings: McFunctionSettings;
 
 interface McFunctionSettings extends LocalMcFunctionSettings {
-    /**
-     * Settings related to information tracking
-     */
-    trace: {
-        /**
-         * Whether or not to show output from internal logging messages.
-         */
-        internalLogging: boolean;
-    };
-    /**
-     * Settings related to translating the server errors.
-     */
-    translation: {
-        /**
-         * The code for the language to be used.
-         */
-        lang: string;
-    };
     /**
      * Settings related to the collection of data.
      */
     data: {
+        /**
+         * Global Scoped Setting
+         *
+         * __Advanced Users Only__
+         *
+         * The path to a custom (server) jar to attempt to extract data from.
+         *
+         * This is recommended for when working with mods,
+         * or past Minecraft versions (AFTER 1.13 Snapshot 18w01a) only.
+         *
+         * Note that not all mod parsers will be always supported, and features may change between snapshots.
+         */
+        customJar: string;
         /**
          * Global Scoped Setting
          *
@@ -54,19 +50,6 @@ interface McFunctionSettings extends LocalMcFunctionSettings {
          * Disabled by default.
          */
         enabled: boolean;
-        /**
-         * Global Scoped Setting
-         *
-         * __Advanced Users Only__
-         *
-         * The path to a custom (server) jar to attempt to extract data from.
-         *
-         * This is recommended for when working with mods,
-         * or past Minecraft versions (AFTER 1.13 Snapshot 18w01a) only.
-         *
-         * Note that not all mod parsers will be always supported, and features may change between snapshots.
-         */
-        customJar: string;
         /**
          * Global Scoped Setting
          *
@@ -89,6 +72,24 @@ interface McFunctionSettings extends LocalMcFunctionSettings {
     parsers?: {
         [name: string]: import("./types").Parser;
     };
+    /**
+     * Settings related to information tracking
+     */
+    trace: {
+        /**
+         * Whether or not to show output from internal logging messages.
+         */
+        internalLogging: boolean;
+    };
+    /**
+     * Settings related to translating the server errors.
+     */
+    translation: {
+        /**
+         * The code for the language to be used.
+         */
+        lang: string;
+    };
 }
 
 interface LocalMcFunctionSettings {
@@ -118,39 +119,13 @@ interface McLogger {
      * This is disabled or enabled
      * based on the "mcfunction.trace.internalLogging" setting
      */
-    internal: (message: string) => void;
+    internal(message: string): void;
 }
 /**
  * An internal logging type to allow proper typing information to be used for mcLangLog.
  */
 type InternalLog = (message: string) => void;
 
-type Dictionary<T> = { [key: string]: T };
-
-// Type definitions for util.promisify 1.0
-// Project: https://github.com/ljharb/util.promisify#readme
-// Definitions by: Adam Voss <https://github.com/adamvoss>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Modified to exclude the redeclaration of util.promisify for this project
-declare module "util.promisify" {
-    export = promisify;
-
-    function promisify(
-        f: (...args: any[]) => void
-    ): (...args: any[]) => Promise<any>;
-
-    namespace promisify {
-        interface implementation {
-            (fn: (...args: any[]) => void): (...args: any[]) => Promise<any>;
-            custom: symbol;
-            customPromisifyArgs: symbol | undefined;
-        }
-
-        const custom: symbol;
-        const customPromisifyArgs: symbol;
-        function getPolyfill(): implementation;
-        const implementation: implementation;
-        function shim(): implementation;
-    }
+interface Dictionary<T> {
+    [key: string]: T;
 }

src/declaration.d.ts

@@ -1,6 +1,5 @@
 import { EventEmitter } from "events";
 import { promisify } from "util";
-import { shim } from "util.promisify";
 import {
     CompletionList,
     createConnection,

src/index.ts

@@ -1,6 +1,5 @@
 import * as path from "path";
-import { shim } from "util.promisify";
-shim();
+
 const logger = (message: string) => {
     // tslint:disable-next-line:no-console
     console.log(message);