From 562bd7e7a7a0ebeeb1918c7882d8fd8d64e5485c Mon Sep 17 00:00:00 2001
From: vince-fugnitto <vincent.fugnitto@ericsson.com>
Date: Wed, 19 Oct 2022 16:04:17 -0400
Subject: [PATCH] monaco: upgrade to `1.72.x`

The commit upgrades monaco to `v1.72.3`.

Signed-off-by: vince-fugnitto <vincent.fugnitto@ericsson.com>
---
 examples/api-samples/package.json             |   2 +-
 examples/api-tests/src/typescript.spec.js     |  27 +-
 examples/playwright/src/theia-text-editor.ts  |   7 +-
 packages/bulk-edit/package.json               |   2 +-
 packages/console/package.json                 |   2 +-
 .../core/src/browser/context-key-service.ts   |  10 +-
 .../core/src/browser/resource-context-key.ts  |  12 +-
 .../src/browser/shell/application-shell.ts    |   4 +-
 packages/debug/package.json                   |   2 +-
 .../disassembly-view-instruction-renderer.ts  |   6 +-
 .../editor/debug-breakpoint-widget.tsx        |   3 +-
 .../src/browser/editor/debug-editor-model.ts  |   4 +-
 .../editor/debug-inline-value-decorator.ts    |   3 +-
 .../editor-generated-preference-schema.ts     | 282 ++++++++++++------
 packages/git/package.json                     |   2 +-
 packages/keymaps/package.json                 |   2 +-
 packages/monaco/package.json                  |   2 +-
 .../src/browser/monaco-bulk-edit-service.ts   |   7 +-
 .../src/browser/monaco-context-key-service.ts |   4 +-
 .../browser/monaco-gotoline-quick-access.ts   |   2 +-
 .../browser/monaco-gotosymbol-quick-access.ts |   2 +-
 packages/monaco/src/browser/monaco-menu.ts    |  27 +-
 .../src/browser/monaco-quick-input-service.ts |   6 +-
 .../monaco/src/browser/monaco-workspace.ts    |  16 +-
 packages/monaco/src/browser/style/index.css   |   7 -
 packages/output/package.json                  |   2 +-
 packages/plugin-ext-vscode/package.json       |   2 +-
 packages/plugin-ext/package.json              |   2 +-
 .../src/common/plugin-api-rpc-model.ts        |   6 +-
 .../plugin-ext/src/common/plugin-api-rpc.ts   |  12 +-
 .../src/main/browser/languages-main.ts        |  74 +++--
 .../menus/plugin-menu-command-adapter.ts      |   4 +-
 .../src/main/browser/text-editor-main.ts      |   5 +-
 .../src/main/browser/theme-icon-override.ts   |  31 ++
 packages/plugin-ext/src/plugin/languages.ts   |   3 +-
 .../src/plugin/preference-registry.ts         |  10 +-
 .../plugin-ext/src/plugin/type-converters.ts  |  16 +-
 packages/plugin-metrics/package.json          |   2 +-
 packages/preferences/package.json             |   2 +-
 packages/task/package.json                    |   2 +-
 packages/toolbar/package.json                 |   2 +-
 .../browser/common-variable-contribution.ts   |   5 +-
 yarn.lock                                     |   8 +-
 43 files changed, 403 insertions(+), 228 deletions(-)

diff --git a/examples/api-samples/package.json b/examples/api-samples/package.json
index afeee0727e453..3ffc280a4c136 100644
--- a/examples/api-samples/package.json
+++ b/examples/api-samples/package.json
@@ -8,7 +8,7 @@
     "@theia/file-search": "1.31.0",
     "@theia/filesystem": "1.31.0",
     "@theia/monaco": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "@theia/output": "1.31.0",
     "@theia/search-in-workspace": "1.31.0",
     "@theia/toolbar": "1.31.0",
