From 0e0555455cb7da7e963d6fa85112c16d7c724dd1 Mon Sep 17 00:00:00 2001
From: Remco Haszing <remcohaszing@gmail.com>
Date: Wed, 31 Mar 2021 22:16:49 +0200
Subject: [PATCH] Replace Thenable with PromiseLike

`Thenable` is a deprecated alias of the TypeScript builtin `PromiseLike`.
---
 src/languageFeatures.ts | 17 ++++++++---------
 src/yamlWorker.ts       | 15 +++++++--------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts
index ee86855..a197460 100644
--- a/src/languageFeatures.ts
+++ b/src/languageFeatures.ts
@@ -13,12 +13,11 @@ import Uri = monaco.Uri;
 import Position = monaco.Position;
 import Range = monaco.Range;
 import IRange = monaco.IRange;
-import Thenable = monaco.Thenable;
 import CancellationToken = monaco.CancellationToken;
 import IDisposable = monaco.IDisposable;
 import { CustomFormatterOptions } from 'yaml-language-server';
 
-export type WorkerAccessor = (...more: Uri[]) => Thenable<YAMLWorker>;
+export type WorkerAccessor = (...more: Uri[]) => PromiseLike<YAMLWorker>;
 
 // --- diagnostics --- ---
 
@@ -304,7 +303,7 @@ export class CompletionAdapter
     position: Position,
     context: monaco.languages.CompletionContext,
     token: CancellationToken
-  ): Thenable<monaco.languages.CompletionList> {
+  ): PromiseLike<monaco.languages.CompletionList> {
     const resource = model.uri;
 
     return this._worker(resource)
@@ -412,7 +411,7 @@ export class HoverAdapter implements monaco.languages.HoverProvider {
     model: monaco.editor.IReadOnlyModel,
     position: Position,
     token: CancellationToken
-  ): Thenable<monaco.languages.Hover> {
+  ): PromiseLike<monaco.languages.Hover> {
     const resource = model.uri;
 
     return this._worker(resource)
@@ -484,7 +483,7 @@ export class DocumentSymbolAdapter
   public provideDocumentSymbols(
     model: monaco.editor.IReadOnlyModel,
     token: CancellationToken
-  ): Thenable<monaco.languages.DocumentSymbol[]> {
+  ): PromiseLike<monaco.languages.DocumentSymbol[]> {
     const resource = model.uri;
 
     return this._worker(resource)
@@ -530,7 +529,7 @@ export class DocumentFormattingEditProvider
     model: monaco.editor.IReadOnlyModel,
     options: monaco.languages.FormattingOptions,
     token: CancellationToken
-  ): Thenable<monaco.editor.ISingleEditOperation[]> {
+  ): PromiseLike<monaco.editor.ISingleEditOperation[]> {
     const resource = model.uri;
 
     return this._worker(resource).then((worker) => {
@@ -555,7 +554,7 @@ export class DocumentRangeFormattingEditProvider
     range: Range,
     options: monaco.languages.FormattingOptions,
     token: CancellationToken
-  ): Thenable<monaco.editor.ISingleEditOperation[]> {
+  ): PromiseLike<monaco.editor.ISingleEditOperation[]> {
     const resource = model.uri;
 
     return this._worker(resource).then((worker) => {
@@ -582,7 +581,7 @@ export class DocumentRangeFormattingEditProvider
 // public provideDocumentColors(
 // model: monaco.editor.IReadOnlyModel,
 // token: CancellationToken
-// ): Thenable<monaco.languages.IColorInformation[]> {
+// ): PromiseLike<monaco.languages.IColorInformation[]> {
 // const resource = model.uri;
 
 // return this._worker(resource)
@@ -602,7 +601,7 @@ export class DocumentRangeFormattingEditProvider
 // model: monaco.editor.IReadOnlyModel,
 // info: monaco.languages.IColorInformation,
 // token: CancellationToken
-// ): Thenable<monaco.languages.IColorPresentation[]> {
+// ): PromiseLike<monaco.languages.IColorPresentation[]> {
 // const resource = model.uri;
 
 // return this._worker(resource)
diff --git a/src/yamlWorker.ts b/src/yamlWorker.ts
index 81b8899..31c3a56 100644
--- a/src/yamlWorker.ts
+++ b/src/yamlWorker.ts
@@ -6,7 +6,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import Thenable = monaco.Thenable;
 import IWorkerContext = monaco.worker.IWorkerContext;
 
 import * as ls from 'vscode-languageserver-types';
@@ -46,7 +45,7 @@ export class YAMLWorker {
     });
   }
 
-  public doValidation(uri: string): Thenable<ls.Diagnostic[]> {
+  public doValidation(uri: string): PromiseLike<ls.Diagnostic[]> {
     const document = this._getTextDocument(uri);
     if (document) {
       return this._languageService.doValidation(document, this._isKubernetes);
@@ -57,7 +56,7 @@ export class YAMLWorker {
   public doComplete(
     uri: string,
     position: ls.Position
-  ): Thenable<ls.CompletionList> {
+  ): PromiseLike<ls.CompletionList> {
     const document = this._getTextDocument(uri);
     return this._languageService.doComplete(
       document,
@@ -66,11 +65,11 @@ export class YAMLWorker {
     );
   }
 
-  public doResolve(item: ls.CompletionItem): Thenable<ls.CompletionItem> {
+  public doResolve(item: ls.CompletionItem): PromiseLike<ls.CompletionItem> {
     return this._languageService.doResolve(item);
   }
 
-  public doHover(uri: string, position: ls.Position): Thenable<ls.Hover> {
+  public doHover(uri: string, position: ls.Position): PromiseLike<ls.Hover> {
     const document = this._getTextDocument(uri);
     return this._languageService.doHover(document, position);
   }
@@ -79,17 +78,17 @@ export class YAMLWorker {
     uri: string,
     range: ls.Range,
     options: yamlService.CustomFormatterOptions
-  ): Thenable<ls.TextEdit[]> {
+  ): PromiseLike<ls.TextEdit[]> {
     const document = this._getTextDocument(uri);
     const textEdits = this._languageService.doFormat(document, options);
     return Promise.resolve(textEdits);
   }
 
-  public resetSchema(uri: string): Thenable<boolean> {
+  public resetSchema(uri: string): PromiseLike<boolean> {
     return Promise.resolve(this._languageService.resetSchema(uri));
   }
 
-  public findDocumentSymbols(uri: string): Thenable<ls.DocumentSymbol[]> {
+  public findDocumentSymbols(uri: string): PromiseLike<ls.DocumentSymbol[]> {
     const document = this._getTextDocument(uri);
     const symbols = this._languageService.findDocumentSymbols2(document);
     return Promise.resolve(symbols);