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

Merge pull request #23 from fleon/master

Browse source 
Remove usage of monaco.Promise
This commit is contained in:
Peng Xiao 2020-07-15 15:15:01 +08:00 committed by GitHub
commit d6b09443d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -54,7 +54,7 @@
"jsonc-parser": "^2.0.2", "jsonc-parser": "^2.0.2",
"lint-staged": "^8.1.0", "lint-staged": "^8.1.0",
"monaco-editor": "^0.16.2", "monaco-editor": "^0.16.2",
"monaco-editor-core": "0.15.5", "monaco-editor-core": "0.16.1",
"monaco-languages": "1.6.0", "monaco-languages": "1.6.0",
"monaco-plugin-helpers": "^1.0.2", "monaco-plugin-helpers": "^1.0.2",
"prettier": "^1.19.1", "prettier": "^1.19.1",

5
src/languageFeatures.ts
View file

@ -326,6 +326,11 @@ export class CompletionAdapter
documentation: entry.documentation, documentation: entry.documentation,
detail: entry.detail, detail: entry.detail,
kind: toCompletionItemKind(entry.kind), kind: toCompletionItemKind(entry.kind),
range: {
startLineNumber: position.lineNumber,
endLineNumber: position.lineNumber,
...wordInfo,
},
}; };
if (entry.textEdit) { if (entry.textEdit) {
item.range = toRange(entry.textEdit.range); item.range = toRange(entry.textEdit.range);

1
src/workerManager.ts
View file

@ -7,7 +7,6 @@
import { LanguageServiceDefaultsImpl } from './monaco.contribution'; import { LanguageServiceDefaultsImpl } from './monaco.contribution';
import { YAMLWorker } from './yamlWorker'; import { YAMLWorker } from './yamlWorker';
import Promise = monaco.Promise;
import IDisposable = monaco.IDisposable; import IDisposable = monaco.IDisposable;
import Uri = monaco.Uri; import Uri = monaco.Uri;

1
src/yamlMode.ts
View file

@ -9,7 +9,6 @@ import { LanguageServiceDefaultsImpl } from './monaco.contribution';
import { WorkerManager } from './workerManager'; import { WorkerManager } from './workerManager';
import { YAMLWorker } from './yamlWorker'; import { YAMLWorker } from './yamlWorker';
import Promise = monaco.Promise;
import Uri = monaco.Uri; import Uri = monaco.Uri;
import IDisposable = monaco.IDisposable; import IDisposable = monaco.IDisposable;

9
src/yamlWorker.ts
View file

@ -6,7 +6,6 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
'use strict'; 'use strict';
import Promise = monaco.Promise;
import Thenable = monaco.Thenable; import Thenable = monaco.Thenable;
import IWorkerContext = monaco.worker.IWorkerContext; import IWorkerContext = monaco.worker.IWorkerContext;
@ -52,7 +51,7 @@ export class YAMLWorker {
if (document) { if (document) {
return this._languageService.doValidation(document, this._isKubernetes); return this._languageService.doValidation(document, this._isKubernetes);
} }
return Promise.as([]); return Promise.resolve([]);
} }
public doComplete( public doComplete(
@ -83,17 +82,17 @@ export class YAMLWorker {
): Thenable<ls.TextEdit[]> { ): Thenable<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.as(textEdits); return Promise.resolve(textEdits);
} }
public resetSchema(uri: string): Thenable<boolean> { public resetSchema(uri: string): Thenable<boolean> {
return Promise.as(this._languageService.resetSchema(uri)); return Promise.resolve(this._languageService.resetSchema(uri));
} }
public findDocumentSymbols(uri: string): Thenable<ls.DocumentSymbol[]> { public findDocumentSymbols(uri: string): Thenable<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.as(symbols); return Promise.resolve(symbols);
} }
private _getTextDocument(uri: string): ls.TextDocument { private _getTextDocument(uri: string): ls.TextDocument {

8
yarn.lock
View file

@ -2807,10 +2807,10 @@ mkdirp@0.x, mkdirp@^0.5.0, mkdirp@^0.5.1:
dependencies: dependencies:
minimist "0.0.8" minimist "0.0.8"
monaco-editor-core@0.15.5: monaco-editor-core@0.16.1:
version "0.15.5" version "0.16.1"
resolved "https://registry.yarnpkg.com/monaco-editor-core/-/monaco-editor-core-0.15.5.tgz#145f1953a8e319282d92502252d68ef3486b6875" resolved "https://registry.yarnpkg.com/monaco-editor-core/-/monaco-editor-core-0.16.1.tgz#cb0242ef09e479e4482bffcc228ce7d1f266a20e"
integrity sha512-kM3KHRjj16cFdK5Z0EppKUu793JVMpsEesBSWlqdgrxcmjyDMXV6xK0oatPcAYp3eOfbbyjPhruxDXj85FKyIg== integrity sha512-nydAuVbU3B1T/sNz4ZiO+92HUnLyVE4YQWr91R8WDEBItFZuwPs7Z2VaCTgouU6BwNrSnDdK/kAyhKgpih+GHQ==
monaco-editor@^0.16.2: monaco-editor@^0.16.2:
version "0.16.2" version "0.16.2"