@codingame/monaco-vscode-api 5.0.1 → 5.1.1

package/api.js

@@ -29,7 +29,7 @@ function createProxy(key) {
     });
 }
 const api = {
-    version: "1.89.0",
+    version: "1.89.1",
     tasks: createProxy('tasks'),
     notebooks: createProxy('notebooks'),
     scm: createProxy('scm'),

package/lifecycle.js

@@ -33,6 +33,10 @@ async function startup(instantiationService) {
     await instantiationService.invokeFunction(async (accessor) => {
         await Promise.all(( serviceInitializePreParticipants.map(participant => participant(accessor))));
     });
+    await instantiationService.invokeFunction(async (accessor) => {
+        setHoverDelegateFactory((placement, enableInstantHover) => instantiationService.createInstance(WorkbenchHoverDelegate, placement, enableInstantHover, {}));
+        setBaseLayerHoverDelegate(accessor.get(IHoverService));
+    });
     await instantiationService.invokeFunction(async (accessor) => {
         const lifecycleService = accessor.get(ILifecycleService);
         await Promise.all(( serviceInitializeParticipants.map(participant => participant(accessor))));
@@ -45,8 +49,6 @@ async function startup(instantiationService) {
     serviceInitializedEmitter.fire();
     void instantiationService.invokeFunction(async (accessor) => {
         const lifecycleService = accessor.get(ILifecycleService);
-        setHoverDelegateFactory((placement, enableInstantHover) => instantiationService.createInstance(WorkbenchHoverDelegate, placement, enableInstantHover, {}));
-        setBaseLayerHoverDelegate(accessor.get(IHoverService));
         ( Registry.as(Extensions.Workbench)).start(accessor);
         ( Registry.as(EditorExtensions.EditorFactory)).start(accessor);
         layoutEmitter.fire(accessor);

package/missing-services.js

@@ -205,6 +205,7 @@ import { IWorkspaceIdentityService } from './vscode/src/vs/workbench/services/wo
 import { NullExtensionService } from './vscode/src/vs/workbench/services/extensions/common/extensions.js';
 import { toUserDataProfile } from './vscode/src/vs/platform/userDataProfile/common/userDataProfile.js';
 import { ILanguageModelStatsService } from './vscode/src/vs/workbench/contrib/chat/common/languageModelStats.service.js';
+import { IAccessibleViewInformationService } from './vscode/src/vs/workbench/services/accessibility/common/accessibleViewInformationService.service.js';
 import { getExtensionIdProvidingCurrentLocale, getBuiltInExtensionTranslationsUris } from './l10n.js';
 import { unsupported } from './tools.js';
 var _a;
@@ -573,8 +574,8 @@ registerSingleton(IPathService, class PathService {
 registerSingleton(IProductService, class ProductService {
     constructor() {
         this._serviceBrand = undefined;
-        this.version = "1.89.0";
-        this.commit = "9645520c4ae4961f1e927dca9b291f786f11013e";
+        this.version = "1.89.1";
+        this.commit = "dc96b837cf6bb4af9cd736aa3af08cf8279f7685";
         this.quality = 'oss';
         this.nameShort = 'Code - OSS Dev';
         this.nameLong = 'Code - OSS Dev';
@@ -2201,6 +2202,11 @@ registerSingleton(IAccessibleViewService, class AccessibleViewService {
         this.getLastPosition = unsupported;
     }
 }, 1 );
+registerSingleton(IAccessibleViewInformationService, class AccessibleViewInformationService {
+    constructor() {
+        this.hasShownAccessibleView = () => false;
+    }
+}, 1 );
 registerSingleton(IWorkbenchExtensionManagementService, class WorkbenchExtensionManagementService {
     constructor() {
         this.onDidEnableExtensions = Event.None;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "5.0.1",
+  "version": "5.1.1",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -99,12 +99,12 @@
   "dependencies": {
     "@vscode/iconv-lite-umd": "0.7.0",
     "jschardet": "3.0.0",
-    "@codingame/monaco-vscode-extensions-service-override": "5.0.1",
-    "@codingame/monaco-vscode-files-service-override": "5.0.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "5.0.1",
-    "@codingame/monaco-vscode-environment-service-override": "5.0.1",
-    "@codingame/monaco-vscode-layout-service-override": "5.0.1",
-    "@codingame/monaco-vscode-host-service-override": "5.0.1",
-    "@codingame/monaco-vscode-base-service-override": "5.0.1"
+    "@codingame/monaco-vscode-files-service-override": "5.1.1",
+    "@codingame/monaco-vscode-extensions-service-override": "5.1.1",
+    "@codingame/monaco-vscode-quickaccess-service-override": "5.1.1",
+    "@codingame/monaco-vscode-environment-service-override": "5.1.1",
+    "@codingame/monaco-vscode-layout-service-override": "5.1.1",
+    "@codingame/monaco-vscode-host-service-override": "5.1.1",
+    "@codingame/monaco-vscode-base-service-override": "5.1.1"
   }
 }

package/service-override/files.d.ts

@@ -55,6 +55,7 @@ declare class RegisteredFileSystemProvider extends Disposable implements IFileSy
     onDidChangeCapabilities: Event<any>;
     _onDidChangeFile: Emitter<readonly IFileChange[]>;
     onDidChangeFile: Event<readonly IFileChange[]>;
+    private formatUri;
     registerFile(file: RegisteredFile): IDisposable;
     stat(resource: URI): Promise<IStat>;
     readdir(resource: URI): Promise<[string, FileType][]>;

package/service-override/tools/editor.js

@@ -499,7 +499,7 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
                             this._onDidChangeActiveGroup.fire(this.activeGroup);
                         }
                     };
-                    const remoteActiveGroup = (editor) => {
+                    const removeActiveGroup = (editor) => {
                         if (!emptyDelegate && this.activeGroupOverride === this.additionalGroups.find(group => group.editor === editor)) {
                             updateActiveGroup(undefined);
                         }
@@ -514,11 +514,11 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
                             window.clearTimeout(timeout);
                         timeout = window.setTimeout(() => {
                             timeout = undefined;
-                            remoteActiveGroup(editor);
+                            removeActiveGroup(editor);
                         }, 100);
                     };
                     editor.onDidDispose(() => {
-                        remoteActiveGroup(editor);
+                        removeActiveGroup(editor);
                     });
                     editor.onDidFocusEditorText(onEditorFocused);
                     editor.onDidFocusEditorWidget(onEditorFocused);

package/service-override/tools/views.d.ts

@@ -7,7 +7,7 @@ import { Event } from '../../vscode/src/vs/base/common/event.js';
 import { DomScrollableElement } from '../../vscode/src/vs/base/browser/ui/scrollbar/scrollableElement.js';
 import { CancellationToken } from '../../vscode/src/vs/base/common/cancellation.js';
 import { URI } from '../../vscode/src/vs/base/common/uri.js';
-import { IEditorOptions } from '../../vscode/src/vs/platform/editor/common/editor.js';
+import { IEditorOptions, IResourceEditorInput } from '../../vscode/src/vs/platform/editor/common/editor.js';
 import { Parts, Position } from '../../vscode/src/vs/workbench/services/layout/browser/layoutService.js';
 import { Codicon } from '../../vscode/src/vs/base/common/codicons.js';
 import { RegisteredEditorInfo, RegisteredEditorOptions, EditorInputFactoryObject } from '../../vscode/src/vs/workbench/services/editor/common/editorResolverService.js';
@@ -61,6 +61,7 @@ declare abstract class SimpleEditorInput extends EditorInput {
     getDescription(verbosity?: Verbosity): string;
     isDirty(): boolean;
     setDirty(dirty: boolean): void;
+    toUntyped(): IResourceEditorInput | undefined;
 }
 declare function registerEditorPane<Services extends BrandedService[]>(typeId: string, name: string, ctor: new (group: IEditorGroup, ...services: Services) => EditorPane, inputCtors: (new (...args: any[]) => EditorInput)[]): IDisposable;
 declare function registerEditor(globPattern: string, editorInfo: RegisteredEditorInfo, editorOptions: RegisteredEditorOptions, factory: EditorInputFactoryObject): IDisposable;

package/service-override/tools/views.js

@@ -144,6 +144,14 @@ class SimpleEditorInput extends EditorInput {
         this.dirty = dirty;
         this._onDidChangeDirty.fire();
     }
+    toUntyped() {
+        if (this.resource == null) {
+            return undefined;
+        }
+        return {
+            resource: this.resource
+        };
+    }
 }
 function registerEditorPane(typeId, name, ctor, inputCtors) {
     return ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(ctor, typeId, name), ( inputCtors.map(ctor => new SyncDescriptor(ctor))));

package/services.js

@@ -183,9 +183,9 @@ async function initialize(overrides, container = document.body, configuration =
     initialize$1(container, configuration, env);
     const instantiationService = StandaloneServices.initialize({
         [( IProductService.toString())]: mixin({
-            version: "1.89.0",
+            version: "1.89.1",
             quality: 'stable',
-            commit: "9645520c4ae4961f1e927dca9b291f786f11013e",
+            commit: "dc96b837cf6bb4af9cd736aa3af08cf8279f7685",
             nameShort: 'Code - OSS',
             nameLong: 'Code - OSS',
             applicationName: 'code-oss',

package/vscode/src/vs/base/browser/dom.js

@@ -427,16 +427,16 @@ function size(element, width, height) {
     }
 }
 function position(element, top, right, bottom, left, position = 'absolute') {
-    if (typeof top === 'number') {
+    {
         element.style.top = `${top}px`;
     }
-    if (typeof right === 'number') {
+    {
         element.style.right = `${right}px`;
     }
-    if (typeof bottom === 'number') {
+    {
         element.style.bottom = `${bottom}px`;
     }
-    if (typeof left === 'number') {
+    {
         element.style.left = `${left}px`;
     }
     element.style.position = position;

package/vscode/src/vs/base/common/date.js

@@ -200,24 +200,16 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
 function getDurationString(ms, useFullTimeWords) {
     const seconds = Math.abs(ms / 1000);
     if (seconds < 1) {
-        return useFullTimeWords
-            ? ( localizeWithPath(_moduleId, 54, '{0} milliseconds', ms))
-            : ( localizeWithPath(_moduleId, 55, '{0}ms', ms));
+        return ( localizeWithPath(_moduleId, 55, '{0}ms', ms));
     }
     if (seconds < minute) {
-        return useFullTimeWords
-            ? ( localizeWithPath(_moduleId, 56, '{0} seconds', Math.round(ms) / 1000))
-            : ( localizeWithPath(_moduleId, 57, '{0}s', Math.round(ms) / 1000));
+        return ( localizeWithPath(_moduleId, 57, '{0}s', Math.round(ms) / 1000));
     }
     if (seconds < hour) {
-        return useFullTimeWords
-            ? ( localizeWithPath(_moduleId, 58, '{0} minutes', Math.round(ms / (1000 * minute))))
-            : ( localizeWithPath(_moduleId, 59, '{0} mins', Math.round(ms / (1000 * minute))));
+        return ( localizeWithPath(_moduleId, 59, '{0} mins', Math.round(ms / (1000 * minute))));
     }
     if (seconds < day) {
-        return useFullTimeWords
-            ? ( localizeWithPath(_moduleId, 60, '{0} hours', Math.round(ms / (1000 * hour))))
-            : ( localizeWithPath(_moduleId, 61, '{0} hrs', Math.round(ms / (1000 * hour))));
+        return ( localizeWithPath(_moduleId, 61, '{0} hrs', Math.round(ms / (1000 * hour))));
     }
     return ( localizeWithPath(_moduleId, 62, '{0} days', Math.round(ms / (1000 * day))));
 }

package/vscode/src/vs/base/common/decorators.js

@@ -52,16 +52,12 @@ function debounce(delay, reducer, initialValueProvider) {
         const resultKey = `$debounce$result$${key}`;
         return function (...args) {
             if (!this[resultKey]) {
-                this[resultKey] = initialValueProvider ? initialValueProvider() : undefined;
+                this[resultKey] = undefined;
             }
             clearTimeout(this[timerKey]);
-            if (reducer) {
-                this[resultKey] = reducer(this[resultKey], ...args);
-                args = [this[resultKey]];
-            }
             this[timerKey] = setTimeout(() => {
                 fn.apply(this, args);
-                this[resultKey] = initialValueProvider ? initialValueProvider() : undefined;
+                this[resultKey] = undefined;
             }, delay);
         };
     }));

package/vscode/src/vs/base/common/extpath.js

@@ -1,4 +1,4 @@
-import { join, posix, sep } from './path.js';
+import { posix, sep } from './path.js';
 import { isWindows } from './platform.js';
 import { equalsIgnoreCase, startsWithIgnoreCase } from './strings.js';
 import { isNumber } from './types.js';
@@ -233,15 +233,9 @@ function randomPath(parent, prefix, randomLength = 8) {
         suffix += pathCharsTouse.charAt(Math.floor(Math.random() * pathCharsTouse.length));
     }
     let randomFileName;
-    if (prefix) {
-        randomFileName = `${prefix}-${suffix}`;
-    }
-    else {
+    {
         randomFileName = suffix;
     }
-    if (parent) {
-        return join(parent, randomFileName);
-    }
     return randomFileName;
 }
 export { getDriveLetter, getRoot, hasDriveLetter, indexOfPath, isEqual, isEqualOrParent, isPathSeparator, isUNC, isValidBasename, isWindowsDriveLetter, parseLineAndColumnAware, randomPath, toPosixPath, toSlashes };

package/vscode/src/vs/base/common/jsonEdit.js

@@ -62,7 +62,7 @@ function setProperty(text, originalPath, value, formattingOptions, getInsertionI
                 return [];
             }
             const newProperty = `${JSON.stringify(lastSegment)}: ${JSON.stringify(value)}`;
-            const index = getInsertionIndex ? getInsertionIndex(( parent.children.map(p => p.children[0].value))) : parent.children.length;
+            const index = parent.children.length;
             let edit;
             if (index > 0) {
                 const previous = parent.children[index - 1];

package/vscode/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.js

@@ -43,7 +43,7 @@ class EditorScrollbar extends ViewPart {
         this._setLayout();
         const onBrowserDesperateReveal = (domNode, lookAtScrollTop, lookAtScrollLeft) => {
             const newScrollPosition = {};
-            if (lookAtScrollTop) {
+            {
                 const deltaTop = domNode.scrollTop;
                 if (deltaTop) {
                     newScrollPosition.scrollTop = this._context.viewLayout.getCurrentScrollTop() + deltaTop;

package/vscode/src/vs/editor/common/core/lineRange.js

@@ -1,7 +1,7 @@
 import { BugIndicatingError } from '../../../base/common/errors.js';
 import { OffsetRange } from './offsetRange.js';
 import { Range } from './range.js';
-import { findFirstIdxMonotonousOrArrLen, findLastIdxMonotonous, findLastMonotonous } from '../../../base/common/arraysFind.js';
+import { findFirstIdxMonotonousOrArrLen, findLastMonotonous, findLastIdxMonotonous } from '../../../base/common/arraysFind.js';
 class LineRange {
     static fromRange(range) {
         return ( new LineRange(range.startLineNumber, range.endLineNumber));

package/vscode/src/vs/editor/contrib/indentation/common/indentation.js

@@ -38,19 +38,7 @@ function getReindentEditOperations(model, languageConfigurationService, startLin
     let globalIndent;
     const currentLineText = model.getLineContent(startLineNumber);
     let adjustedLineContent = currentLineText;
-    if (inheritedIndent !== undefined && inheritedIndent !== null) {
-        globalIndent = inheritedIndent;
-        const oldIndentation = getLeadingWhitespace(currentLineText);
-        adjustedLineContent = globalIndent + currentLineText.substring(oldIndentation.length);
-        if (indentationRules.decreaseIndentPattern && indentationRules.decreaseIndentPattern.test(adjustedLineContent)) {
-            globalIndent = unshiftIndent(globalIndent);
-            adjustedLineContent = globalIndent + currentLineText.substring(oldIndentation.length);
-        }
-        if (currentLineText !== adjustedLineContent) {
-            indentEdits.push(EditOperation.replaceMove(( new Selection(startLineNumber, 1, startLineNumber, oldIndentation.length + 1)), normalizeIndentation(globalIndent, indentSize, insertSpaces)));
-        }
-    }
-    else {
+    {
         globalIndent = getLeadingWhitespace(currentLineText);
     }
     let idealIndentForNextLine = globalIndent;

package/vscode/src/vs/platform/quickinput/browser/quickPickPin.js

@@ -7,12 +7,12 @@ const pinnedButtonClass = ThemeIcon.asClassName(Codicon.pinned);
 const buttonClasses = [pinButtonClass, pinnedButtonClass];
 async function showWithPinnedItems(storageService, storageKey, quickPick, filterDuplicates) {
     const itemsWithoutPinned = quickPick.items;
-    let itemsWithPinned = _formatPinnedItems(storageKey, quickPick, storageService, undefined, filterDuplicates);
+    let itemsWithPinned = _formatPinnedItems(storageKey, quickPick, storageService, undefined);
     quickPick.onDidTriggerItemButton(async (buttonEvent) => {
         const expectedButton = buttonEvent.button.iconClass && buttonClasses.includes(buttonEvent.button.iconClass);
         if (expectedButton) {
             quickPick.items = itemsWithoutPinned;
-            itemsWithPinned = _formatPinnedItems(storageKey, quickPick, storageService, buttonEvent.item, filterDuplicates);
+            itemsWithPinned = _formatPinnedItems(storageKey, quickPick, storageService, buttonEvent.item);
             quickPick.items = quickPick.value ? itemsWithoutPinned : itemsWithPinned;
         }
     });
@@ -45,7 +45,7 @@ function _formatPinnedItems(storageKey, quickPick, storageService, changedItem,
         if (itemToPin) {
             const pinnedItemId = getItemIdentifier(itemToPin);
             const pinnedItem = Object.assign({}, itemToPin);
-            if (!filterDuplicates || !( (pinnedIds.has(pinnedItemId)))) {
+            if (!( (pinnedIds.has(pinnedItemId)))) {
                 pinnedIds.add(pinnedItemId);
                 updateButtons(pinnedItem, false);
                 formattedItems.push(pinnedItem);

package/vscode/src/vs/platform/workspace/common/workspace.js

@@ -15,7 +15,6 @@ function isEmptyWorkspaceIdentifier(obj) {
         && !isSingleFolderWorkspaceIdentifier(obj)
         && !isWorkspaceIdentifier(obj);
 }
-const EXTENSION_DEVELOPMENT_EMPTY_WINDOW_WORKSPACE = { id: 'ext-dev' };
 const UNKNOWN_EMPTY_WINDOW_WORKSPACE = { id: 'empty-window' };
 function toWorkspaceIdentifier(arg0, isExtensionDevelopment) {
     if (typeof arg0 === 'string' || typeof arg0 === 'undefined') {
@@ -24,9 +23,6 @@ function toWorkspaceIdentifier(arg0, isExtensionDevelopment) {
                 id: basename(arg0)
             };
         }
-        if (isExtensionDevelopment) {
-            return EXTENSION_DEVELOPMENT_EMPTY_WINDOW_WORKSPACE;
-        }
         return UNKNOWN_EMPTY_WINDOW_WORKSPACE;
     }
     const workspace = arg0;
@@ -165,4 +161,4 @@ function hasWorkspaceFileExtension(path) {
     const ext = (typeof path === 'string') ? extname(path) : extname$1(path);
     return ext === WORKSPACE_SUFFIX;
 }
-export { EXTENSION_DEVELOPMENT_EMPTY_WINDOW_WORKSPACE, STANDALONE_EDITOR_WORKSPACE_ID, UNKNOWN_EMPTY_WINDOW_WORKSPACE, UNTITLED_WORKSPACE_NAME, WORKSPACE_EXTENSION, WORKSPACE_FILTER, WORKSPACE_SUFFIX, Workspace$1 as Workspace, WorkspaceFolder, hasWorkspaceFileExtension, isEmptyWorkspaceIdentifier, isSavedWorkspace, isSingleFolderWorkspaceIdentifier, isStandaloneEditorWorkspace, isTemporaryWorkspace, isUntitledWorkspace, isWorkspace, isWorkspaceFolder, isWorkspaceIdentifier, toWorkspaceFolder, toWorkspaceIdentifier };
+export { STANDALONE_EDITOR_WORKSPACE_ID, UNKNOWN_EMPTY_WINDOW_WORKSPACE, UNTITLED_WORKSPACE_NAME, WORKSPACE_EXTENSION, WORKSPACE_FILTER, WORKSPACE_SUFFIX, Workspace$1 as Workspace, WorkspaceFolder, hasWorkspaceFileExtension, isEmptyWorkspaceIdentifier, isSavedWorkspace, isSingleFolderWorkspaceIdentifier, isStandaloneEditorWorkspace, isTemporaryWorkspace, isUntitledWorkspace, isWorkspace, isWorkspaceFolder, isWorkspaceIdentifier, toWorkspaceFolder, toWorkspaceIdentifier };

package/vscode/src/vs/workbench/browser/parts/views/treeView.js

@@ -281,6 +281,9 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
     }
     set dataProvider(dataProvider) {
         if (dataProvider) {
+            if (this.visible) {
+                this.activate();
+            }
             const self = this;
             this._dataProvider = new (class {
                 constructor() {

package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js

@@ -647,9 +647,6 @@ CommentNode = ( (__decorate([
 function fillInActions(groups, target, useAlternativeActions, isPrimaryGroup = group => group === 'navigation') {
     for (const tuple of groups) {
         let [group, actions] = tuple;
-        if (useAlternativeActions) {
-            actions = ( (actions.map(a => (a instanceof MenuItemAction) && !!a.alt ? a.alt : a)));
-        }
         if (isPrimaryGroup(group)) {
             const to = Array.isArray(target) ? target : target.primary;
             to.unshift(...actions);

package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js

@@ -19,7 +19,7 @@ import { IQuickInputService } from '../../../../platform/quickinput/common/quick
 import { CommentGlyphWidget } from './commentGlyphWidget.js';
 import { ICommentService } from './commentService.service.js';
 import { CommentWidgetFocus, ReviewZoneWidget, parseMouseDownInfoFromEvent, isMouseUpEventDragFromMouseDown } from './commentThreadZoneWidget.js';
-import { SIDE_GROUP, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
+import { ACTIVE_GROUP, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { IViewsService } from '../../../services/views/common/viewsService.service.js';

package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js

@@ -599,7 +599,7 @@ const getUriForDebugMemory = (sessionId, memoryReference, range, displayName = '
             scheme: DEBUG_MEMORY_SCHEME,
             authority: sessionId,
             path: '/' + encodeURIComponent(memoryReference) + `/${encodeURIComponent(displayName)}.bin`,
-            query: range ? `?range=${range.fromOffset}:${range.toOffset}` : undefined,
+            query: undefined,
         }))
     );
 };

package/vscode/src/vs/workbench/contrib/debug/common/debugUtils.js

@@ -9,9 +9,6 @@ import { coalesce } from '../../../../base/common/arrays.js';
 const _formatPIIRegexp = /{([^}]+)}/g;
 function formatPII(value, excludePII, args) {
     return value.replace(_formatPIIRegexp, function (match, group) {
-        if (excludePII && group.length > 0 && group[0] !== '_') {
-            return match;
-        }
         return args && args.hasOwnProperty(group) ?
             args[group] :
             match;

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.js

@@ -341,17 +341,8 @@ async function joinNotebookCells(editor, range, direction, constraint) {
     if (range.end === textModel.length && direction === 'below') {
         return null;
     }
-    for (let i = 0; i < cells.length; i++) {
-        const cell = cells[i];
-        if (constraint && cell.cellKind !== constraint) {
-            return null;
-        }
-    }
     if (direction === 'above') {
         const above = editor.cellAt(range.start - 1);
-        if (constraint && above.cellKind !== constraint) {
-            return null;
-        }
         const insertContent = ( (cells.map(cell => (cell.textBuffer.getEOL() ?? '') + cell.getText()))).join('');
         const aboveCellLineCount = above.textBuffer.getLineCount();
         const aboveCellLastLineEndColumn = above.textBuffer.getLineLength(aboveCellLineCount);
@@ -377,9 +368,6 @@ async function joinNotebookCells(editor, range, direction, constraint) {
     }
     else {
         const below = editor.cellAt(range.end);
-        if (constraint && below.cellKind !== constraint) {
-            return null;
-        }
         const cell = cells[0];
         const restCells = [...cells.slice(1), below];
         const insertContent = ( (restCells.map(cl => (cl.textBuffer.getEOL() ?? '') + cl.getText()))).join('');
@@ -560,7 +548,7 @@ function insertCell(languageService, editor, index, type, direction = 'above', i
     const insertIndex = cell ?
         (direction === 'above' ? index : nextIndex) :
         index;
-    return insertCellAtIndex(viewModel, insertIndex, initialText, language, type, undefined, [], true, true);
+    return insertCellAtIndex(viewModel, insertIndex, initialText, language, type, undefined, [], true);
 }
 function insertCellAtIndex(viewModel, index, source, language, type, metadata, outputs, synchronous, pushUndoStop) {
     const endSelections = { kind: SelectionStateType.Index, focus: { start: index, end: index + 1 }, selections: [{ start: index, end: index + 1 }] };
@@ -580,7 +568,7 @@ function insertCellAtIndex(viewModel, index, source, language, type, metadata, o
                 }
             ]
         }
-    ], synchronous, { kind: SelectionStateType.Index, focus: viewModel.getFocus(), selections: viewModel.getSelections() }, () => endSelections, undefined, pushUndoStop && !viewModel.options.isReadOnly);
+    ], synchronous, { kind: SelectionStateType.Index, focus: viewModel.getFocus(), selections: viewModel.getSelections() }, () => endSelections, undefined, !viewModel.options.isReadOnly);
     return viewModel.cellAt(index);
 }
 export { changeCellToKind, computeCellLinesContents, copyCellRange, insertCell, insertCellAtIndex, joinCellsWithSurrounds, joinNotebookCells, joinSelectedCells, moveCellRange, runDeleteAction };

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.js

@@ -227,7 +227,7 @@ function createDeleteToolbar(accessor, container, hoverDelegate, elementClass) {
         renderDropdownAsChildElement: true,
         hoverDelegate
     }));
-    if (elementClass) {
+    {
         toolbar.getElement().classList.add(elementClass);
     }
     return toolbar;

package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.js

@@ -586,23 +586,8 @@ async function webviewPreloads(ctx) {
             update: updateHighlights
         };
     }
-    function selectRange(_range) {
-        const sel = window.getSelection();
-        if (sel) {
-            try {
-                sel.removeAllRanges();
-                const r = document.createRange();
-                r.setStart(_range.startContainer, _range.startOffset);
-                r.setEnd(_range.endContainer, _range.endOffset);
-                sel.addRange(r);
-            }
-            catch (e) {
-                console.log(e);
-            }
-        }
-    }
     function highlightRange(range, useCustom, tagName = 'mark', attributes = {}) {
-        if (useCustom) {
+        {
             const ret = _internalHighlightRange(range, tagName, attributes);
             return {
                 range: range,
@@ -621,46 +606,6 @@ async function webviewPreloads(ctx) {
                 }
             };
         }
-        else {
-            window.document.execCommand('hiliteColor', false, matchColor);
-            const cloneRange = window.getSelection().getRangeAt(0).cloneRange();
-            const _range = {
-                collapsed: cloneRange.collapsed,
-                commonAncestorContainer: cloneRange.commonAncestorContainer,
-                endContainer: cloneRange.endContainer,
-                endOffset: cloneRange.endOffset,
-                startContainer: cloneRange.startContainer,
-                startOffset: cloneRange.startOffset
-            };
-            return {
-                range: _range,
-                dispose: () => {
-                    selectRange(_range);
-                    try {
-                        document.designMode = 'On';
-                        window.document.execCommand('removeFormat', false, undefined);
-                        document.designMode = 'Off';
-                        window.getSelection()?.removeAllRanges();
-                    }
-                    catch (e) {
-                        console.log(e);
-                    }
-                },
-                update: (color, className) => {
-                    selectRange(_range);
-                    try {
-                        document.designMode = 'On';
-                        window.document.execCommand('removeFormat', false, undefined);
-                        window.document.execCommand('hiliteColor', false, color);
-                        document.designMode = 'Off';
-                        window.getSelection()?.removeAllRanges();
-                    }
-                    catch (e) {
-                        console.log(e);
-                    }
-                }
-            };
-        }
     }
     function createEmitter(listenerChange = () => undefined) {
         const listeners = ( new Set());

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js

@@ -554,12 +554,12 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         const runningActions = notebookKernelService.getRunningSourceActions(notebook);
         const updateActionFromSourceAction = (sourceAction, running) => {
             const sAction = sourceAction.action;
-            action.class = running ? ThemeIcon.asClassName(ThemeIcon.modify(executingStateIcon, 'spin')) : ThemeIcon.asClassName(selectKernelIcon);
+            action.class = ThemeIcon.asClassName(ThemeIcon.modify(executingStateIcon, 'spin')) ;
             action.label = sAction.label;
             action.enabled = true;
         };
         if (runningActions.length) {
-            return updateActionFromSourceAction(runningActions[0] , true);
+            return updateActionFromSourceAction(runningActions[0] );
         }
         const { selected } = notebookKernelHistoryService.getKernels(notebook);
         if (selected) {

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalIcon.js

@@ -56,15 +56,11 @@ function getColorStyleContent(colorTheme, editor) {
         const colorClass = getColorClass(colorKey);
         const color = colorTheme.getColor(colorKey);
         if (color) {
-            if (editor) {
+            {
                 css += (`.monaco-workbench .show-file-icons .predefined-file-icon.terminal-tab.${colorClass}::before,` +
                     `.monaco-workbench .show-file-icons .file-icon.terminal-tab.${colorClass}::before` +
                     `{ color: ${color} !important; }`);
             }
-            else {
-                css += (`.monaco-workbench .${colorClass} .codicon:first-child:not(.codicon-split-horizontal):not(.codicon-trashcan):not(.file-icon)` +
-                    `{ color: ${color} !important; }`);
-            }
         }
     }
     return css;

package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.service.d.ts

@@ -4,7 +4,7 @@ import { IExtensionManagementService } from '../../../../platform/extensionManag
 import { InstallExtensionOnServerEvent, UninstallExtensionOnServerEvent, DidUninstallExtensionOnServerEvent, DidChangeProfileForServerEvent, IResourceExtension, EnablementState, ScanOptions, IScannedExtension, DidChangeProfileEvent } from './extensionManagement.js';
 import { IExtension, IExtensionManifest, ExtensionType } from '../../../../platform/extensions/common/extensions.js';
 import { URI } from '../../../../base/common/uri.js';
-import { InstallExtensionResult, ILocalExtension, InstallOptions, IGalleryExtension, Metadata } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { InstallExtensionResult, ILocalExtension, IGalleryExtension, InstallOptions, Metadata } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 
 declare const IProfileAwareExtensionManagementService: ServiceIdentifier<IProfileAwareExtensionManagementService>;
 interface IProfileAwareExtensionManagementService extends IExtensionManagementService {
@@ -21,6 +21,7 @@ interface IWorkbenchExtensionManagementService extends IProfileAwareExtensionMan
     onDidEnableExtensions: Event<IExtension[]>;
     getExtensions(locations: URI[]): Promise<IResourceExtension[]>;
     getInstalledWorkspaceExtensions(includeInvalid: boolean): Promise<ILocalExtension[]>;
+    canInstall(extension: IGalleryExtension | IResourceExtension): Promise<boolean>;
     installVSIX(location: URI, manifest: IExtensionManifest, installOptions?: InstallOptions): Promise<ILocalExtension>;
     installFromLocation(location: URI): Promise<ILocalExtension>;
     installResourceExtension(extension: IResourceExtension, installOptions: InstallOptions): Promise<ILocalExtension>;