dan/monaco-yaml
1
0
Fork 0
mirror of https://github.com/danbulant/monaco-yaml synced 2026-07-07 20:10:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace Thenable with PromiseLike

Browse source 
`Thenable` is a deprecated alias of the TypeScript builtin `PromiseLike`.
This commit is contained in:
Remco Haszing 2021-03-31 22:16:49 +02:00
parent 4e00c72636
commit 0e0555455c
No known key found for this signature in database
GPG key ID: 40D9F5FE9155FD3C
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/languageFeatures.ts
View file

@ -13,12 +13,11 @@ import Uri = monaco.Uri;
import Position = monaco.Position; import Position = monaco.Position;
import Range = monaco.Range; import Range = monaco.Range;
import IRange = monaco.IRange; import IRange = monaco.IRange;
import Thenable = monaco.Thenable;
import CancellationToken = monaco.CancellationToken; import CancellationToken = monaco.CancellationToken;
import IDisposable = monaco.IDisposable; import IDisposable = monaco.IDisposable;
import { CustomFormatterOptions } from 'yaml-language-server'; import { CustomFormatterOptions } from 'yaml-language-server';
export type WorkerAccessor = (...more: Uri[]) => Thenable<YAMLWorker>; export type WorkerAccessor = (...more: Uri[]) => PromiseLike<YAMLWorker>;
// --- diagnostics --- --- // --- diagnostics --- ---
@ -304,7 +303,7 @@ export class CompletionAdapter
position: Position, position: Position,
context: monaco.languages.CompletionContext, context: monaco.languages.CompletionContext,
token: CancellationToken token: CancellationToken
): Thenable<monaco.languages.CompletionList> { ): PromiseLike<monaco.languages.CompletionList> {
const resource = model.uri; const resource = model.uri;
return this._worker(resource) return this._worker(resource)
@ -412,7 +411,7 @@ export class HoverAdapter implements monaco.languages.HoverProvider {
model: monaco.editor.IReadOnlyModel, model: monaco.editor.IReadOnlyModel,
position: Position, position: Position,
token: CancellationToken token: CancellationToken
): Thenable<monaco.languages.Hover> { ): PromiseLike<monaco.languages.Hover> {
const resource = model.uri; const resource = model.uri;
return this._worker(resource) return this._worker(resource)
@ -484,7 +483,7 @@ export class DocumentSymbolAdapter
public provideDocumentSymbols( public provideDocumentSymbols(
model: monaco.editor.IReadOnlyModel, model: monaco.editor.IReadOnlyModel,
token: CancellationToken token: CancellationToken
): Thenable<monaco.languages.DocumentSymbol[]> { ): PromiseLike<monaco.languages.DocumentSymbol[]> {
const resource = model.uri; const resource = model.uri;
return this._worker(resource) return this._worker(resource)
@ -530,7 +529,7 @@ export class DocumentFormattingEditProvider
model: monaco.editor.IReadOnlyModel, model: monaco.editor.IReadOnlyModel,
options: monaco.languages.FormattingOptions, options: monaco.languages.FormattingOptions,
token: CancellationToken token: CancellationToken
): Thenable<monaco.editor.ISingleEditOperation[]> { ): PromiseLike<monaco.editor.ISingleEditOperation[]> {
const resource = model.uri; const resource = model.uri;
return this._worker(resource).then((worker) => { return this._worker(resource).then((worker) => {
@ -555,7 +554,7 @@ export class DocumentRangeFormattingEditProvider
range: Range, range: Range,
options: monaco.languages.FormattingOptions, options: monaco.languages.FormattingOptions,
token: CancellationToken token: CancellationToken
): Thenable<monaco.editor.ISingleEditOperation[]> { ): PromiseLike<monaco.editor.ISingleEditOperation[]> {
const resource = model.uri; const resource = model.uri;
return this._worker(resource).then((worker) => { return this._worker(resource).then((worker) => {
@ -582,7 +581,7 @@ export class DocumentRangeFormattingEditProvider
// public provideDocumentColors( // public provideDocumentColors(
// model: monaco.editor.IReadOnlyModel, // model: monaco.editor.IReadOnlyModel,
// token: CancellationToken // token: CancellationToken
// ): Thenable<monaco.languages.IColorInformation[]> { // ): PromiseLike<monaco.languages.IColorInformation[]> {
// const resource = model.uri; // const resource = model.uri;
// return this._worker(resource) // return this._worker(resource)
@ -602,7 +601,7 @@ export class DocumentRangeFormattingEditProvider
// model: monaco.editor.IReadOnlyModel, // model: monaco.editor.IReadOnlyModel,
// info: monaco.languages.IColorInformation, // info: monaco.languages.IColorInformation,
// token: CancellationToken // token: CancellationToken
// ): Thenable<monaco.languages.IColorPresentation[]> { // ): PromiseLike<monaco.languages.IColorPresentation[]> {
// const resource = model.uri; // const resource = model.uri;
// return this._worker(resource) // return this._worker(resource)

15
src/yamlWorker.ts
View file

@ -6,7 +6,6 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
'use strict'; 'use strict';
import Thenable = monaco.Thenable;
import IWorkerContext = monaco.worker.IWorkerContext; import IWorkerContext = monaco.worker.IWorkerContext;
import * as ls from 'vscode-languageserver-types'; 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); const document = this._getTextDocument(uri);
if (document) { if (document) {
return this._languageService.doValidation(document, this._isKubernetes); return this._languageService.doValidation(document, this._isKubernetes);
@ -57,7 +56,7 @@ export class YAMLWorker {
public doComplete( public doComplete(
uri: string, uri: string,
position: ls.Position position: ls.Position
): Thenable<ls.CompletionList> { ): PromiseLike<ls.CompletionList> {
const document = this._getTextDocument(uri); const document = this._getTextDocument(uri);
return this._languageService.doComplete( return this._languageService.doComplete(
document, 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); 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); const document = this._getTextDocument(uri);
return this._languageService.doHover(document, position); return this._languageService.doHover(document, position);
} }
@ -79,17 +78,17 @@ export class YAMLWorker {
uri: string, uri: string,
range: ls.Range, range: ls.Range,
options: yamlService.CustomFormatterOptions options: yamlService.CustomFormatterOptions
): Thenable<ls.TextEdit[]> { ): PromiseLike<ls.TextEdit[]> {
const document = this._getTextDocument(uri); const document = this._getTextDocument(uri);
const textEdits = this._languageService.doFormat(document, options); const textEdits = this._languageService.doFormat(document, options);
return Promise.resolve(textEdits); return Promise.resolve(textEdits);
} }
public resetSchema(uri: string): Thenable<boolean> { public resetSchema(uri: string): PromiseLike<boolean> {
return Promise.resolve(this._languageService.resetSchema(uri)); 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 document = this._getTextDocument(uri);
const symbols = this._languageService.findDocumentSymbols2(document); const symbols = this._languageService.findDocumentSymbols2(document);
return Promise.resolve(symbols); return Promise.resolve(symbols);