From b61b4d70e3987f670f813009e0e689ef12afafe7 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Mon, 3 Apr 2023 12:29:48 +0200 Subject: [PATCH] Adopts latest monaco-editor-core --- package-lock.json | 14 +++++++------- package.json | 2 +- src/language/common/lspLanguageFeatures.ts | 2 ++ src/language/typescript/languageFeatures.ts | 2 ++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6b3dcd2d..15de8814 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "^0.37.0-dev.20230330", + "monaco-editor-core": "^0.37.0-dev.20230403", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "playwright": "^1.18.1", @@ -5170,9 +5170,9 @@ "dev": true }, "node_modules/monaco-editor-core": { - "version": "0.37.0-dev.20230330", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.37.0-dev.20230330.tgz", - "integrity": "sha512-GHp8zu1tTHWbdBzo6A7/P3Sdsn1LgXIzh5I8kI7RWm5jBSIlnet0t+3hDXXyaoXX4zohIMW5hN7ADsihBwKkSQ==", + "version": "0.37.0-dev.20230403", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.37.0-dev.20230403.tgz", + "integrity": "sha512-p77v5G3WNBSSCLY8ORkNkP5XmAOQj7QwxkyzyILj+sWFbw3/1B9SIead0QS368FHV7JKCZ8/LR5T5ccBUZJlJg==", "dev": true }, "node_modules/mri": { @@ -10943,9 +10943,9 @@ } }, "monaco-editor-core": { - "version": "0.37.0-dev.20230330", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.37.0-dev.20230330.tgz", - "integrity": "sha512-GHp8zu1tTHWbdBzo6A7/P3Sdsn1LgXIzh5I8kI7RWm5jBSIlnet0t+3hDXXyaoXX4zohIMW5hN7ADsihBwKkSQ==", + "version": "0.37.0-dev.20230403", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.37.0-dev.20230403.tgz", + "integrity": "sha512-p77v5G3WNBSSCLY8ORkNkP5XmAOQj7QwxkyzyILj+sWFbw3/1B9SIead0QS368FHV7JKCZ8/LR5T5ccBUZJlJg==", "dev": true }, "mri": { diff --git a/package.json b/package.json index c6596887..0bd0cd9b 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "^0.37.0-dev.20230330", + "monaco-editor-core": "^0.37.0-dev.20230403", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "playwright": "^1.18.1", diff --git a/src/language/common/lspLanguageFeatures.ts b/src/language/common/lspLanguageFeatures.ts index ac98a59b..48982daf 100644 --- a/src/language/common/lspLanguageFeatures.ts +++ b/src/language/common/lspLanguageFeatures.ts @@ -803,6 +803,8 @@ export class DocumentFormattingEditProvider export class DocumentRangeFormattingEditProvider implements languages.DocumentRangeFormattingEditProvider { + readonly canFormatMultipleRanges = false; + constructor(private _worker: WorkerAccessor) {} public provideDocumentRangeFormattingEdits( diff --git a/src/language/typescript/languageFeatures.ts b/src/language/typescript/languageFeatures.ts index 9f6cbb77..28e58dda 100644 --- a/src/language/typescript/languageFeatures.ts +++ b/src/language/typescript/languageFeatures.ts @@ -989,6 +989,8 @@ export class FormatAdapter extends FormatHelper implements languages.DocumentRangeFormattingEditProvider { + readonly canFormatMultipleRanges = false; + public async provideDocumentRangeFormattingEdits( model: editor.ITextModel, range: Range,