Merge conflict

1 files changed, 0 insertions, 78 deletions

diff --git a/elpa/tide-20220514.614/tsserver/lib.es2015.promise.d.ts b/elpa/tide-20220514.614/tsserver/lib.es2015.promise.d.ts
deleted file mode 100644
index 22ccea8..0000000
--- a/elpa/tide-20220514.614/tsserver/lib.es2015.promise.d.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-
-
-
-/// <reference no-default-lib="true"/>

-
-
-interface PromiseConstructor {

-    /**

-     * A reference to the prototype.

-     */

-    readonly prototype: Promise<any>;

-

-    /**

-     * Creates a new Promise.

-     * @param executor A callback used to initialize the promise. This callback is passed two arguments:

-     * a resolve callback used to resolve the promise with a value or the result of another promise,

-     * and a reject callback used to reject the promise with a provided reason or error.

-     */

-    new <T>(executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;

-

-    /**

-     * Creates a Promise that is resolved with an array of results when all of the provided Promises

-     * resolve, or rejected when any Promise is rejected.

-     * @param values An array of Promises.

-     * @returns A new Promise.

-     */

-    all<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]> }>;

-

-    // see: lib.es2015.iterable.d.ts

-    // all<T>(values: Iterable<T | PromiseLike<T>>): Promise<T[]>;

-

-    /**

-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved

-     * or rejected.

-     * @param values An array of Promises.

-     * @returns A new Promise.

-     */

-    race<T extends readonly unknown[] | []>(values: T): Promise<Awaited<T[number]>>;

-

-    // see: lib.es2015.iterable.d.ts

-    // race<T>(values: Iterable<T>): Promise<T extends PromiseLike<infer U> ? U : T>;

-

-    /**

-     * Creates a new rejected promise for the provided reason.

-     * @param reason The reason the promise was rejected.

-     * @returns A new rejected Promise.

-     */

-    reject<T = never>(reason?: any): Promise<T>;

-

-    /**

-     * Creates a new resolved promise.

-     * @returns A resolved promise.

-     */

-    resolve(): Promise<void>;

-

-    /**

-     * Creates a new resolved promise for the provided value.

-     * @param value A promise.

-     * @returns A promise whose internal state matches the provided promise.

-     */

-    resolve<T>(value: T | PromiseLike<T>): Promise<T>;

-}

-

-declare var Promise: PromiseConstructor;