diff --git a/examples/api-tests/src/typescript.spec.js b/examples/api-tests/src/typescript.spec.js
index 3b0083d80b5dd..4b2ffa869d8a7 100644
--- a/examples/api-tests/src/typescript.spec.js
+++ b/examples/api-tests/src/typescript.spec.js
@@ -644,10 +644,10 @@ SPAN {
         editor.getControl().revealPosition({ lineNumber, column });
         assert.equal(currentChar(), ';');
 
-        /** @type {import('@theia/monaco-editor-core/src/vs/editor/contrib/codeAction/browser/codeActionCommands').QuickFixController} */
-        const quickFixController = editor.getControl().getContribution('editor.contrib.quickFixController');
+        /** @type {import('@theia/monaco-editor-core/src/vs/editor/contrib/codeAction/browser/codeActionCommands').CodeActionController} */
+        const codeActionController = editor.getControl().getContribution('editor.contrib.codeActionController');
         const lightBulbNode = () => {
-            const ui = quickFixController['_ui'].rawValue;
+            const ui = codeActionController['_ui'].rawValue;
             const lightBulb = ui && ui['_lightBulbWidget'].rawValue;
             return lightBulb && lightBulb['_domNode'];
         };
@@ -660,10 +660,12 @@ SPAN {
         await waitForAnimation(() => lightBulbVisible());
 
         await commands.executeCommand('editor.action.quickFix');
-        await waitForAnimation(() => !!document.querySelector('.p-Widget.p-Menu'), 5000);
+        const codeActionSelector = '.codeActionWidget';
+        assert.isFalse(!!document.querySelector(codeActionSelector), 'codeActionWidget should not be visible');
+
+        await waitForAnimation(() => !!document.querySelector(codeActionSelector), 5000);
         await animationFrame();
 
-        keybindings.dispatchKeyDown('ArrowDown');
         keybindings.dispatchKeyDown('Enter');
 
         await waitForAnimation(() => currentChar() === 'd', 5000);
@@ -737,10 +739,10 @@ SPAN {
 
     it('Can execute code actions', async function () {
         const editor = await openEditor(demoFileUri);
-        /** @type {import('@theia/monaco-editor-core/src/vs/editor/contrib/codeAction/browser/codeActionCommands').QuickFixController} */
-        const quickFixController = editor.getControl().getContribution('editor.contrib.quickFixController');
+        /** @type {import('@theia/monaco-editor-core/src/vs/editor/contrib/codeAction/browser/codeActionCommands').CodeActionController} */
+        const codeActionController = editor.getControl().getContribution('editor.contrib.codeActionController');
         const isActionAvailable = () => {
-            const lightbulbVisibility = quickFixController['_ui'].rawValue?.['_lightBulbWidget'].rawValue?.['_domNode'].style.visibility;
+            const lightbulbVisibility = codeActionController['_ui'].rawValue?.['_lightBulbWidget'].rawValue?.['_domNode'].style.visibility;
             return lightbulbVisibility !== undefined && lightbulbVisibility !== 'hidden';
         }
         assert.isFalse(isActionAvailable());
@@ -752,12 +754,14 @@ SPAN {
         assert.isTrue(isActionAvailable());
 
         await commands.executeCommand('editor.action.quickFix');
-        await waitForAnimation(() => Boolean(document.querySelector('.p-Widget.p-Menu')), 5000, 'No context menu appeared. (1)');
+        await waitForAnimation(() => Boolean(document.querySelector('.context-view-pointerBlock')), 5000, 'No context menu appeared. (1)');
         await animationFrame();
 
-        keybindings.dispatchKeyDown('ArrowDown');
         keybindings.dispatchKeyDown('Enter');
 
+        assert.isNotNull(editor.getControl());
+        assert.isNotNull(editor.getControl().getModel());
+        console.log(`content: ${editor.getControl().getModel().getLineContent(30)}`);
         await waitForAnimation(() => editor.getControl().getModel().getLineContent(30) === 'import * as demoDefinitionsFile from "./demo-definitions-file";', 5000, 'The namespace import did not take effect.');
 
         editor.getControl().setSelection(new Selection(30, 1, 30, 64));
@@ -765,10 +769,9 @@ SPAN {
 
         // Change it back: https://github.com/eclipse-theia/theia/issues/11059
         await commands.executeCommand('editor.action.quickFix');
-        await waitForAnimation(() => Boolean(document.querySelector('.p-Widget.p-Menu')), 5000, 'No context menu appeared. (2)');
+        await waitForAnimation(() => Boolean(document.querySelector('.context-view-pointerBlock')), 5000, 'No context menu appeared. (2)');
         await animationFrame();
 
-        keybindings.dispatchKeyDown('ArrowDown');
         keybindings.dispatchKeyDown('Enter');
 
         await waitForAnimation(() => editor.getControl().getModel().getLineContent(30) === 'import { DefinedInterface } from "./demo-definitions-file";', 5000, 'The named import did not take effect.');
diff --git a/examples/playwright/src/theia-text-editor.ts b/examples/playwright/src/theia-text-editor.ts
index ba79021cb1b18..08ae9b7ab0e80 100644
--- a/examples/playwright/src/theia-text-editor.ts
+++ b/examples/playwright/src/theia-text-editor.ts
@@ -152,9 +152,10 @@ export class TheiaTextEditor extends TheiaEditor {
     }
 
     protected replaceEditorSymbolsWithSpace(content: string): string | Promise<string | undefined> {
-        // [ ] &nbsp; => \u00a0
-        // [·] &middot; => \u00b7
-        return content.replace(/[\u00a0\u00b7]/g, ' ');
+        // [ ] &nbsp; => \u00a0 -- NO-BREAK SPACE
+        // [·] &middot; => \u00b7 -- MIDDLE DOT
+        // [] &zwnj; => \u200c -- ZERO WIDTH NON-JOINER
+        return content.replace(/[\u00a0\u00b7]/g, ' ').replace(/[\u200c]/g, '');
     }
 
     protected async selectedSuggestion(): Promise<ElementHandle<SVGElement | HTMLElement>> {
diff --git a/packages/bulk-edit/package.json b/packages/bulk-edit/package.json
index ed9edd4722159..cbecd584826ca 100644
--- a/packages/bulk-edit/package.json
+++ b/packages/bulk-edit/package.json
@@ -7,7 +7,7 @@
     "@theia/editor": "1.31.0",
     "@theia/filesystem": "1.31.0",
     "@theia/monaco": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "@theia/workspace": "1.31.0"
   },
   "publishConfig": {
diff --git a/packages/console/package.json b/packages/console/package.json
index 72076e6a58118..664fa4bcf3a17 100644
--- a/packages/console/package.json
+++ b/packages/console/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@theia/core": "1.31.0",
     "@theia/monaco": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "anser": "^2.0.1"
   },
   "publishConfig": {
diff --git a/packages/core/src/browser/context-key-service.ts b/packages/core/src/browser/context-key-service.ts
index 801c2afb40311..8a7a2993f7ffc 100644
--- a/packages/core/src/browser/context-key-service.ts
+++ b/packages/core/src/browser/context-key-service.ts
@@ -18,7 +18,11 @@ import { injectable } from 'inversify';
 import { Disposable } from '../common';
 import { Emitter, Event } from '../common/event';
 
-export interface ContextKey<T> {
+export type ContextKeyValue = null | undefined | boolean | number | string
+    | Array<null | undefined | boolean | number | string>
+    | Record<string, null | undefined | boolean | number | string>;
+
+export interface ContextKey<T extends ContextKeyValue = ContextKeyValue> {
     set(value: T | undefined): void;
     reset(): void;
     get(): T | undefined;
@@ -41,7 +45,7 @@ export const ContextKeyService = Symbol('ContextKeyService');
 export interface ContextKeyService extends Disposable {
     readonly onDidChange: Event<ContextKeyChangeEvent>;
 
-    createKey<T>(key: string, defaultValue: T | undefined): ContextKey<T>;
+    createKey<T extends ContextKeyValue>(key: string, defaultValue: T | undefined): ContextKey<T>;
 
     /**
      * Whether the expression is satisfied. If `context` provided, the service will attempt to retrieve a context object associated with that element.
@@ -82,7 +86,7 @@ export class ContextKeyServiceDummyImpl implements ContextKeyService {
         this.onDidChangeEmitter.fire(event);
     }
 
-    createKey<T>(key: string, defaultValue: T | undefined): ContextKey<T> {
+    createKey<T extends ContextKeyValue>(key: string, defaultValue: T | undefined): ContextKey<T> {
         return ContextKey.None;
     }
     /**
diff --git a/packages/core/src/browser/resource-context-key.ts b/packages/core/src/browser/resource-context-key.ts
index 3882323b61727..45cbd5ff47ad4 100644
--- a/packages/core/src/browser/resource-context-key.ts
+++ b/packages/core/src/browser/resource-context-key.ts
@@ -16,7 +16,6 @@
 
 import { injectable, inject, postConstruct } from 'inversify';
 import URI from '../common/uri';
-import { URI as Uri } from 'vscode-uri';
 import { ContextKeyService, ContextKey } from './context-key-service';
 import { LanguageService } from './language-service';
 
@@ -29,7 +28,7 @@ export class ResourceContextKey {
     @inject(ContextKeyService)
     protected readonly contextKeyService: ContextKeyService;
 
-    protected resource: ContextKey<Uri>;
+    protected resource: ContextKey<string>;
     protected resourceSchemeKey: ContextKey<string>;
     protected resourceFileName: ContextKey<string>;
     protected resourceExtname: ContextKey<string>;
@@ -40,7 +39,7 @@ export class ResourceContextKey {
 
     @postConstruct()
     protected init(): void {
-        this.resource = this.contextKeyService.createKey<Uri>('resource', undefined);
+        this.resource = this.contextKeyService.createKey<string>('resource', undefined);
         this.resourceSchemeKey = this.contextKeyService.createKey<string>('resourceScheme', undefined);
         this.resourceFileName = this.contextKeyService.createKey<string>('resourceFilename', undefined);
         this.resourceExtname = this.contextKeyService.createKey<string>('resourceExtname', undefined);
@@ -50,13 +49,12 @@ export class ResourceContextKey {
         this.resourceSet = this.contextKeyService.createKey<boolean>('resourceSet', false);
     }
 
-    get(): URI | undefined {
-        const codeUri = this.resource.get();
-        return codeUri && new URI(codeUri);
+    get(): string | undefined {
+        return this.resource.get();
     }
 
     set(resourceUri: URI | undefined): void {
-        this.resource.set(resourceUri?.['codeUri']);
+        this.resource.set(resourceUri?.toString());
         this.resourceSchemeKey.set(resourceUri?.scheme);
         this.resourceFileName.set(resourceUri?.path.base);
         this.resourceExtname.set(resourceUri?.path.ext);
diff --git a/packages/core/src/browser/shell/application-shell.ts b/packages/core/src/browser/shell/application-shell.ts
index 272a06bfde5f8..f9a95b678969c 100644
--- a/packages/core/src/browser/shell/application-shell.ts
+++ b/packages/core/src/browser/shell/application-shell.ts
@@ -309,8 +309,8 @@ export class ApplicationShell extends Widget {
     }
 
     protected initFocusKeyContexts(): void {
-        const sideBarFocus = this.contextKeyService.createKey('sideBarFocus', false);
-        const panelFocus = this.contextKeyService.createKey('panelFocus', false);
+        const sideBarFocus = this.contextKeyService.createKey<boolean>('sideBarFocus', false);
+        const panelFocus = this.contextKeyService.createKey<boolean>('panelFocus', false);
         const updateFocusContextKeys = () => {
             const area = this.activeWidget && this.getAreaFor(this.activeWidget);
             sideBarFocus.set(area === 'left');
diff --git a/packages/debug/package.json b/packages/debug/package.json
index 3a6775b7b8f6f..04a5f3f63ec3a 100644
--- a/packages/debug/package.json
+++ b/packages/debug/package.json
@@ -9,7 +9,7 @@
     "@theia/filesystem": "1.31.0",
     "@theia/markers": "1.31.0",
     "@theia/monaco": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "@theia/output": "1.31.0",
     "@theia/process": "1.31.0",
     "@theia/task": "1.31.0",
diff --git a/packages/debug/src/browser/disassembly-view/disassembly-view-instruction-renderer.ts b/packages/debug/src/browser/disassembly-view/disassembly-view-instruction-renderer.ts
index 62436a0f03eb5..6e6bac9d15ba6 100644
--- a/packages/debug/src/browser/disassembly-view/disassembly-view-instruction-renderer.ts
+++ b/packages/debug/src/browser/disassembly-view/disassembly-view-instruction-renderer.ts
@@ -25,7 +25,7 @@ import { Disposable, dispose } from '@theia/monaco-editor-core/esm/vs/base/commo
 import { isAbsolute } from '@theia/monaco-editor-core/esm/vs/base/common/path';
 import { Constants } from '@theia/monaco-editor-core/esm/vs/base/common/uint';
 import { applyFontInfo } from '@theia/monaco-editor-core/esm/vs/editor/browser/config/domFontInfo';
-import { createStringBuilder } from '@theia/monaco-editor-core/esm/vs/editor/common/core/stringBuilder';
+import { StringBuilder } from '@theia/monaco-editor-core/esm/vs/editor/common/core/stringBuilder';
 import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
 import { ITextModelService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService';
 import { IThemeService } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
@@ -92,14 +92,14 @@ export class InstructionRenderer extends Disposable implements ITableRenderer<Di
         column.currentElement.element = element;
         const instruction = element.instruction;
         column.sourcecode.innerText = '';
-        const sb = createStringBuilder(1000);
+        const sb = new StringBuilder(1000);
 
         if (this._disassemblyView.isSourceCodeRender && instruction.location?.path && instruction.line) {
             const sourceURI = this.getUriFromSource(instruction);
 
             if (sourceURI) {
                 let textModel: ITextModel | undefined = undefined;
-                const sourceSB = createStringBuilder(10000);
+                const sourceSB = new StringBuilder(10000);
                 const ref = await this.textModelService.createModelReference(sourceURI);
                 textModel = ref.object.textEditorModel;
                 column.cellDisposable.push(ref);
diff --git a/packages/debug/src/browser/editor/debug-breakpoint-widget.tsx b/packages/debug/src/browser/editor/debug-breakpoint-widget.tsx
index cb8aaafa9eda1..c37fb63aff93a 100644
--- a/packages/debug/src/browser/editor/debug-breakpoint-widget.tsx
+++ b/packages/debug/src/browser/editor/debug-breakpoint-widget.tsx
@@ -256,7 +256,8 @@ export class DebugBreakpointWidget implements Disposable {
                 }
             }
         }];
-        (this._input.getControl() as unknown as StandaloneCodeEditor).setDecorations('Debug breakpoint placeholder', DebugBreakpointWidget.PLACEHOLDER_DECORATION, decorations);
+        (this._input.getControl() as unknown as StandaloneCodeEditor)
+            .setDecorationsByType('Debug breakpoint placeholder', DebugBreakpointWidget.PLACEHOLDER_DECORATION, decorations);
     }
     protected get placeholder(): string {
         if (this.context === 'logMessage') {
diff --git a/packages/debug/src/browser/editor/debug-editor-model.ts b/packages/debug/src/browser/editor/debug-editor-model.ts
index 00060712ffd55..8e5aef084f77a 100644
--- a/packages/debug/src/browser/editor/debug-editor-model.ts
+++ b/packages/debug/src/browser/editor/debug-editor-model.ts
@@ -164,8 +164,8 @@ export class DebugEditorModel implements Disposable {
             this.createInlineValueDecorations()
         ]);
         const codeEditor = this.editor.getControl() as unknown as StandaloneCodeEditor;
-        codeEditor.removeDecorations(INLINE_VALUE_DECORATION_KEY);
-        codeEditor.setDecorations('Inline debug decorations', INLINE_VALUE_DECORATION_KEY, inlineValueDecorations);
+        codeEditor.removeDecorations([INLINE_VALUE_DECORATION_KEY]);
+        codeEditor.setDecorationsByType('Inline debug decorations', INLINE_VALUE_DECORATION_KEY, inlineValueDecorations);
         this.editorDecorations = this.deltaDecorations(this.editorDecorations, newFrameDecorations);
     }
 
diff --git a/packages/debug/src/browser/editor/debug-inline-value-decorator.ts b/packages/debug/src/browser/editor/debug-inline-value-decorator.ts
index b3bfeb0b78874..4f22e05ad92d7 100644
--- a/packages/debug/src/browser/editor/debug-inline-value-decorator.ts
+++ b/packages/debug/src/browser/editor/debug-inline-value-decorator.ts
@@ -26,7 +26,8 @@ import * as monaco from '@theia/monaco-editor-core';
 import { CancellationTokenSource } from '@theia/monaco-editor-core/esm/vs/base/common/cancellation';
 import { DEFAULT_WORD_REGEXP } from '@theia/monaco-editor-core/esm/vs/editor/common/core/wordHelper';
 import { IDecorationOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/editorCommon';
-import { InlineValueContext, StandardTokenType } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
+import { StandardTokenType } from '@theia/monaco-editor-core/esm/vs/editor/common/encodedTokenAttributes';
+import { InlineValueContext } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
 import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
 import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures';
 import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
diff --git a/packages/editor/src/browser/editor-generated-preference-schema.ts b/packages/editor/src/browser/editor-generated-preference-schema.ts
index 94938d8a8a7fe..15dfd1e27d1dc 100644
--- a/packages/editor/src/browser/editor-generated-preference-schema.ts
+++ b/packages/editor/src/browser/editor-generated-preference-schema.ts
@@ -26,13 +26,6 @@ import { PreferenceSchema } from '@theia/core/lib/browser';
  */
 
 export const editorGeneratedPreferenceProperties: PreferenceSchema['properties'] = {
-    "editor.rename.enablePreview": {
-        "scope": "language-overridable",
-        "description": nls.localizeByDefault("Enable/disable the ability to preview changes before renaming"),
-        "default": true,
-        "type": "boolean",
-        "restricted": false
-    },
     "editor.tabSize": {
         "type": "number",
         "default": 4,
@@ -189,6 +182,13 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
         "scope": "language-overridable",
         "restricted": false
     },
+    "diffEditor.renderMarginRevertIcon": {
+        "type": "boolean",
+        "default": true,
+        "description": nls.localize("theia/editor/diffEditor.renderMarginRevertIcon", "When enabled, the diff editor shows arrows in its glyph margin to revert changes."),
+        "scope": "language-overridable",
+        "restricted": false
+    },
     "diffEditor.ignoreTrimWhitespace": {
         "type": "boolean",
         "default": true,
@@ -226,6 +226,20 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
         "scope": "language-overridable",
         "restricted": false
     },
+    "diffEditor.diffAlgorithm": {
+        "type": "string",
+        "enum": [
+            "smart",
+            "experimental"
+        ],
+        "default": "smart",
+        "markdownEnumDescriptions": [
+            nls.localize("theia/editor/diffEditor.diffAlgorithm.smart", "Uses the default diffing algorithm."),
+            nls.localize("theia/editor/diffEditor.diffAlgorithm.experimental", "Uses an experimental diffing algorithm.")
+        ],
+        "scope": "language-overridable",
+        "restricted": false
+    },
     "editor.acceptSuggestionOnCommitCharacter": {
         "markdownDescription": nls.localizeByDefault("Controls whether suggestions should be accepted on commit characters. For example, in JavaScript, the semi-colon (`;`) can be a commit character that accepts a suggestion and types that character."),
         "type": "boolean",
@@ -610,6 +624,13 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
         "scope": "language-overridable",
         "restricted": false
     },
+    "editor.dropIntoEditor.enabled": {
+        "type": "boolean",
+        "default": true,
+        "markdownDescription": nls.localize("theia/editor/editor.dropIntoEditor.enabled", "Controls whether you can drag and drop a file into a text editor by holding down `shift` (instead of opening the file in an editor)."),
+        "scope": "language-overridable",
+        "restricted": false
+    },
     "editor.emptySelectionClipboard": {
         "description": nls.localizeByDefault("Controls whether copying without a selection copies the current line."),
         "type": "boolean",
@@ -659,18 +680,12 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
         "enumDescriptions": [
             nls.localizeByDefault('Never turn on Find in selection automatically (default).'),
             nls.localizeByDefault('Always turn on Find in selection automatically.'),
-            nls.localizeByDefault('Turn on Find in selection automatically when multiple lines of content are selected.')
+            nls.localizeByDefault('Turn on Find in selection automatically when multiple lines of content are selected.'),
         ],
-        "description": nls.localizeByDefault('Controls the condition for turning on find in selection automatically.'),
+        "description": nls.localizeByDefault("Controls the condition for turning on find in selection automatically."),
         "scope": "language-overridable",
         "restricted": false
     },
-    "editor.find.globalFindClipboard": {
-        "type": "boolean",
-        "default": false,
-        "description": nls.localizeByDefault("Controls whether the Find Widget should read or modify the shared find clipboard on macOS."),
-        "included": isOSX
-    },
     "editor.find.addExtraSpaceOnTop": {
         "type": "boolean",
         "default": true,
@@ -825,7 +840,6 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
     },
     "editor.gotoLocation.multiple": {
         "deprecationMessage": "This setting is deprecated, please use separate settings like 'editor.editor.gotoLocation.multipleDefinitions' or 'editor.editor.gotoLocation.multipleImplementations' instead.",
-        "type": ["string", "null"],
         "default": null,
         "scope": "language-overridable",
         "restricted": false
@@ -1137,6 +1151,13 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
         "scope": "language-overridable",
         "restricted": false
     },
+    "editor.minimap.autohide": {
+        "type": "boolean",
+        "default": false,
+        "description": nls.localize("theia/editor/editor.minimap.autohide", "Controls whether the minimap is hidden automatically."),
+        "scope": "language-overridable",
+        "restricted": false
+    },
     "editor.minimap.size": {
         "type": "string",
         "enum": [
@@ -1230,7 +1251,7 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
             nls.localizeByDefault("Maps to `Control` on Windows and Linux and to `Command` on macOS."),
             nls.localizeByDefault("Maps to `Alt` on Windows and Linux and to `Option` on macOS.")
         ],
-        "markdownDescription": nls.localizeByDefault('The modifier to be used to add multiple cursors with the mouse. The Go To Definition and Open Link mouse gestures will adapt such that they do not conflict with the multicursor modifier. [Read more](https://code.visualstudio.com/docs/editor/codebasics#_multicursor-modifier).'),
+        "markdownDescription": nls.localize("theia/editor/editor.multiCursorModifier", "The modifier to be used to add multiple cursors with the mouse. The Go to Definition and Open Link mouse gestures will adapt such that they do not conflict with the [multicursor modifier](https://code.visualstudio.com/docs/editor/codebasics#_multicursor-modifier)."),
         "type": "string",
         "enum": [
             "ctrlCmd",
@@ -1324,88 +1345,82 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
         "restricted": false
     },
     "editor.quickSuggestions": {
-        "anyOf": [
-            {
-                "type": "boolean"
-            },
-            {
-                "type": "object",
-                "properties": {
-                    "strings": {
-                        "anyOf": [
-                            {
-                                "type": "boolean"
-                            },
-                            {
-                                "type": "string",
-                                "enum": [
-                                    "on",
-                                    "inline",
-                                    "off"
-                                ],
-                                "enumDescriptions": [
-                                    nls.localize("theia/editor/editor.quickSuggestions0", "Quick suggestions show inside the suggest widget"),
-                                    nls.localize("theia/editor/editor.quickSuggestions1", "Quick suggestions show as ghost text"),
-                                    nls.localize("theia/editor/editor.quickSuggestions2", "Quick suggestions are disabled")
-                                ]
-                            }
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+            "strings": {
+                "anyOf": [
+                    {
+                        "type": "boolean"
+                    },
+                    {
+                        "type": "string",
+                        "enum": [
+                            "on",
+                            "inline",
+                            "off"
                         ],
-                        "default": "off",
-                        "description": nls.localizeByDefault("Enable quick suggestions inside strings.")
+                        "enumDescriptions": [
+                            nls.localize("theia/editor/editor.quickSuggestions0", "Quick suggestions show inside the suggest widget"),
+                            nls.localize("theia/editor/editor.quickSuggestions1", "Quick suggestions show as ghost text"),
+                            nls.localize("theia/editor/editor.quickSuggestions2", "Quick suggestions are disabled")
+                        ]
+                    }
+                ],
+                "default": "off",
+                "description": nls.localizeByDefault("Enable quick suggestions inside strings.")
+            },
+            "comments": {
+                "anyOf": [
+                    {
+                        "type": "boolean"
                     },
-                    "comments": {
-                        "anyOf": [
-                            {
-                                "type": "boolean"
-                            },
-                            {
-                                "type": "string",
-                                "enum": [
-                                    "on",
-                                    "inline",
-                                    "off"
-                                ],
-                                "enumDescriptions": [
-                                    nls.localize("theia/editor/editor.quickSuggestions0", "Quick suggestions show inside the suggest widget"),
-                                    nls.localize("theia/editor/editor.quickSuggestions1", "Quick suggestions show as ghost text"),
-                                    nls.localize("theia/editor/editor.quickSuggestions2", "Quick suggestions are disabled")
-                                ]
-                            }
+                    {
+                        "type": "string",
+                        "enum": [
+                            "on",
+                            "inline",
+                            "off"
                         ],
-                        "default": "off",
-                        "description": nls.localizeByDefault("Enable quick suggestions inside comments.")
+                        "enumDescriptions": [
+                            nls.localize("theia/editor/editor.quickSuggestions0", "Quick suggestions show inside the suggest widget"),
+                            nls.localize("theia/editor/editor.quickSuggestions1", "Quick suggestions show as ghost text"),
+                            nls.localize("theia/editor/editor.quickSuggestions2", "Quick suggestions are disabled")
+                        ]
+                    }
+                ],
+                "default": "off",
+                "description": nls.localizeByDefault("Enable quick suggestions inside comments.")
+            },
+            "other": {
+                "anyOf": [
+                    {
+                        "type": "boolean"
                     },
-                    "other": {
-                        "anyOf": [
-                            {
-                                "type": "boolean"
-                            },
-                            {
-                                "type": "string",
-                                "enum": [
-                                    "on",
-                                    "inline",
-                                    "off"
-                                ],
-                                "enumDescriptions": [
-                                    nls.localize("theia/editor/editor.quickSuggestions0", "Quick suggestions show inside the suggest widget"),
-                                    nls.localize("theia/editor/editor.quickSuggestions1", "Quick suggestions show as ghost text"),
-                                    nls.localize("theia/editor/editor.quickSuggestions2", "Quick suggestions are disabled")
-                                ]
-                            }
+                    {
+                        "type": "string",
+                        "enum": [
+                            "on",
+                            "inline",
+                            "off"
                         ],
-                        "default": "on",
-                        "description": nls.localizeByDefault("Enable quick suggestions outside of strings and comments.")
+                        "enumDescriptions": [
+                            nls.localize("theia/editor/editor.quickSuggestions0", "Quick suggestions show inside the suggest widget"),
+                            nls.localize("theia/editor/editor.quickSuggestions1", "Quick suggestions show as ghost text"),
+                            nls.localize("theia/editor/editor.quickSuggestions2", "Quick suggestions are disabled")
+                        ]
                     }
-                }
+                ],
+                "default": "on",
+                "description": nls.localizeByDefault("Enable quick suggestions outside of strings and comments.")
             }
-        ],
+        },
         "default": {
             "other": "on",
             "comments": "off",
             "strings": "off"
         },
-        "markdownDescription": nls.localizeByDefault("Controls whether suggestions should automatically show up while typing."),
+        "markdownDescription": nls.localize("theia/editor/editor.quickSuggestions", "Controls whether suggestions should automatically show up while typing. This can be controlled for typing in comments, strings, and other code. Quick suggestion can be configured to show as ghost text or with the suggest widget. Also be aware of the '#editor.suggestOnTriggerCharacters#'-setting which controls if suggestions are triggered by special characters."),
         "scope": "language-overridable",
         "restricted": false
     },
@@ -1584,7 +1599,7 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
     "editor.scrollBeyondLastColumn": {
         "description": nls.localizeByDefault("Controls the number of extra characters beyond which the editor will scroll horizontally."),
         "type": "integer",
-        "default": 5,
+        "default": 4,
         "minimum": 0,
         "maximum": 1073741824,
         "scope": "language-overridable",
@@ -1604,6 +1619,12 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
         "scope": "language-overridable",
         "restricted": false
     },
+    "editor.selectionClipboard": {
+        "type": "boolean",
+        "default": true,
+        "description": nls.localizeByDefault("Controls whether the Linux primary clipboard should be supported."),
+        "included": !isOSX && !isWindows
+    },
     "editor.selectionHighlight": {
         "description": nls.localizeByDefault("Controls whether the editor should highlight matches similar to the selection."),
         "type": "boolean",
@@ -1614,12 +1635,14 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
     "editor.showFoldingControls": {
         "enumDescriptions": [
             nls.localizeByDefault("Always show the folding controls."),
+            nls.localize("theia/editor/editor.showFoldingControls1", "Never show the folding controls and reduce the gutter size."),
             nls.localizeByDefault("Only show the folding controls when the mouse is over the gutter.")
         ],
         "description": nls.localizeByDefault("Controls when the folding controls on the gutter are shown."),
         "type": "string",
         "enum": [
             "always",
+            "never",
             "mouseover"
         ],
         "default": "mouseover",
@@ -1666,6 +1689,22 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
         "scope": "language-overridable",
         "restricted": false
     },
+    "editor.stickyScroll.enabled": {
+        "type": "boolean",
+        "default": false,
+        "description": nls.localize("theia/editor/editor.stickyScroll.enabled", "Shows the nested current scopes during the scroll at the top of the editor."),
+        "scope": "language-overridable",
+        "restricted": false
+    },
+    "editor.stickyScroll.maxLineCount": {
+        "type": "number",
+        "default": 5,
+        "minimum": 1,
+        "maximum": 10,
+        "description": nls.localize("theia/editor/editor.stickyScroll.maxLineCount", "Defines the maximum number of sticky lines to show."),
+        "scope": "language-overridable",
+        "restricted": false
+    },
     "editor.stickyTabStops": {
         "description": nls.localizeByDefault("Emulate selection behavior of tab characters when using spaces for indentation. Selection will stick to tab stops."),
         "type": "boolean",
@@ -1786,6 +1825,13 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
         "scope": "language-overridable",
         "restricted": false
     },
+    "editor.suggest.matchOnWordStartOnly": {
+        "type": "boolean",
+        "default": true,
+        "markdownDescription": nls.localize("theia/editor/editor.suggest.matchOnWordStartOnly", "When enabled IntelliSense filtering requires that the first character matches on a word start, e.g `c` on `Console` or `WebContext` but _not_ on `description`. When disabled IntelliSense will show more results but still sorts them by match quality."),
+        "scope": "language-overridable",
+        "restricted": false
+    },
     "editor.suggest.showFields": {
         "type": "boolean",
         "default": true,
@@ -2214,8 +2260,8 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
         ],
         "markdownEnumDescriptions": [
             nls.localize("theia/editor/editor.inlayHints.enabled0", "Inlay hints are enabled"),
-            nls.localize("theia/editor/editor.inlayHints.enabled1", "Inlay hints are showing by default and hide when holding `Ctrl+Alt`"),
-            nls.localize("theia/editor/editor.inlayHints.enabled2", "Inlay hints are hidden by default and show when holding `Ctrl+Alt`"),
+            nls.localize("theia/editor/editor.inlayHints.enabled1", "Inlay hints are showing by default and hide when holding Ctrl+Alt"),
+            nls.localize("theia/editor/editor.inlayHints.enabled2", "Inlay hints are hidden by default and show when holding Ctrl+Alt"),
             nls.localize("theia/editor/editor.inlayHints.enabled3", "Inlay hints are disabled")
         ],
         "scope": "language-overridable",
@@ -2235,18 +2281,45 @@ export const editorGeneratedPreferenceProperties: PreferenceSchema['properties']
         "scope": "language-overridable",
         "restricted": false
     },
-    "editor.selectionClipboard": {
+    "editor.inlayHints.padding": {
         "type": "boolean",
+        "default": false,
+        "description": nls.localize("theia/editor/editor.inlayHints.padding", "Enables the padding around the inlay hints in the editor."),
+        "scope": "language-overridable",
+        "restricted": false
+    },
+    "editor.codeActionWidget.showHeaders": {
+        "type": "boolean",
+        "description": nls.localize("theia/editor/editor.codeActionWidget.showHeaders", "Enable/disable showing group headers in the code action menu."),
         "default": true,
-        "description": nls.localizeByDefault("Controls whether the Linux primary clipboard should be supported."),
-        "included": !isOSX && !isWindows
+        "scope": "language-overridable",
+        "restricted": false
+    },
+    "editor.experimental.pasteActions.enabled": {
+        "type": "boolean",
+        "description": nls.localize("theia/editor/editor.experimental.pasteActions.enabled", "Enable/disable running edits from extensions on paste."),
+        "default": false,
+        "scope": "language-overridable",
+        "restricted": false
+    },
+    "editor.rename.enablePreview": {
+        "description": nls.localizeByDefault("Enable/disable the ability to preview changes before renaming"),
+        "default": true,
+        "type": "boolean",
+        "scope": "language-overridable",
+        "restricted": false
+    },
+    "editor.find.globalFindClipboard": {
+        "type": "boolean",
+        "default": false,
+        "description": nls.localizeByDefault("Controls whether the Find Widget should read or modify the shared find clipboard on macOS."),
+        "included": isOSX
     }
 };
 
 type QuickSuggestionValues = boolean | 'on' | 'inline' | 'off';
 
 export interface GeneratedEditorPreferences {
-    'editor.rename.enablePreview': boolean;
     'editor.tabSize': number;
     'editor.insertSpaces': boolean;
     'editor.detectIndentation': boolean;
@@ -2257,15 +2330,17 @@ export interface GeneratedEditorPreferences {
     'editor.semanticHighlighting.enabled': true | false | 'configuredByTheme';
     'editor.stablePeek': boolean;
     'editor.maxTokenizationLineLength': number;
-    'editor.language.brackets': Array<[string, string]> | null;
+    'editor.language.brackets': Array<[string, string]> | null | 'null';
     'editor.language.colorizedBracketPairs': Array<[string, string]> | null;
     'diffEditor.maxComputationTime': number;
     'diffEditor.maxFileSize': number;
     'diffEditor.renderSideBySide': boolean;
+    'diffEditor.renderMarginRevertIcon': boolean;
     'diffEditor.ignoreTrimWhitespace': boolean;
     'diffEditor.renderIndicators': boolean;
     'diffEditor.codeLens': boolean;
     'diffEditor.wordWrap': 'off' | 'on' | 'inherit';
+    'diffEditor.diffAlgorithm': 'smart' | 'experimental';
     'editor.acceptSuggestionOnCommitCharacter': boolean;
     'editor.acceptSuggestionOnEnter': 'on' | 'smart' | 'off';
     'editor.accessibilitySupport': 'auto' | 'on' | 'off';
@@ -2298,12 +2373,12 @@ export interface GeneratedEditorPreferences {
     'editor.cursorSurroundingLinesStyle': 'default' | 'all';
     'editor.cursorWidth': number;
     'editor.dragAndDrop': boolean;
+    'editor.dropIntoEditor.enabled': boolean;
     'editor.emptySelectionClipboard': boolean;
     'editor.fastScrollSensitivity': number;
     'editor.find.cursorMoveOnType': boolean;
     'editor.find.seedSearchStringFromSelection': 'never' | 'always' | 'selection';
     'editor.find.autoFindInSelection': 'never' | 'always' | 'multiline';
-    'editor.find.globalFindClipboard': boolean;
     'editor.find.addExtraSpaceOnTop': boolean;
     'editor.find.loop': boolean;
     'editor.folding': boolean;
@@ -2319,7 +2394,7 @@ export interface GeneratedEditorPreferences {
     'editor.formatOnPaste': boolean;
     'editor.formatOnType': boolean;
     'editor.glyphMargin': boolean;
-    'editor.gotoLocation.multiple': null | 'peek' | 'gotoAndPeek' | 'goto';
+    'editor.gotoLocation.multiple': null;
     'editor.gotoLocation.multipleDefinitions': 'peek' | 'gotoAndPeek' | 'goto';
     'editor.gotoLocation.multipleTypeDefinitions': 'peek' | 'gotoAndPeek' | 'goto';
     'editor.gotoLocation.multipleDeclarations': 'peek' | 'gotoAndPeek' | 'goto';
@@ -2344,6 +2419,7 @@ export interface GeneratedEditorPreferences {
     'editor.links': boolean;
     'editor.matchBrackets': 'always' | 'near' | 'never';
     'editor.minimap.enabled': boolean;
+    'editor.minimap.autohide': boolean;
     'editor.minimap.size': 'proportional' | 'fill' | 'fit';
     'editor.minimap.side': 'left' | 'right';
     'editor.minimap.showSlider': 'always' | 'mouseover';
@@ -2381,12 +2457,15 @@ export interface GeneratedEditorPreferences {
     'editor.scrollBeyondLastColumn': number;
     'editor.scrollBeyondLastLine': boolean;
     'editor.scrollPredominantAxis': boolean;
+    'editor.selectionClipboard': boolean;
     'editor.selectionHighlight': boolean;
-    'editor.showFoldingControls': 'always' | 'mouseover';
+    'editor.showFoldingControls': 'always' | 'never' | 'mouseover';
     'editor.showUnused': boolean;
     'editor.snippetSuggestions': 'top' | 'bottom' | 'inline' | 'none';
     'editor.smartSelect.selectLeadingAndTrailingWhitespace': boolean;
     'editor.smoothScrolling': boolean;
+    'editor.stickyScroll.enabled': boolean;
+    'editor.stickyScroll.maxLineCount': number;
     'editor.stickyTabStops': boolean;
     'editor.suggest.insertMode': 'insert' | 'replace';
     'editor.suggest.filterGraceful': boolean;
@@ -2403,6 +2482,7 @@ export interface GeneratedEditorPreferences {
     'editor.suggest.showFunctions': boolean;
     'editor.suggest.showConstructors': boolean;
     'editor.suggest.showDeprecated': boolean;
+    'editor.suggest.matchOnWordStartOnly': boolean;
     'editor.suggest.showFields': boolean;
     'editor.suggest.showVariables': boolean;
     'editor.suggest.showClasses': boolean;
@@ -2451,5 +2531,9 @@ export interface GeneratedEditorPreferences {
     'editor.inlayHints.enabled': 'on' | 'onUnlessPressed' | 'offUnlessPressed' | 'off';
     'editor.inlayHints.fontSize': number;
     'editor.inlayHints.fontFamily': string;
-    'editor.selectionClipboard': boolean;
+    'editor.inlayHints.padding': boolean;
+    'editor.codeActionWidget.showHeaders': boolean;
+    'editor.experimental.pasteActions.enabled': boolean;
+    'editor.rename.enablePreview': boolean;
+    'editor.find.globalFindClipboard': boolean;
 }
diff --git a/packages/git/package.json b/packages/git/package.json
index e01fc6176434f..e0ca0be7a5cf0 100644
--- a/packages/git/package.json
+++ b/packages/git/package.json
@@ -6,7 +6,7 @@
     "@theia/core": "1.31.0",
     "@theia/editor": "1.31.0",
     "@theia/filesystem": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "@theia/navigator": "1.31.0",
     "@theia/scm": "1.31.0",
     "@theia/scm-extra": "1.31.0",
diff --git a/packages/keymaps/package.json b/packages/keymaps/package.json
index 7b83b19b43182..608caa6dccb6e 100644
--- a/packages/keymaps/package.json
+++ b/packages/keymaps/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@theia/core": "1.31.0",
     "@theia/monaco": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "@theia/preferences": "1.31.0",
     "@theia/userstorage": "1.31.0",
     "jsonc-parser": "^2.2.0"
diff --git a/packages/monaco/package.json b/packages/monaco/package.json
index 5d19b5632d3a9..9dabefa12862e 100644
--- a/packages/monaco/package.json
+++ b/packages/monaco/package.json
@@ -7,7 +7,7 @@
     "@theia/editor": "1.31.0",
     "@theia/filesystem": "1.31.0",
     "@theia/markers": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "@theia/outline-view": "1.31.0",
     "fast-plist": "^0.1.2",
     "idb": "^4.0.5",
diff --git a/packages/monaco/src/browser/monaco-bulk-edit-service.ts b/packages/monaco/src/browser/monaco-bulk-edit-service.ts
index 73966706dc814..23adb14ee5348 100644
--- a/packages/monaco/src/browser/monaco-bulk-edit-service.ts
+++ b/packages/monaco/src/browser/monaco-bulk-edit-service.ts
@@ -20,6 +20,7 @@ import {
     IBulkEditOptions, IBulkEditPreviewHandler, IBulkEditResult, IBulkEditService, ResourceEdit
 } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
 import { IDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
+import { WorkspaceEdit } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
 
 @injectable()
 export class MonacoBulkEditService implements IBulkEditService {
@@ -30,9 +31,11 @@ export class MonacoBulkEditService implements IBulkEditService {
 
     private _previewHandler?: IBulkEditPreviewHandler;
 
-    async apply(edits: ResourceEdit[], options?: IBulkEditOptions): Promise<IBulkEditResult & { success: boolean }> {
+    async apply(editsIn: ResourceEdit[] | WorkspaceEdit, options?: IBulkEditOptions): Promise<IBulkEditResult & { success: boolean }> {
+        const edits = Array.isArray(editsIn) ? editsIn : ResourceEdit.convert(editsIn);
+
         if (this._previewHandler && (options?.showPreview || edits.some(value => value.metadata?.needsConfirmation))) {
-            edits = await this._previewHandler(edits, options);
+            editsIn = await this._previewHandler(edits, options);
             return { ariaSummary: '', success: true };
         } else {
             return this.workspace.applyBulkEdit(edits);
diff --git a/packages/monaco/src/browser/monaco-context-key-service.ts b/packages/monaco/src/browser/monaco-context-key-service.ts
index 04df9f408dc7e..627190447ba2e 100644
--- a/packages/monaco/src/browser/monaco-context-key-service.ts
+++ b/packages/monaco/src/browser/monaco-context-key-service.ts
@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { ContextKeyService as TheiaContextKeyService, ContextKey, ContextKeyChangeEvent, ScopedValueStore } from '@theia/core/lib/browser/context-key-service';
+import { ContextKeyService as TheiaContextKeyService, ContextKey, ContextKeyChangeEvent, ScopedValueStore, ContextKeyValue } from '@theia/core/lib/browser/context-key-service';
 import { Emitter } from '@theia/core';
 import { AbstractContextKeyService, ContextKeyService as VSCodeContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
 import { ContextKeyExpr, ContextKeyExpression, IContext } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
@@ -37,7 +37,7 @@ export class MonacoContextKeyService implements TheiaContextKeyService {
         );
     }
 
-    createKey<T>(key: string, defaultValue: T | undefined): ContextKey<T> {
+    createKey<T extends ContextKeyValue>(key: string, defaultValue: T | undefined): ContextKey<T> {
         return this.contextKeyService.createKey(key, defaultValue);
     }
 
diff --git a/packages/monaco/src/browser/monaco-gotoline-quick-access.ts b/packages/monaco/src/browser/monaco-gotoline-quick-access.ts
index 4fc734f0ad9a6..b789b3956f775 100644
--- a/packages/monaco/src/browser/monaco-gotoline-quick-access.ts
+++ b/packages/monaco/src/browser/monaco-gotoline-quick-access.ts
@@ -41,7 +41,7 @@ export class GotoLineQuickAccessContribution implements QuickAccessContribution
             ctor: GotoLineQuickAccess,
             prefix: ':',
             placeholder: '',
-            helpEntries: [{ description: 'Go to line', needsEditor: true }]
+            helpEntries: [{ description: 'Go to line' }]
         });
     }
 }
diff --git a/packages/monaco/src/browser/monaco-gotosymbol-quick-access.ts b/packages/monaco/src/browser/monaco-gotosymbol-quick-access.ts
index 20c37bd8c2c28..6f92877fabb1e 100644
--- a/packages/monaco/src/browser/monaco-gotosymbol-quick-access.ts
+++ b/packages/monaco/src/browser/monaco-gotosymbol-quick-access.ts
@@ -47,7 +47,7 @@ export class GotoSymbolQuickAccessContribution implements QuickAccessContributio
             ctor: GotoSymbolQuickAccess,
             prefix: '@',
             placeholder: '',
-            helpEntries: [{ description: 'Go to symbol', needsEditor: true }]
+            helpEntries: [{ description: 'Go to symbol' }]
         });
     }
 }
diff --git a/packages/monaco/src/browser/monaco-menu.ts b/packages/monaco/src/browser/monaco-menu.ts
index eaf3ccce4868d..5e305950c0b01 100644
--- a/packages/monaco/src/browser/monaco-menu.ts
+++ b/packages/monaco/src/browser/monaco-menu.ts
@@ -15,11 +15,11 @@
 // *****************************************************************************
 
 import { injectable, inject } from '@theia/core/shared/inversify';
-import { MenuContribution, MenuModelRegistry, MAIN_MENU_BAR, MenuPath } from '@theia/core/lib/common';
+import { MenuContribution, MenuModelRegistry, MAIN_MENU_BAR, MenuPath, MenuAction } from '@theia/core/lib/common';
 import { EditorMainMenu, EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser';
 import { MonacoCommandRegistry } from './monaco-command-registry';
 import { nls } from '@theia/core/lib/common/nls';
-import { isIMenuItem, MenuId, MenuRegistry } from '@theia/monaco-editor-core/esm/vs/platform/actions/common/actions';
+import { IMenuItem, isIMenuItem, MenuId, MenuRegistry } from '@theia/monaco-editor-core/esm/vs/platform/actions/common/actions';
 
 export interface MonacoActionGroup {
     id: string;
@@ -46,7 +46,7 @@ export class MonacoEditorMenuContribution implements MenuContribution {
             const commandId = this.commands.validate(item.command.id);
             if (commandId) {
                 const menuPath = [...EDITOR_CONTEXT_MENU, (item.group || '')];
-                registry.registerMenuAction(menuPath, { commandId });
+                registry.registerMenuAction(menuPath, this.buildMenuAction(commandId, item));
             }
         }
 
@@ -60,10 +60,7 @@ export class MonacoEditorMenuContribution implements MenuContribution {
             const commandId = this.commands.validate(item.command.id);
             if (commandId) {
                 const menuPath = [...MonacoMenus.SELECTION, (item.group || '')];
-                const title = typeof item.command.title === 'string' ? item.command.title : item.command.title.value;
-                const label = this.removeMnemonic(title);
-                const order = item.order ? String(item.order) : '';
-                registry.registerMenuAction(menuPath, { commandId, order, label });
+                registry.registerMenuAction(menuPath, this.buildMenuAction(commandId, item));
             }
         }
 
@@ -75,27 +72,33 @@ export class MonacoEditorMenuContribution implements MenuContribution {
         });
         registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
             commandId: 'editor.action.revealDefinition',
+            label: nls.localizeByDefault('Go to Definition'),
             order: '2'
         });
         registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
             commandId: 'editor.action.revealDeclaration',
+            label: nls.localizeByDefault('Go to Declaration'),
             order: '3'
         });
         registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
             commandId: 'editor.action.goToTypeDefinition',
+            label: nls.localizeByDefault('Go to Type Definition'),
             order: '4'
         });
         registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
             commandId: 'editor.action.goToImplementation',
+            label: nls.localizeByDefault('Go to Implementations'),
             order: '5'
         });
         registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
             commandId: 'editor.action.goToReferences',
+            label: nls.localizeByDefault('Go to References'),
             order: '6'
         });
 
         registry.registerMenuAction(EditorMainMenu.LOCATION_GROUP, {
             commandId: 'editor.action.jumpToBracket',
+            label: nls.localizeByDefault('Go to Bracket'),
             order: '2'
         });
 
@@ -121,12 +124,18 @@ export class MonacoEditorMenuContribution implements MenuContribution {
             }
             const commandId = this.commands.validate(item.command.id);
             if (commandId) {
-                const order = item.order ? String(item.order) : '';
-                registry.registerMenuAction([...MonacoMenus.PEEK_CONTEXT_SUBMENU, item.group || ''], { commandId, order });
+                registry.registerMenuAction([...MonacoMenus.PEEK_CONTEXT_SUBMENU, item.group || ''], this.buildMenuAction(commandId, item));
             }
         }
     }
 
+    protected buildMenuAction(commandId: string, item: IMenuItem): MenuAction {
+        const title = typeof item.command.title === 'string' ? item.command.title : item.command.title.value;
+        const label = this.removeMnemonic(title);
+        const order = item.order ? String(item.order) : '';
+        return { commandId, order, label };
+    }
+
     protected removeMnemonic(label: string): string {
         return label.replace(/\(&&\w\)|&&/g, '');
     }
diff --git a/packages/monaco/src/browser/monaco-quick-input-service.ts b/packages/monaco/src/browser/monaco-quick-input-service.ts
index 2ff9bbbd9aa64..404da14a02c3d 100644
--- a/packages/monaco/src/browser/monaco-quick-input-service.ts
+++ b/packages/monaco/src/browser/monaco-quick-input-service.ts
@@ -200,7 +200,11 @@ export class MonacoQuickInputImplementation implements IQuickInputService {
     // Keep the styles up to date with https://github.com/microsoft/vscode/blob/7888ff3a6b104e9e2e3d0f7890ca92dd0828215f/src/vs/platform/quickinput/browser/quickInput.ts#L171.
     private getStyles(): IQuickInputStyles {
         return {
-            widget: {},
+            widget: {
+                quickInputBackground: this.colorRegistry.getColor('quickInput.background'),
+                quickInputForeground: this.colorRegistry.getColor('quickInput.foreground'),
+                quickInputTitleBackground: this.colorRegistry.getColor('quickInputTitle.background')
+            },
             list: {
                 listBackground: this.colorRegistry.getColor('quickInput.background'),
                 listInactiveFocusForeground: this.colorRegistry.getColor('quickInputList.focusForeground'),
diff --git a/packages/monaco/src/browser/monaco-workspace.ts b/packages/monaco/src/browser/monaco-workspace.ts
index 8e785d61a49d2..cc10ba029cce2 100644
--- a/packages/monaco/src/browser/monaco-workspace.ts
+++ b/packages/monaco/src/browser/monaco-workspace.ts
@@ -39,24 +39,24 @@ import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/stan
 import { EndOfLineSequence } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
 
 export namespace WorkspaceFileEdit {
-    export function is(arg: Edit): arg is monaco.languages.WorkspaceFileEdit {
-        return ('oldUri' in arg && monaco.Uri.isUri(arg.oldUri)) ||
-            ('newUri' in arg && monaco.Uri.isUri(arg.newUri));
+    export function is(arg: Edit): arg is monaco.languages.IWorkspaceFileEdit {
+        return ('oldResource' in arg && monaco.Uri.isUri(arg.oldResource)) ||
+            ('newResource' in arg && monaco.Uri.isUri(arg.newResource));
     }
 }
 
 export namespace WorkspaceTextEdit {
-    export function is(arg: Edit): arg is monaco.languages.WorkspaceTextEdit {
+    export function is(arg: Edit): arg is monaco.languages.IWorkspaceTextEdit {
         return !!arg && typeof arg === 'object'
             && 'resource' in arg
             && monaco.Uri.isUri(arg.resource)
-            && 'edit' in arg
-            && arg.edit !== null
-            && typeof arg.edit === 'object';
+            && 'textEdit' in arg
+            && arg.textEdit !== null
+            && typeof arg.textEdit === 'object';
     }
 }
 
-export type Edit = monaco.languages.WorkspaceFileEdit | monaco.languages.WorkspaceTextEdit;
+export type Edit = monaco.languages.IWorkspaceFileEdit | monaco.languages.IWorkspaceTextEdit;
 
 export namespace ResourceFileEdit {
     export function is(arg: ResourceEdit): arg is MonacoResourceFileEdit {
diff --git a/packages/monaco/src/browser/style/index.css b/packages/monaco/src/browser/style/index.css
index 4eddb3b2ffb0f..61937d14e9aba 100644
--- a/packages/monaco/src/browser/style/index.css
+++ b/packages/monaco/src/browser/style/index.css
@@ -105,13 +105,6 @@
   font-family: sans-serif;
 }
 
-.monaco-editor .monaco-list .monaco-list-row.focused,
-.monaco-editor .monaco-list .monaco-list-row.focused,
-.monaco-editor .monaco-list .monaco-list-row.focused .suggest-icon {
-  color: var(--theia-list-activeSelectionForeground) !important;
-  background-color: var(--theia-list-activeSelectionBackground) !important;
-}
-
 /* Monaco Quick Input */
 .quick-input-widget {
   width: 600px !important;
diff --git a/packages/output/package.json b/packages/output/package.json
index c31edd20586e6..d0c462fcab2af 100644
--- a/packages/output/package.json
+++ b/packages/output/package.json
@@ -6,7 +6,7 @@
     "@theia/core": "1.31.0",
     "@theia/editor": "1.31.0",
     "@theia/monaco": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "@types/p-queue": "^2.3.1",
     "p-queue": "^2.4.2"
   },
diff --git a/packages/plugin-ext-vscode/package.json b/packages/plugin-ext-vscode/package.json
index 95a05815ff4a9..71e83b98682b7 100644
--- a/packages/plugin-ext-vscode/package.json
+++ b/packages/plugin-ext-vscode/package.json
@@ -8,7 +8,7 @@
     "@theia/editor": "1.31.0",
     "@theia/filesystem": "1.31.0",
     "@theia/monaco": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "@theia/navigator": "1.31.0",
     "@theia/plugin": "1.31.0",
     "@theia/plugin-ext": "1.31.0",
diff --git a/packages/plugin-ext/package.json b/packages/plugin-ext/package.json
index 40daabffbd0aa..c6a6a979ab9cd 100644
--- a/packages/plugin-ext/package.json
+++ b/packages/plugin-ext/package.json
@@ -16,7 +16,7 @@
     "@theia/markers": "1.31.0",
     "@theia/messages": "1.31.0",
     "@theia/monaco": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "@theia/navigator": "1.31.0",
     "@theia/output": "1.31.0",
     "@theia/plugin": "1.31.0",
diff --git a/packages/plugin-ext/src/common/plugin-api-rpc-model.ts b/packages/plugin-ext/src/common/plugin-api-rpc-model.ts
index cee3be5fe5ba1..658c34d950551 100644
--- a/packages/plugin-ext/src/common/plugin-api-rpc-model.ts
+++ b/packages/plugin-ext/src/common/plugin-api-rpc-model.ts
@@ -428,8 +428,8 @@ export interface WorkspaceEditMetadata {
 }
 
 export interface WorkspaceFileEdit {
-    oldUri?: UriComponents;
-    newUri?: UriComponents;
+    newResource?: UriComponents;
+    oldResource?: UriComponents;
     options?: { overwrite?: boolean, ignoreIfNotExists?: boolean, ignoreIfExists?: boolean, recursive?: boolean };
     metadata?: WorkspaceEditMetadata;
 }
@@ -437,7 +437,7 @@ export interface WorkspaceFileEdit {
 export interface WorkspaceTextEdit {
     resource: UriComponents;
     modelVersionId?: number;
-    edit: TextEdit;
+    textEdit: TextEdit;
     metadata?: WorkspaceEditMetadata;
 }
 
diff --git a/packages/plugin-ext/src/common/plugin-api-rpc.ts b/packages/plugin-ext/src/common/plugin-api-rpc.ts
index aaaf79f10c844..83df9be8d0eb5 100644
--- a/packages/plugin-ext/src/common/plugin-api-rpc.ts
+++ b/packages/plugin-ext/src/common/plugin-api-rpc.ts
@@ -1407,8 +1407,8 @@ export interface WorkspaceEditMetadataDto {
 }
 
 export interface WorkspaceFileEditDto {
-    oldUri?: UriComponents;
-    newUri?: UriComponents;
+    oldResource?: UriComponents;
+    newResource?: UriComponents;
     options?: FileOperationOptions;
     metadata?: WorkspaceEditMetadataDto;
 }
@@ -1416,7 +1416,7 @@ export interface WorkspaceFileEditDto {
 export interface WorkspaceTextEditDto {
     resource: UriComponents;
     modelVersionId?: number;
-    edit: TextEdit;
+    textEdit: TextEdit;
     metadata?: WorkspaceEditMetadataDto;
 
 }
@@ -1424,9 +1424,9 @@ export namespace WorkspaceTextEditDto {
     export function is(arg: WorkspaceTextEditDto | WorkspaceFileEditDto): arg is WorkspaceTextEditDto {
         return !!arg
             && 'resource' in arg
-            && 'edit' in arg
-            && arg.edit !== null
-            && typeof arg.edit === 'object';
+            && 'textEdit' in arg
+            && arg.textEdit !== null
+            && typeof arg.textEdit === 'object';
     }
 }
 
diff --git a/packages/plugin-ext/src/main/browser/languages-main.ts b/packages/plugin-ext/src/main/browser/languages-main.ts
index 1bc199c33aa06..f2ab71f4e5385 100644
--- a/packages/plugin-ext/src/main/browser/languages-main.ts
+++ b/packages/plugin-ext/src/main/browser/languages-main.ts
@@ -39,7 +39,7 @@ import {
 import { injectable, inject } from '@theia/core/shared/inversify';
 import {
     SerializedDocumentFilter, MarkerData, Range, RelatedInformation,
-    MarkerSeverity, DocumentLink, WorkspaceSymbolParams, CodeAction, CompletionDto, CodeActionProviderDocumentation, InlayHint, InlayHintLabelPart
+    MarkerSeverity, DocumentLink, WorkspaceSymbolParams, CodeAction, CompletionDto, CodeActionProviderDocumentation, InlayHint, InlayHintLabelPart, CodeActionContext
 } from '../../common/plugin-api-rpc-model';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { MonacoLanguages, WorkspaceSymbolProvider } from '@theia/monaco/lib/browser/monaco-languages';
@@ -868,37 +868,36 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         }
     }
 
-    $registerQuickFixProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], providedCodeActionKinds?: string[],
-        documentation?: CodeActionProviderDocumentation): void {
-
+    $registerQuickFixProvider(
+        handle: number,
+        pluginInfo: PluginInfo,
+        selector: SerializedDocumentFilter[],
+        providedCodeActionKinds?: string[],
+        documentation?: CodeActionProviderDocumentation
+    ): void {
         const languageSelector = this.toLanguageSelector(selector);
-        const quickFixProvider = {
-            provideCodeActions: (model: monaco.editor.ITextModel, range: monaco.Range,
-                context: monaco.languages.CodeActionContext, token: monaco.CancellationToken): monaco.languages.CodeActionList | Promise<monaco.languages.CodeActionList> => {
+        const quickFixProvider: monaco.languages.CodeActionProvider = {
+            provideCodeActions: (model, range, context, token) => {
                 const markers = StandaloneServices.get(IMarkerService)
                     .read({ resource: model.uri })
                     .filter(m => monaco.Range.areIntersectingOrTouching(m, range)) as monaco.editor.IMarkerData[];
-                return this.provideCodeActions(handle, model, range, { markers, only: context.only }, token);
+                return this.provideCodeActions(handle, model, range, { ...context, markers }, token);
             },
-            resolveCodeAction: (codeAction: monaco.languages.CodeAction, token: monaco.CancellationToken): Promise<monaco.languages.CodeAction> =>
-                this.resolveCodeAction(handle, codeAction, token),
-            providedCodeActionKinds,
-            documentation
+            resolveCodeAction: (codeAction, token) => this.resolveCodeAction(handle, codeAction, token)
         };
         this.register(handle, (monaco.languages.registerCodeActionProvider as RegistrationFunction<monaco.languages.CodeActionProvider>)(languageSelector, quickFixProvider));
     }
 
-    protected async provideCodeActions(handle: number, model: monaco.editor.ITextModel,
-        rangeOrSelection: Range, context: monaco.languages.CodeActionContext,
-        token: monaco.CancellationToken): Promise<monaco.languages.CodeActionList | monaco.languages.CodeActionList> {
-        const actions = await this.proxy.$provideCodeActions(handle, model.uri, rangeOrSelection, {
-            ...context,
-            // @monaco-uplift
-            // the current version of monaco.languages.CodeActionContext has no CodeActionTriggerKind
-            trigger: CodeActionTriggerKind.Automatic
-        }, token);
+    protected async provideCodeActions(
+        handle: number,
+        model: monaco.editor.ITextModel,
+        rangeOrSelection: Range,
+        context: monaco.languages.CodeActionContext,
+        token: monaco.CancellationToken
+    ): Promise<monaco.languages.CodeActionList | undefined> {
+        const actions = await this.proxy.$provideCodeActions(handle, model.uri, rangeOrSelection, this.toModelCodeActionContext(context), token);
         if (!actions) {
-            return undefined!;
+            return undefined;
         }
         return {
             actions: actions.map(a => toMonacoAction(a)),
@@ -906,6 +905,22 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         };
     }
 
+    protected toModelCodeActionContext(context: monaco.languages.CodeActionContext): CodeActionContext {
+        return {
+            ...context,
+            trigger: this.toCodeActionTriggerKind(context.trigger)
+        };
+    }
+
+    toCodeActionTriggerKind(type: monaco.languages.CodeActionTriggerType): CodeActionTriggerKind {
+        switch (type) {
+            case monaco.languages.CodeActionTriggerType.Auto:
+                return CodeActionTriggerKind.Automatic;
+            case monaco.languages.CodeActionTriggerType.Invoke:
+                return CodeActionTriggerKind.Invoke;
+        }
+    }
+
     protected async resolveCodeAction(handle: number, codeAction: monaco.languages.CodeAction, token: monaco.CancellationToken): Promise<monaco.languages.CodeAction> {
         // The cacheId is kept in toMonacoAction when converting a received CodeAction DTO to a monaco code action
         const cacheId = (codeAction as CodeAction).cacheId;
@@ -1283,7 +1298,7 @@ function reviveOnEnterRules(onEnterRules?: SerializedOnEnterRule[]): monaco.lang
     return onEnterRules.map(reviveOnEnterRule);
 }
 
-function reviveInlayLabel(label: string | InlayHintLabelPart[]):  string | monaco.languages.InlayHintLabelPart[] {
+function reviveInlayLabel(label: string | InlayHintLabelPart[]): string | monaco.languages.InlayHintLabelPart[] {
     let monacoLabel: string | monaco.languages.InlayHintLabelPart[];
     if (typeof label === 'string') {
         monacoLabel = label;
@@ -1337,14 +1352,17 @@ export function toMonacoWorkspaceEdit(data: WorkspaceEditDto | undefined): monac
     return {
         edits: (data && data.edits || []).map(edit => {
             if (WorkspaceTextEditDto.is(edit)) {
-                return <monaco.languages.WorkspaceTextEdit>{
+                return <monaco.languages.IWorkspaceTextEdit>{
                     resource: monaco.Uri.revive(edit.resource),
-                    edit: edit.edit, metadata: edit.metadata
+                    textEdit: edit.textEdit,
+                    metadata: edit.metadata
                 };
             } else {
-                return <monaco.languages.WorkspaceFileEdit>{
-                    newUri: monaco.Uri.revive(edit.newUri), oldUri: monaco.Uri.revive(edit.oldUri),
-                    options: edit.options, metadata: edit.metadata
+                return <monaco.languages.IWorkspaceFileEdit>{
+                    newResource: monaco.Uri.revive(edit.newResource),
+                    oldResource: monaco.Uri.revive(edit.oldResource),
+                    options: edit.options,
+                    metadata: edit.metadata
                 };
             }
         })
diff --git a/packages/plugin-ext/src/main/browser/menus/plugin-menu-command-adapter.ts b/packages/plugin-ext/src/main/browser/menus/plugin-menu-command-adapter.ts
index 79f8d8700aa40..a76881060108c 100644
--- a/packages/plugin-ext/src/main/browser/menus/plugin-menu-command-adapter.ts
+++ b/packages/plugin-ext/src/main/browser/menus/plugin-menu-command-adapter.ts
@@ -247,9 +247,11 @@ export class PluginMenuCommandAdapter implements MenuCommandAdapter {
 
     protected getSelectedResources(): [CodeUri | TreeViewSelection | undefined, CodeUri[] | undefined] {
         const selection = this.selectionService.selection;
+        const resourceKey = this.resourceContextKey.get();
+        const resourceUri = resourceKey ? CodeUri.parse(resourceKey) : undefined;
         const firstMember = TreeWidgetSelection.is(selection) && selection.source instanceof TreeViewWidget && selection[0]
             ? selection.source.toTreeViewSelection(selection[0])
-            : (UriSelection.getUri(selection) ?? this.resourceContextKey.get())?.['codeUri'];
+            : UriSelection.getUri(selection)?.['codeUri'] ?? resourceUri;
         const secondMember = TreeWidgetSelection.is(selection)
             ? UriSelection.getUris(selection).map(uri => uri['codeUri'])
             : undefined;
diff --git a/packages/plugin-ext/src/main/browser/text-editor-main.ts b/packages/plugin-ext/src/main/browser/text-editor-main.ts
index 42034c055699f..d9aebe0acf068 100644
--- a/packages/plugin-ext/src/main/browser/text-editor-main.ts
+++ b/packages/plugin-ext/src/main/browser/text-editor-main.ts
@@ -282,7 +282,8 @@ export class TextEditorMain implements Disposable {
         if (!this.editor) {
             return;
         }
-        (this.editor.getControl() as unknown as StandaloneCodeEditor).setDecorations('Plugin decorations', key, ranges.map(option => Object.assign(option, { color: undefined })));
+        (this.editor.getControl() as unknown as StandaloneCodeEditor)
+            .setDecorationsByType('Plugin decorations', key, ranges.map(option => Object.assign(option, { color: undefined })));
     }
 
     setDecorationsFast(key: string, _ranges: number[]): void {
@@ -294,7 +295,7 @@ export class TextEditorMain implements Disposable {
         for (let i = 0; i < len; i++) {
             ranges[i] = new monaco.Range(_ranges[4 * i], _ranges[4 * i + 1], _ranges[4 * i + 2], _ranges[4 * i + 3]);
         }
-        (this.editor.getControl() as unknown as StandaloneCodeEditor).setDecorationsFast(key, ranges);
+        (this.editor.getControl() as unknown as StandaloneCodeEditor).setDecorationsByTypeFast(key, ranges);
     }
 
     private static toMonacoSelections(selection: Selection): monaco.Selection {
diff --git a/packages/plugin-ext/src/main/browser/theme-icon-override.ts b/packages/plugin-ext/src/main/browser/theme-icon-override.ts
index 51a28e96e2674..7ac6b18fade03 100644
--- a/packages/plugin-ext/src/main/browser/theme-icon-override.ts
+++ b/packages/plugin-ext/src/main/browser/theme-icon-override.ts
@@ -28,13 +28,44 @@ const codeIconMap: Record<string, string> = {
     'callstack-view-icon': 'debug-alt',
     'callstack-view-session': 'bug',
     'comments-view-icon': 'comment-discussion',
+    'debug-breakpoint': 'debug-breakpoint',
+    'debug-breakpoint-conditional': 'debug-breakpoint-conditional',
+    'debug-breakpoint-conditional-disabled': 'debug-breakpoint-conditional-disabled',
+    'debug-breakpoint-conditional-verified': 'debug-breakpoint-conditional-unverified',
+    'debug-breakpoint-data': 'debug-breakpoint-data',
+    'debug-breakpoint-data-disabled': 'debug-breakpoint-data-disabled',
+    'debug-breakpoint-data-unverified': 'debug-breakpoint-data-unverified',
+    'debug-breakpoint-disabled': 'debug-breakpoint-disabled',
+    'debug-breakpoint-function': 'debug-breakpoint-function',
+    'debug-breakpoint-function-disabled': 'debug-breakpoint-function-disabled',
+    'debug-breakpoint-function-unverified': 'debug-breakpoint-function-unverified',
+    'debug-breakpoint-log': 'debug-breakpoint-log',
+    'debug-breakpoint-log-disabled': 'debug-breakpoint-log-disabled',
+    'debug-breakpoint-log-unverified': 'debug-breakpoint-log-unverified',
+    'debug-breakpoint-unsupported': 'debug-breakpoint-unsupported',
+    'debug-breakpoint-unverified': 'debug-breakpoint-unverified',
     'debug-collapse-all': 'collapse-all',
     'debug-configure': 'gear',
     'debug-console-clear-all': 'clear-all',
     'debug-console-evaluation-input': 'arrow-small-right',
     'debug-console-evaluation-prompt': 'chevron-right',
     'debug-console-view-icon': 'debug-console',
+    'debug-continue': 'debug-continue',
+    'debug-disconnect': 'debug-disconnect',
     'debug-gripper': 'gripper',
+    'debug-hint': 'debug-hint',
+    'debug-pause': 'debug-pause',
+    'debug-restart': 'debug-restart',
+    'debug-restart-frame': 'debug-restart-frame',
+    'debug-reverse-continue': 'debug-reverse-continue',
+    'debug-stackframe': 'debug-stackframe',
+    'debug-stackframe-focused': 'debug-stackframe-focused',
+    'debug-start': 'debug-start',
+    'debug-step-back': 'debug-step-back',
+    'debug-step-into': 'debug-step-into',
+    'debug-step-out': 'debug-step-out',
+    'debug-step-over': 'debug-step-over',
+    'debug-stop': 'debug-stop',
     'default-view-icon': 'window',
     'diff-editor-next-change': 'arrow-down',
     'diff-editor-previous-change': 'arrow-up',
diff --git a/packages/plugin-ext/src/plugin/languages.ts b/packages/plugin-ext/src/plugin/languages.ts
index 2f1820822f298..945531d8703a9 100644
--- a/packages/plugin-ext/src/plugin/languages.ts
+++ b/packages/plugin-ext/src/plugin/languages.ts
@@ -520,7 +520,8 @@ export class LanguagesExtImpl implements LanguagesExt {
         return this.createDisposable(callId, disposables?.dispose);
     }
 
-    $provideCodeActions(handle: number,
+    $provideCodeActions(
+        handle: number,
         resource: UriComponents,
         rangeOrSelection: Range | Selection,
         context: CodeActionContext,
diff --git a/packages/plugin-ext/src/plugin/preference-registry.ts b/packages/plugin-ext/src/plugin/preference-registry.ts
index c99b6c19a5c4f..16b0316dc66bd 100644
--- a/packages/plugin-ext/src/plugin/preference-registry.ts
+++ b/packages/plugin-ext/src/plugin/preference-registry.ts
@@ -239,7 +239,15 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
         Object.keys(data[PreferenceScope.Folder]).forEach(resource => {
             folderConfigurations.set(URI.parse(resource), this.getConfigurationModel(data[PreferenceScope.Folder][resource]));
         });
-        return new Configuration(defaultConfiguration, userConfiguration, undefined, workspaceConfiguration, folderConfigurations);
+        return new Configuration(
+            defaultConfiguration,
+            new ConfigurationModel(), /** policy configuration. */
+            new ConfigurationModel(), /** application configuration. */
+            userConfiguration,
+            new ConfigurationModel(), /** remote configuration. */
+            workspaceConfiguration,
+            folderConfigurations
+        );
     }
 
     private getConfigurationModel(data: { [key: string]: any }): ConfigurationModel {
diff --git a/packages/plugin-ext/src/plugin/type-converters.ts b/packages/plugin-ext/src/plugin/type-converters.ts
index 9126224e0df44..1a7894d6346e0 100644
--- a/packages/plugin-ext/src/plugin/type-converters.ts
+++ b/packages/plugin-ext/src/plugin/type-converters.ts
@@ -565,10 +565,22 @@ export function fromWorkspaceEdit(value: theia.WorkspaceEdit, documents?: any):
         if (Array.isArray(uriOrEdits)) {
             // text edits
             const doc = documents ? documents.getDocument(uri.toString()) : undefined;
-            result.edits.push(<WorkspaceTextEditDto>{ resource: uri, modelVersionId: doc && doc.version, edit: uriOrEdits.map(fromTextEdit)[0], metadata: entry[2] });
+            const workspaceTextEditDto: WorkspaceTextEditDto = {
+                resource: uri,
+                modelVersionId: doc?.version,
+                textEdit: uriOrEdits.map(fromTextEdit)[0],
+                metadata: entry[2] as types.WorkspaceEditMetadata
+            };
+            result.edits.push(workspaceTextEditDto);
         } else {
             // resource edits
-            result.edits.push(<WorkspaceFileEditDto>{ oldUri: uri, newUri: uriOrEdits, options: entry[2], metadata: entry[3] });
+            const workspaceFileEditDto: WorkspaceFileEditDto = {
+                oldResource: uri,
+                newResource: uriOrEdits,
+                options: entry[2] as types.FileOperationOptions,
+                metadata: entry[3]
+            };
+            result.edits.push(workspaceFileEditDto);
         }
     }
     return result;
diff --git a/packages/plugin-metrics/package.json b/packages/plugin-metrics/package.json
index 9ee5cc7dc6535..d54eccf277b1a 100644
--- a/packages/plugin-metrics/package.json
+++ b/packages/plugin-metrics/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@theia/core": "1.31.0",
     "@theia/metrics": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "@theia/plugin": "1.31.0",
     "@theia/plugin-ext": "1.31.0"
   },
diff --git a/packages/preferences/package.json b/packages/preferences/package.json
index 122c01d3a7d4b..3404b61247a46 100644
--- a/packages/preferences/package.json
+++ b/packages/preferences/package.json
@@ -7,7 +7,7 @@
     "@theia/editor": "1.31.0",
     "@theia/filesystem": "1.31.0",
     "@theia/monaco": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "@theia/userstorage": "1.31.0",
     "@theia/workspace": "1.31.0",
     "async-mutex": "^0.3.1",
diff --git a/packages/task/package.json b/packages/task/package.json
index 2cb54e4de6150..f73dad94acadb 100644
--- a/packages/task/package.json
+++ b/packages/task/package.json
@@ -8,7 +8,7 @@
     "@theia/filesystem": "1.31.0",
     "@theia/markers": "1.31.0",
     "@theia/monaco": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "@theia/process": "1.31.0",
     "@theia/terminal": "1.31.0",
     "@theia/userstorage": "1.31.0",
diff --git a/packages/toolbar/package.json b/packages/toolbar/package.json
index 57b7df2feca58..cf42768c7686b 100644
--- a/packages/toolbar/package.json
+++ b/packages/toolbar/package.json
@@ -32,7 +32,7 @@
     "@theia/file-search": "1.31.0",
     "@theia/filesystem": "1.31.0",
     "@theia/monaco": "1.31.0",
-    "@theia/monaco-editor-core": "1.67.2",
+    "@theia/monaco-editor-core": "1.72.3-alpha0",
     "@theia/search-in-workspace": "1.31.0",
     "@theia/userstorage": "1.31.0",
     "@theia/workspace": "1.31.0",
diff --git a/packages/variable-resolver/src/browser/common-variable-contribution.ts b/packages/variable-resolver/src/browser/common-variable-contribution.ts
index 40cbcda2db6a6..593ea18d3eb44 100644
--- a/packages/variable-resolver/src/browser/common-variable-contribution.ts
+++ b/packages/variable-resolver/src/browser/common-variable-contribution.ts
@@ -26,6 +26,7 @@ import { VariableInput } from './variable-input';
 import { QuickInputService, QuickPickValue } from '@theia/core/lib/browser';
 import { MaybeArray, RecursivePartial } from '@theia/core/lib/common/types';
 import { cancelled } from '@theia/core/lib/common/cancellation';
+import URI from '@theia/core/lib/common/uri';
 
 @injectable()
 export class CommonVariableContribution implements VariableContribution {
@@ -68,7 +69,7 @@ export class CommonVariableContribution implements VariableContribution {
         });
         variables.registerVariable({
             name: 'config',
-            resolve: (resourceUri = this.resourceContextKey.get(), preferenceName) => {
+            resolve: (resourceUri = new URI(this.resourceContextKey.get()), preferenceName) => {
                 if (!preferenceName) {
                     return undefined;
                 }
@@ -93,7 +94,7 @@ export class CommonVariableContribution implements VariableContribution {
         });
         variables.registerVariable({
             name: 'input',
-            resolve: async (resourceUri = this.resourceContextKey.get(), variable, section) => {
+            resolve: async (resourceUri = new URI(this.resourceContextKey.get()), variable, section) => {
                 if (!variable || !section) {
                     return undefined;
                 }
diff --git a/yarn.lock b/yarn.lock
index 291d930ff8df4..dbfed03e04aad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2282,10 +2282,10 @@
   dependencies:
     defer-to-connect "^2.0.0"
 
-"@theia/monaco-editor-core@1.67.2":
-  version "1.67.2"
-  resolved "https://registry.yarnpkg.com/@theia/monaco-editor-core/-/monaco-editor-core-1.67.2.tgz#d89163fa4f15560e72413791dc6a406a7c732807"
-  integrity sha512-KjDqHiTSOvnQOkV5qOJaUYwOaMjzpbqJZNRi0RKlBkCjcd/wjGlu5kjsgSDu6BbMnk51oQ9GgoDq/ppjJVaa7A==
+"@theia/monaco-editor-core@1.72.3-alpha0":
+  version "1.72.3-alpha0"
+  resolved "https://registry.yarnpkg.com/@theia/monaco-editor-core/-/monaco-editor-core-1.72.3-alpha0.tgz#8a802ba7e18ea200714fa848abda63b330b077f7"
+  integrity sha512-wmjRxtbuzbY7M+rEjahi7Qk0denK+78/jvNsNhvUhxc2kfh8HfGTI7eS/VPV/Bpbo5JDoyHNeWSdKCIeUn0RrQ==
 
 "@tootallnate/once@1", "@tootallnate/once@^1.1.2":
   version "1.1.2"