From e45e533d2451db62bfeae542d8961bc0c51eec62 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 19 Sep 2020 01:52:17 +0200 Subject: [PATCH 1/3] update dependencies --- package-lock.json | 50 +++++++++++++++++++++++------------------------ package.json | 14 ++++++------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 111bf1b1..8b035e73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -411,15 +411,15 @@ } }, "monaco-editor-core": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.20.0.tgz", - "integrity": "sha512-4mdmfEejTvRZzrEIn70jqqNl3g15vnkRdTkJ8uMK4jiljntlwhiSc5vknZOLt1QM8za16C3tDrSl2mTL9ma2Sg==", + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.21.0.tgz", + "integrity": "sha512-buBxOxwexlb7pdQrIHjj7OGmtVmEe735NN7M8GbhN03eYAKQmaeIAs1AyneOOHvbvh1Ntm7PoHH8f196gd2p6w==", "dev": true }, "monaco-languages": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.10.0.tgz", - "integrity": "sha512-ARAws17Xh0K4WsZYkJY6CqHn9EYdYN8CjzK6w/jgXIwU0owzCdUWxzu+FNJ/LeDLcKxL/YK3phcwGFj9IqX2yw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-2.1.0.tgz", + "integrity": "sha512-c2afUp3lbUCrvEdVrH8EThQYbj5tb2FpvXFnFN3gOJScDlFknWb5nbaxiaVqY9CSIqzJVZpNc5HXpP5FWOuS3g==", "dev": true }, "monaco-plugin-helpers": { @@ -573,15 +573,15 @@ } }, "prettier": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz", - "integrity": "sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz", + "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==", "dev": true }, "pretty-quick": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.0.0.tgz", - "integrity": "sha512-oIXlGQUcUxt3XpoNfQECEWvH1Q9PtKfelF2pdp6UvC1CSQ5QcB7gUYKu0kuJGlm3LMBZzJaO/vbRkxA61pWlcg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.0.2.tgz", + "integrity": "sha512-4rWOs/Ifdkg7G/YX7Xbco4jZkuXPx445KdhuMI6REnl3nXRDb9+zysb29c76R59jsJzcnkcpAaGi8D/RjAVfSQ==", "dev": true, "requires": { "chalk": "^3.0.0", @@ -697,9 +697,9 @@ } }, "terser": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.0.tgz", - "integrity": "sha512-XTT3D3AwxC54KywJijmY2mxZ8nJiEjBHVYzq8l9OaYuRFWeQNBwvipuzzYEP4e+/AVcd1hqG/CqgsdIRyT45Fg==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.2.tgz", + "integrity": "sha512-H67sydwBz5jCUA32ZRL319ULu+Su1cAoZnnc+lXnenGRYWyLE3Scgkt8mNoAsMx0h5kdo758zdoS0LG9rYZXDQ==", "dev": true, "requires": { "commander": "^2.20.0", @@ -708,20 +708,20 @@ } }, "typescript": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz", - "integrity": "sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz", + "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==", "dev": true }, "vscode-html-languageservice": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-3.1.2.tgz", - "integrity": "sha512-ixdcyb2xBmwNTuMitT6vNbnvHCnATim1ZZC/CxiUtzKImQjuXAT5Px53x/7+zUqGU9RlfkEwHN//slWcCBMdMw==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-3.1.3.tgz", + "integrity": "sha512-ViGIfK7D3E99dFXprTenz20M8xzb0+fsAMPSPpz5JrHyBU7hdx+0cc/angDqdSygYMOm8vkbTviXwPtg6P3hhg==", "dev": true, "requires": { "vscode-languageserver-textdocument": "^1.0.1", "vscode-languageserver-types": "3.16.0-next.2", - "vscode-nls": "^4.1.2", + "vscode-nls": "^5.0.0", "vscode-uri": "^2.1.2" }, "dependencies": { @@ -746,9 +746,9 @@ "dev": true }, "vscode-nls": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz", - "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz", + "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==", "dev": true }, "vscode-uri": { diff --git a/package.json b/package.json index 66a137ed..ff398efd 100644 --- a/package.json +++ b/package.json @@ -23,15 +23,15 @@ "typings": "./release/esm/monaco.contribution.d.ts", "devDependencies": { "husky": "^4.3.0", - "monaco-editor-core": "0.20.0", - "monaco-languages": "^1.10.0", + "monaco-editor-core": "0.21.0", + "monaco-languages": "^2.1.0", "monaco-plugin-helpers": "^1.0.3", - "prettier": "^2.1.1", - "pretty-quick": "^3.0.0", + "prettier": "^2.1.2", + "pretty-quick": "^3.0.2", "requirejs": "^2.3.6", - "typescript": "^4.0.2", - "terser": "^5.3.0", - "vscode-html-languageservice": "3.1.2", + "typescript": "^4.0.3", + "terser": "^5.3.2", + "vscode-html-languageservice": "3.1.3", "vscode-languageserver-types": "3.15.1", "vscode-languageserver-textdocument": "^1.0.1" }, From 47b7fd3e2df751a14eb30702a136a531cf539062 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 19 Sep 2020 01:52:42 +0200 Subject: [PATCH 2/3] Set `printWidth` to 100 --- .prettierrc | 3 +- monaco.d.ts | 6 +-- scripts/bundle.js | 25 +++--------- src/fillers/vscode-nls.ts | 6 +-- src/htmlMode.ts | 42 +++++-------------- src/htmlWorker.ts | 32 +++------------ src/languageFeatures.ts | 82 +++++++++----------------------------- src/monaco.contribution.ts | 16 ++------ src/tsconfig.esm.json | 8 +--- src/tsconfig.json | 8 +--- src/workerManager.ts | 4 +- test/index.html | 64 ++++++++++++++--------------- 12 files changed, 77 insertions(+), 219 deletions(-) diff --git a/.prettierrc b/.prettierrc index e1b5c6fc..c12f08c5 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,5 +3,6 @@ "singleQuote": true, "trailingComma": "none", "semi": true, - "useTabs": true + "useTabs": true, + "printWidth": 100 } diff --git a/monaco.d.ts b/monaco.d.ts index 7792d753..09f02758 100644 --- a/monaco.d.ts +++ b/monaco.d.ts @@ -18,11 +18,7 @@ declare namespace monaco.languages.html { readonly indentHandlebars: boolean; readonly endWithNewline: boolean; readonly extraLiners: string; - readonly wrapAttributes: - | 'auto' - | 'force' - | 'force-aligned' - | 'force-expand-multiline'; + readonly wrapAttributes: 'auto' | 'force' | 'force-aligned' | 'force-expand-multiline'; } export interface CompletionConfiguration { [provider: string]: boolean; diff --git a/scripts/bundle.js b/scripts/bundle.js index 44e6989e..b7b0c4bb 100644 --- a/scripts/bundle.js +++ b/scripts/bundle.js @@ -40,26 +40,17 @@ function bundleOne(moduleId, exclude) { packages: [ { name: 'vscode-html-languageservice', - location: path.join( - REPO_ROOT, - 'node_modules/vscode-html-languageservice/lib/umd' - ), + location: path.join(REPO_ROOT, 'node_modules/vscode-html-languageservice/lib/umd'), main: 'htmlLanguageService' }, { name: 'vscode-languageserver-types', - location: path.join( - REPO_ROOT, - 'node_modules/vscode-languageserver-types/lib/umd' - ), + location: path.join(REPO_ROOT, 'node_modules/vscode-languageserver-types/lib/umd'), main: 'main' }, { name: 'vscode-languageserver-textdocument', - location: path.join( - REPO_ROOT, - 'node_modules/vscode-languageserver-textdocument/lib/umd' - ), + location: path.join(REPO_ROOT, 'node_modules/vscode-languageserver-textdocument/lib/umd'), main: 'main' }, { @@ -75,14 +66,8 @@ function bundleOne(moduleId, exclude) { ] }, async function (buildResponse) { - const devFilePath = path.join( - REPO_ROOT, - 'release/dev/' + moduleId + '.js' - ); - const minFilePath = path.join( - REPO_ROOT, - 'release/min/' + moduleId + '.js' - ); + const devFilePath = path.join(REPO_ROOT, 'release/dev/' + moduleId + '.js'); + const minFilePath = path.join(REPO_ROOT, 'release/min/' + moduleId + '.js'); const fileContents = fs.readFileSync(devFilePath).toString(); console.log(); console.log(`Minifying ${devFilePath}...`); diff --git a/src/fillers/vscode-nls.ts b/src/fillers/vscode-nls.ts index 09cb22e0..38f7b334 100644 --- a/src/fillers/vscode-nls.ts +++ b/src/fillers/vscode-nls.ts @@ -33,11 +33,7 @@ function format(message: string, args: any[]): string { return result; } -function localize( - key: string | LocalizeInfo, - message: string, - ...args: any[] -): string { +function localize(key: string | LocalizeInfo, message: string, ...args: any[]): string { return format(message, args); } diff --git a/src/htmlMode.ts b/src/htmlMode.ts index c30f12b0..ebfd0af7 100644 --- a/src/htmlMode.ts +++ b/src/htmlMode.ts @@ -12,9 +12,7 @@ import { Uri, IDisposable, languages } from './fillers/monaco-editor-core'; export function setupMode1(defaults: LanguageServiceDefaults): void { const client = new WorkerManager(defaults); - const worker: languageFeatures.WorkerAccessor = ( - ...uris: Uri[] - ): Promise => { + const worker: languageFeatures.WorkerAccessor = (...uris: Uri[]): Promise => { return client.getLanguageServiceWorker(...uris); }; @@ -25,19 +23,13 @@ export function setupMode1(defaults: LanguageServiceDefaults): void { languageId, new languageFeatures.CompletionAdapter(worker) ); - languages.registerHoverProvider( - languageId, - new languageFeatures.HoverAdapter(worker) - ); + languages.registerHoverProvider(languageId, new languageFeatures.HoverAdapter(worker)); languages.registerDocumentHighlightProvider( languageId, new languageFeatures.DocumentHighlightAdapter(worker) ); - languages.registerLinkProvider( - languageId, - new languageFeatures.DocumentLinkAdapter(worker) - ); + languages.registerLinkProvider(languageId, new languageFeatures.DocumentLinkAdapter(worker)); languages.registerFoldingRangeProvider( languageId, new languageFeatures.FoldingRangeAdapter(worker) @@ -50,10 +42,7 @@ export function setupMode1(defaults: LanguageServiceDefaults): void { languageId, new languageFeatures.SelectionRangeAdapter(worker) ); - languages.registerRenameProvider( - languageId, - new languageFeatures.RenameAdapter(worker) - ); + languages.registerRenameProvider(languageId, new languageFeatures.RenameAdapter(worker)); // only html if (languageId === 'html') { @@ -76,9 +65,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable { const client = new WorkerManager(defaults); disposables.push(client); - const worker: languageFeatures.WorkerAccessor = ( - ...uris: Uri[] - ): Promise => { + const worker: languageFeatures.WorkerAccessor = (...uris: Uri[]): Promise => { return client.getLanguageServiceWorker(...uris); }; @@ -97,10 +84,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable { } if (modeConfiguration.hovers) { providers.push( - languages.registerHoverProvider( - languageId, - new languageFeatures.HoverAdapter(worker) - ) + languages.registerHoverProvider(languageId, new languageFeatures.HoverAdapter(worker)) ); } if (modeConfiguration.documentHighlights) { @@ -113,10 +97,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable { } if (modeConfiguration.links) { providers.push( - languages.registerLinkProvider( - languageId, - new languageFeatures.DocumentLinkAdapter(worker) - ) + languages.registerLinkProvider(languageId, new languageFeatures.DocumentLinkAdapter(worker)) ); } if (modeConfiguration.documentSymbols) { @@ -129,10 +110,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable { } if (modeConfiguration.rename) { providers.push( - languages.registerRenameProvider( - languageId, - new languageFeatures.RenameAdapter(worker) - ) + languages.registerRenameProvider(languageId, new languageFeatures.RenameAdapter(worker)) ); } if (modeConfiguration.foldingRanges) { @@ -168,9 +146,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable { ); } if (modeConfiguration.diagnostics) { - providers.push( - new languageFeatures.DiagnosticsAdapter(languageId, worker, defaults) - ); + providers.push(new languageFeatures.DiagnosticsAdapter(languageId, worker, defaults)); } } diff --git a/src/htmlWorker.ts b/src/htmlWorker.ts index a5630742..a0ad9625 100644 --- a/src/htmlWorker.ts +++ b/src/htmlWorker.ts @@ -52,10 +52,7 @@ export class HTMLWorker { ); return Promise.resolve(textEdits); } - async doHover( - uri: string, - position: htmlService.Position - ): Promise { + async doHover(uri: string, position: htmlService.Position): Promise { let document = this._getTextDocument(uri); let htmlDocument = this._languageService.parseHTMLDocument(document); let hover = this._languageService.doHover(document, position, htmlDocument); @@ -67,11 +64,7 @@ export class HTMLWorker { ): Promise { let document = this._getTextDocument(uri); let htmlDocument = this._languageService.parseHTMLDocument(document); - let highlights = this._languageService.findDocumentHighlights( - document, - position, - htmlDocument - ); + let highlights = this._languageService.findDocumentHighlights(document, position, htmlDocument); return Promise.resolve(highlights); } async findDocumentLinks(uri: string): Promise { @@ -79,15 +72,10 @@ export class HTMLWorker { let links = this._languageService.findDocumentLinks(document, null); return Promise.resolve(links); } - async findDocumentSymbols( - uri: string - ): Promise { + async findDocumentSymbols(uri: string): Promise { let document = this._getTextDocument(uri); let htmlDocument = this._languageService.parseHTMLDocument(document); - let symbols = this._languageService.findDocumentSymbols( - document, - htmlDocument - ); + let symbols = this._languageService.findDocumentSymbols(document, htmlDocument); return Promise.resolve(symbols); } async getFoldingRanges( @@ -113,12 +101,7 @@ export class HTMLWorker { ): Promise { let document = this._getTextDocument(uri); let htmlDocument = this._languageService.parseHTMLDocument(document); - let renames = this._languageService.doRename( - document, - position, - newName, - htmlDocument - ); + let renames = this._languageService.doRename(document, position, newName, htmlDocument); return Promise.resolve(renames); } private _getTextDocument(uri: string): htmlService.TextDocument { @@ -142,9 +125,6 @@ export interface ICreateData { languageSettings: Options; } -export function create( - ctx: worker.IWorkerContext, - createData: ICreateData -): HTMLWorker { +export function create(ctx: worker.IWorkerContext, createData: ICreateData): HTMLWorker { return new HTMLWorker(ctx, createData); } diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts index d7371f27..743333de 100644 --- a/src/languageFeatures.ts +++ b/src/languageFeatures.ts @@ -104,11 +104,7 @@ export class DiagnosticsAdapter { .then((worker) => { return worker.doValidation(resource.toString()).then((diagnostics) => { const markers = diagnostics.map((d) => toDiagnostics(resource, d)); - editor.setModelMarkers( - editor.getModel(resource), - languageId, - markers - ); + editor.setModelMarkers(editor.getModel(resource), languageId, markers); }); }) .then(undefined, (err) => { @@ -132,12 +128,8 @@ function toSeverity(lsSeverity: number): MarkerSeverity { } } -function toDiagnostics( - resource: Uri, - diag: htmlService.Diagnostic -): editor.IMarkerData { - const code = - typeof diag.code === 'number' ? String(diag.code) : diag.code; +function toDiagnostics(resource: Uri, diag: htmlService.Diagnostic): editor.IMarkerData { + const code = typeof diag.code === 'number' ? String(diag.code) : diag.code; return { severity: toSeverity(diag.severity), @@ -182,9 +174,7 @@ function toRange(range: htmlService.Range): Range { ); } -function isInsertReplaceEdit( - edit: TextEdit | InsertReplaceEdit -): edit is InsertReplaceEdit { +function isInsertReplaceEdit(edit: TextEdit | InsertReplaceEdit): edit is InsertReplaceEdit { return ( typeof (edit).insert !== 'undefined' && typeof (edit).replace !== 'undefined' @@ -281,9 +271,7 @@ function fromCompletionItemKind( return htmlService.CompletionItemKind.Property; } -function toTextEdit( - textEdit: htmlService.TextEdit -): editor.ISingleEditOperation { +function toTextEdit(textEdit: htmlService.TextEdit): editor.ISingleEditOperation { if (!textEdit) { return void 0; } @@ -347,13 +335,10 @@ export class CompletionAdapter implements languages.CompletionItemProvider { item.insertText = entry.textEdit.newText; } if (entry.additionalTextEdits) { - item.additionalTextEdits = entry.additionalTextEdits.map( - toTextEdit - ); + item.additionalTextEdits = entry.additionalTextEdits.map(toTextEdit); } if (entry.insertTextFormat === htmlService.InsertTextFormat.Snippet) { - item.insertTextRules = - languages.CompletionItemInsertTextRule.InsertAsSnippet; + item.insertTextRules = languages.CompletionItemInsertTextRule.InsertAsSnippet; } return item; }); @@ -399,10 +384,7 @@ function toMarkdownString( } function toMarkedStringArray( - contents: - | htmlService.MarkupContent - | htmlService.MarkedString - | htmlService.MarkedString[] + contents: htmlService.MarkupContent | htmlService.MarkedString | htmlService.MarkedString[] ): IMarkdownString[] { if (!contents) { return void 0; @@ -441,9 +423,7 @@ export class HoverAdapter implements languages.HoverProvider { // --- document highlights ------ -function toHighlighKind( - kind: htmlService.DocumentHighlightKind -): languages.DocumentHighlightKind { +function toHighlighKind(kind: htmlService.DocumentHighlightKind): languages.DocumentHighlightKind { const mKind = languages.DocumentHighlightKind; switch (kind) { @@ -457,8 +437,7 @@ function toHighlighKind( return mKind.Text; } -export class DocumentHighlightAdapter - implements languages.DocumentHighlightProvider { +export class DocumentHighlightAdapter implements languages.DocumentHighlightProvider { constructor(private _worker: WorkerAccessor) {} public provideDocumentHighlights( @@ -469,12 +448,7 @@ export class DocumentHighlightAdapter const resource = model.uri; return this._worker(resource) - .then((worker) => - worker.findDocumentHighlights( - resource.toString(), - fromPosition(position) - ) - ) + .then((worker) => worker.findDocumentHighlights(resource.toString(), fromPosition(position))) .then((items) => { if (!items) { return; @@ -595,8 +569,7 @@ function fromFormattingOptions( }; } -export class DocumentFormattingEditProvider - implements languages.DocumentFormattingEditProvider { +export class DocumentFormattingEditProvider implements languages.DocumentFormattingEditProvider { constructor(private _worker: WorkerAccessor) {} public provideDocumentFormattingEdits( @@ -633,11 +606,7 @@ export class DocumentRangeFormattingEditProvider return this._worker(resource).then((worker) => { return worker - .format( - resource.toString(), - fromRange(range), - fromFormattingOptions(options) - ) + .format(resource.toString(), fromRange(range), fromFormattingOptions(options)) .then((edits) => { if (!edits || edits.length === 0) { return; @@ -661,11 +630,7 @@ export class RenameAdapter implements languages.RenameProvider { return this._worker(resource) .then((worker) => { - return worker.doRename( - resource.toString(), - fromPosition(position), - newName - ); + return worker.doRename(resource.toString(), fromPosition(position), newName); }) .then((edit) => { return toWorkspaceEdit(edit); @@ -673,9 +638,7 @@ export class RenameAdapter implements languages.RenameProvider { } } -function toWorkspaceEdit( - edit: htmlService.WorkspaceEdit -): languages.WorkspaceEdit { +function toWorkspaceEdit(edit: htmlService.WorkspaceEdit): languages.WorkspaceEdit { if (!edit || !edit.changes) { return void 0; } @@ -719,9 +682,7 @@ export class FoldingRangeAdapter implements languages.FoldingRangeProvider { end: range.endLine + 1 }; if (typeof range.kind !== 'undefined') { - result.kind = toFoldingRangeKind( - range.kind - ); + result.kind = toFoldingRangeKind(range.kind); } return result; }); @@ -729,9 +690,7 @@ export class FoldingRangeAdapter implements languages.FoldingRangeProvider { } } -function toFoldingRangeKind( - kind: htmlService.FoldingRangeKind -): languages.FoldingRangeKind { +function toFoldingRangeKind(kind: htmlService.FoldingRangeKind): languages.FoldingRangeKind { switch (kind) { case htmlService.FoldingRangeKind.Comment: return languages.FoldingRangeKind.Comment; @@ -753,12 +712,7 @@ export class SelectionRangeAdapter implements languages.SelectionRangeProvider { const resource = model.uri; return this._worker(resource) - .then((worker) => - worker.getSelectionRanges( - resource.toString(), - positions.map(fromPosition) - ) - ) + .then((worker) => worker.getSelectionRanges(resource.toString(), positions.map(fromPosition))) .then((selectionRanges) => { if (!selectionRanges) { return; diff --git a/src/monaco.contribution.ts b/src/monaco.contribution.ts index 74d5d8c7..deef9e1e 100644 --- a/src/monaco.contribution.ts +++ b/src/monaco.contribution.ts @@ -18,11 +18,7 @@ export interface HTMLFormatConfiguration { readonly indentHandlebars: boolean; readonly endWithNewline: boolean; readonly extraLiners: string; - readonly wrapAttributes: - | 'auto' - | 'force' - | 'force-aligned' - | 'force-expand-multiline'; + readonly wrapAttributes: 'auto' | 'force' | 'force-aligned' | 'force-expand-multiline'; } export interface CompletionConfiguration { @@ -118,11 +114,7 @@ class LanguageServiceDefaultsImpl implements LanguageServiceDefaults { private _modeConfiguration: ModeConfiguration; private _languageId: string; - constructor( - languageId: string, - options: Options, - modeConfiguration: ModeConfiguration - ) { + constructor(languageId: string, options: Options, modeConfiguration: ModeConfiguration) { this._languageId = languageId; this.setOptions(options); this.setModeConfiguration(modeConfiguration); @@ -186,9 +178,7 @@ const razorOptionsDefault: Required = { suggest: { html5: true, razor: true } }; -function getConfigurationDefault( - languageId: string -): Required { +function getConfigurationDefault(languageId: string): Required { return { completionItems: true, hovers: true, diff --git a/src/tsconfig.esm.json b/src/tsconfig.esm.json index 2023da46..3edf3ca4 100644 --- a/src/tsconfig.esm.json +++ b/src/tsconfig.esm.json @@ -5,12 +5,6 @@ "outDir": "../out/esm", "declaration": true, "target": "es5", - "lib": [ - "dom", - "es5", - "es2015.collection", - "es2015.promise", - "es2015.iterable" - ] + "lib": ["dom", "es5", "es2015.collection", "es2015.promise", "es2015.iterable"] } } diff --git a/src/tsconfig.json b/src/tsconfig.json index 6b43d988..707f714d 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -5,12 +5,6 @@ "outDir": "../out/amd", "declaration": true, "target": "es5", - "lib": [ - "dom", - "es5", - "es2015.collection", - "es2015.promise", - "es2015.iterable" - ] + "lib": ["dom", "es5", "es2015.collection", "es2015.promise", "es2015.iterable"] } } diff --git a/src/workerManager.ts b/src/workerManager.ts index 955e19a8..2c2d23bb 100644 --- a/src/workerManager.ts +++ b/src/workerManager.ts @@ -23,9 +23,7 @@ export class WorkerManager { this._worker = null; this._idleCheckInterval = setInterval(() => this._checkIfIdle(), 30 * 1000); this._lastUsedTime = 0; - this._configChangeListener = this._defaults.onDidChange(() => - this._stopWorker() - ); + this._configChangeListener = this._defaults.onDidChange(() => this._stopWorker()); } private _stopWorker(): void { diff --git a/test/index.html b/test/index.html index 07fcaf6d..8b98c1b6 100644 --- a/test/index.html +++ b/test/index.html @@ -11,10 +11,7 @@

Monaco Editor HTML test page

-
+
From 09fc70312781a93a311e452cdcaa57b49a9f5666 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sat, 19 Sep 2020 01:52:55 +0200 Subject: [PATCH 3/3] 3.1.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8b035e73..6c898054 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "monaco-html", - "version": "3.0.0", + "version": "3.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ff398efd..fe562916 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "monaco-html", - "version": "3.0.0", + "version": "3.1.0", "description": "HTML plugin for the Monaco Editor", "scripts": { "compile": "mrmdir ./out && tsc -p ./src/tsconfig.json && tsc -p ./src/tsconfig.esm.json && node ./scripts/dts && prettier --write ./monaco.d.ts",