diff --git a/package.json b/package.json index cf12fe7..5b32f21 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "jsonc-parser": "^2.0.2", "lint-staged": "^8.1.0", "monaco-editor": "^0.16.2", - "monaco-editor-core": "0.15.5", + "monaco-editor-core": "0.16.1", "monaco-languages": "1.6.0", "monaco-plugin-helpers": "^1.0.2", "prettier": "^1.19.1", diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts index 1357d9d..4b48a28 100644 --- a/src/languageFeatures.ts +++ b/src/languageFeatures.ts @@ -326,6 +326,11 @@ export class CompletionAdapter documentation: entry.documentation, detail: entry.detail, kind: toCompletionItemKind(entry.kind), + range: { + startLineNumber: position.lineNumber, + endLineNumber: position.lineNumber, + ...wordInfo, + }, }; if (entry.textEdit) { item.range = toRange(entry.textEdit.range); diff --git a/src/workerManager.ts b/src/workerManager.ts index a5a4908..41e2a25 100644 --- a/src/workerManager.ts +++ b/src/workerManager.ts @@ -7,7 +7,6 @@ import { LanguageServiceDefaultsImpl } from './monaco.contribution'; import { YAMLWorker } from './yamlWorker'; -import Promise = monaco.Promise; import IDisposable = monaco.IDisposable; import Uri = monaco.Uri; diff --git a/src/yamlMode.ts b/src/yamlMode.ts index 2d15187..ce0e41f 100644 --- a/src/yamlMode.ts +++ b/src/yamlMode.ts @@ -9,7 +9,6 @@ import { LanguageServiceDefaultsImpl } from './monaco.contribution'; import { WorkerManager } from './workerManager'; import { YAMLWorker } from './yamlWorker'; -import Promise = monaco.Promise; import Uri = monaco.Uri; import IDisposable = monaco.IDisposable; diff --git a/src/yamlWorker.ts b/src/yamlWorker.ts index cb3f779..af1ec5e 100644 --- a/src/yamlWorker.ts +++ b/src/yamlWorker.ts @@ -6,7 +6,6 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import Promise = monaco.Promise; import Thenable = monaco.Thenable; import IWorkerContext = monaco.worker.IWorkerContext; @@ -52,7 +51,7 @@ export class YAMLWorker { if (document) { return this._languageService.doValidation(document, this._isKubernetes); } - return Promise.as([]); + return Promise.resolve([]); } public doComplete( @@ -83,17 +82,17 @@ export class YAMLWorker { ): Thenable { const document = this._getTextDocument(uri); const textEdits = this._languageService.doFormat(document, options); - return Promise.as(textEdits); + return Promise.resolve(textEdits); } public resetSchema(uri: string): Thenable { - return Promise.as(this._languageService.resetSchema(uri)); + return Promise.resolve(this._languageService.resetSchema(uri)); } public findDocumentSymbols(uri: string): Thenable { const document = this._getTextDocument(uri); const symbols = this._languageService.findDocumentSymbols2(document); - return Promise.as(symbols); + return Promise.resolve(symbols); } private _getTextDocument(uri: string): ls.TextDocument { diff --git a/yarn.lock b/yarn.lock index ef4432d..e702890 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2807,10 +2807,10 @@ mkdirp@0.x, mkdirp@^0.5.0, mkdirp@^0.5.1: dependencies: minimist "0.0.8" -monaco-editor-core@0.15.5: - version "0.15.5" - resolved "https://registry.yarnpkg.com/monaco-editor-core/-/monaco-editor-core-0.15.5.tgz#145f1953a8e319282d92502252d68ef3486b6875" - integrity sha512-kM3KHRjj16cFdK5Z0EppKUu793JVMpsEesBSWlqdgrxcmjyDMXV6xK0oatPcAYp3eOfbbyjPhruxDXj85FKyIg== +monaco-editor-core@0.16.1: + version "0.16.1" + resolved "https://registry.yarnpkg.com/monaco-editor-core/-/monaco-editor-core-0.16.1.tgz#cb0242ef09e479e4482bffcc228ce7d1f266a20e" + integrity sha512-nydAuVbU3B1T/sNz4ZiO+92HUnLyVE4YQWr91R8WDEBItFZuwPs7Z2VaCTgouU6BwNrSnDdK/kAyhKgpih+GHQ== monaco-editor@^0.16.2: version "0.16.2"