@codingame/monaco-vscode-notebook-service-override 23.2.2 → 24.1.0

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.js

@@ -10,7 +10,7 @@ let NotebookLoggingService = class NotebookLoggingService extends Disposable {
     static { this.ID = 'notebook'; }
     constructor(loggerService) {
         super();
-        this._logger = this._register(loggerService.createLogger(logChannelId, { name: ( localize(9526, "Notebook")), group: windowLogGroup }));
+        this._logger = this._register(loggerService.createLogger(logChannelId, { name: ( localize(9661, "Notebook")), group: windowLogGroup }));
     }
     trace(category, output) {
         this._logger.trace(`[${category}] ${output}`);

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.d.ts

@@ -7,13 +7,13 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { NotebookTextModel } from "../../common/model/notebookTextModel.js";
 import { INotebookContributionData, INotebookRendererInfo, IOrderedMimeType, IOutputDto, NotebookExtensionDescription, INotebookStaticPreloadInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
 import { NotebookOutputRendererInfo } from "../../common/notebookOutputRenderer.js";
 import { NotebookProviderInfo } from "../../common/notebookProvider.js";
-import { INotebookSerializer, SimpleNotebookProviderInfo } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/common/notebookService";
+import { INotebookSerializer, SimpleNotebookProviderInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { IEditorType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService";
 import { IEditorResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService.service";
@@ -21,7 +21,7 @@ import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { INotebookDocumentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/notebook/common/notebookDocumentService.service";
 import { VSBufferReadableStream } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
-import { SnapshotContext } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
+import { SnapshotContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 export declare class NotebookProviderInfoStore extends Disposable {
     private readonly _editorResolverService;

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.js

@@ -18,26 +18,26 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { Memento } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/common/memento';
+import { Memento } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/memento';
 import { notebooksExtensionPoint, notebookRendererExtensionPoint, notebookPreloadExtensionPoint } from '../notebookExtensionPoint.js';
-import { NotebookDiffEditorInput } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
+import { NotebookDiffEditorInput } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
 import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
 import { NotebookEditorPriority, NotebookSetting, CellUri, NotebookRendererMatch, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, MimeTypeDisplayOrder, ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, NOTEBOOK_DISPLAY_ORDER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookEditorInput } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
 import { NotebookOutputRendererInfo, NotebookStaticPreloadInfo } from '../../common/notebookOutputRenderer.js';
 import { NotebookProviderInfo } from '../../common/notebookProvider.js';
-import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/common/notebookService';
+import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import { RegisteredEditorPriority } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService.service';
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { InstallRecommendedExtensionAction } from '@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
+import { InstallRecommendedExtensionAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { INotebookDocumentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/notebook/common/notebookDocumentService.service';
-import { MergeEditorInput } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
+import { MergeEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { streamToBuffer, VSBuffer, bufferToStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
-import { NotebookMultiDiffEditorInput } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput';
+import { NotebookMultiDiffEditorInput } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput';
 import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 
 var NotebookProviderInfoStore_1, NotebookService_1;
@@ -590,7 +590,7 @@ let NotebookService = class NotebookService extends Disposable {
             const knownProvider = this.getViewTypeProvider(viewType);
             const actions = knownProvider ? [
                 toAction({
-                    id: 'workbench.notebook.action.installMissingViewType', label: ( localize(9527, "Install extension for '{0}'", viewType)), run: async () => {
+                    id: 'workbench.notebook.action.installMissingViewType', label: ( localize(9662, "Install extension for '{0}'", viewType)), run: async () => {
                         await this._instantiationService.createInstance(InstallRecommendedExtensionAction, knownProvider).run();
                     }
                 })

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.d.ts

@@ -1,5 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IWebWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/webWorker/browser/webWorkerService.service";
 import { INotebookDiffResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { INotebookEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/services/notebookWorkerService.service";
@@ -7,7 +8,7 @@ import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/com
 export declare class NotebookEditorWorkerServiceImpl extends Disposable implements INotebookEditorWorkerService {
     readonly _serviceBrand: undefined;
     private readonly _workerManager;
-    constructor(notebookService: INotebookService, modelService: IModelService);
+    constructor(notebookService: INotebookService, modelService: IModelService, webWorkerService: IWebWorkerService);
     canComputeDiff(original: URI, modified: URI): boolean;
     computeDiff(original: URI, modified: URI): Promise<INotebookDiffResult>;
     canPromptRecommendation(model: URI): Promise<boolean>;

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.js

@@ -1,7 +1,8 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable, DisposableStore, toDisposable, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { createWebWorker } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/webWorkerFactory';
+import { WebWorkerDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/webWorker/browser/webWorkerDescriptor';
+import { IWebWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/webWorker/browser/webWorkerService.service';
 import { CellUri, NotebookCellsChangeType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
@@ -10,9 +11,9 @@ import { Schemas, FileAccess } from '@codingame/monaco-vscode-api/vscode/vs/base
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 
 let NotebookEditorWorkerServiceImpl = class NotebookEditorWorkerServiceImpl extends Disposable {
-    constructor(notebookService, modelService) {
+    constructor(notebookService, modelService, webWorkerService) {
         super();
-        this._workerManager = this._register(( new WorkerManager(notebookService, modelService)));
+        this._workerManager = this._register(( new WorkerManager(notebookService, modelService, webWorkerService)));
     }
     canComputeDiff(original, modified) {
         throw ( new Error('Method not implemented.'));
@@ -30,18 +31,20 @@ let NotebookEditorWorkerServiceImpl = class NotebookEditorWorkerServiceImpl exte
 };
 NotebookEditorWorkerServiceImpl = ( __decorate([
     ( __param(0, INotebookService)),
-    ( __param(1, IModelService))
+    ( __param(1, IModelService)),
+    ( __param(2, IWebWorkerService))
 ], NotebookEditorWorkerServiceImpl));
 class WorkerManager extends Disposable {
-    constructor(_notebookService, _modelService) {
+    constructor(_notebookService, _modelService, _webWorkerService) {
         super();
         this._notebookService = _notebookService;
         this._modelService = _modelService;
+        this._webWorkerService = _webWorkerService;
         this._editorWorkerClient = null;
     }
     withWorker() {
         if (!this._editorWorkerClient) {
-            this._editorWorkerClient = ( new NotebookWorkerClient(this._notebookService, this._modelService));
+            this._editorWorkerClient = ( new NotebookWorkerClient(this._notebookService, this._modelService, this._webWorkerService));
             this._register(this._editorWorkerClient);
         }
         return Promise.resolve(this._editorWorkerClient);
@@ -186,10 +189,11 @@ class NotebookEditorModelManager extends Disposable {
     }
 }
 class NotebookWorkerClient extends Disposable {
-    constructor(_notebookService, _modelService) {
+    constructor(_notebookService, _modelService, _webWorkerService) {
         super();
         this._notebookService = _notebookService;
         this._modelService = _modelService;
+        this._webWorkerService = _webWorkerService;
         this._worker = null;
         this._modelManager = null;
     }
@@ -215,7 +219,10 @@ class NotebookWorkerClient extends Disposable {
     _getOrCreateWorker() {
         if (!this._worker) {
             try {
-                this._worker = this._register(createWebWorker(( FileAccess.asBrowserUri('vs/workbench/contrib/notebook/common/services/notebookWebWorkerMain.js')), 'NotebookEditorWorker'));
+                this._worker = this._register(this._webWorkerService.createWorkerClient(( new WebWorkerDescriptor({
+                    esmModuleLocation: ( FileAccess.asBrowserUri('vs/workbench/contrib/notebook/common/services/notebookWebWorkerMain.js')),
+                    label: 'NotebookEditorWorker'
+                }))));
             }
             catch (err) {
                 throw (err);

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry.d.ts

@@ -1,7 +1,7 @@
 import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
 import { MarkerSeverity } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers";
 import { IMarkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service";
-import { ICellViewModel } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { ICellViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 import { SymbolKind } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 export interface IOutlineMarkerInfo {

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry.js

@@ -2,7 +2,7 @@
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
-import { executingStateIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { executingStateIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { SymbolKinds } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSource.d.ts

@@ -2,8 +2,8 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IMarkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service";
-import { INotebookEditor } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
-import { OutlineChangeEvent } from "@codingame/monaco-vscode-1f37b5fb-f500-54d2-b98a-d12d100cafca-common/vscode/vs/workbench/services/outline/browser/outline";
+import { INotebookEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { OutlineChangeEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/outline/browser/outline";
 import { OutlineEntry } from "./OutlineEntry.js";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { NotebookOutlineEntryFactory } from "./notebookOutlineEntryFactory.js";

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSource.js

@@ -6,7 +6,7 @@ import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/reso
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { OutlineConfigKeys } from '@codingame/monaco-vscode-1f37b5fb-f500-54d2-b98a-d12d100cafca-common/vscode/vs/workbench/services/outline/browser/outline';
+import { OutlineConfigKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/outline/browser/outline';
 import { INotebookOutlineEntryFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.service';
 
 let NotebookCellOutlineDataSource = class NotebookCellOutlineDataSource {

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.d.ts

@@ -1,6 +1,6 @@
 import { type IReference } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import type { INotebookEditor } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import type { INotebookEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { NotebookCellOutlineDataSource } from "./notebookOutlineDataSource.js";
 import { INotebookCellOutlineDataSourceFactory } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.service";
 export declare class NotebookCellOutlineDataSourceFactory implements INotebookCellOutlineDataSourceFactory {

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.d.ts

@@ -1,6 +1,6 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { IOutlineModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel.service";
-import { ICellViewModel } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { ICellViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { OutlineEntry } from "./OutlineEntry.js";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { IOutlineModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { getMarkdownHeadersInCell } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/foldingModel';
+import { getMarkdownHeadersInCell } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/foldingModel';
 import { OutlineEntry } from './OutlineEntry.js';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
@@ -82,7 +82,7 @@ let NotebookOutlineEntryFactory = class NotebookOutlineEntryFactory {
             }
             if (entries.length === 0) {
                 if (preview.length === 0) {
-                    preview = ( localize(9559, "empty cell"));
+                    preview = ( localize(9694, "empty cell"));
                 }
                 entries.push(( new OutlineEntry(
                     index++,

package/vscode/src/vs/workbench/contrib/notebook/common/model/cellEdit.d.ts

@@ -1,6 +1,6 @@
 import { IResourceUndoRedoElement, UndoRedoElementType } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { ISelectionState, NotebookCellMetadata } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 /**
  * It should not modify Undo/Redo stack

package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.d.ts

@@ -11,7 +11,7 @@ import { ILanguageDetectionService } from "@codingame/monaco-vscode-api/vscode/v
 import { ICellDto2, ICellEditOperation, INotebookSnapshotOptions, INotebookTextModel, ISelectionState, NotebookCellDefaultCollapseConfig, NotebookData, NotebookDocumentMetadata, NotebookTextModelChangedEvent, NotebookTextModelWillAddRemoveEvent, TransientOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
 import { INotebookLoggingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 export declare class NotebookTextModel extends Disposable implements INotebookTextModel {
     readonly viewType: string;
     readonly uri: URI;

package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.js

@@ -7,7 +7,7 @@ import { Disposable, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { filter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { hasKey, isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
@@ -17,13 +17,13 @@ import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/com
 import { UndoRedoElementType } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo';
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { ILanguageDetectionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service';
-import { SnapshotContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { SnapshotContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
 import { CellUri, NotebookCellsChangeType, NotebookCellExecutionState, CellEditType, diff } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookLoggingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service';
 import { SpliceCellsEdit, CellMetadataEdit, MoveCellEdit } from './cellEdit.js';
-import { NotebookCellOutputTextModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel';
-import { NotebookCellTextModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
+import { NotebookCellOutputTextModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel';
+import { NotebookCellTextModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 
 var NotebookTextModel_1;
 class StackOperation {
@@ -356,12 +356,12 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         return this.cells.findIndex(c => c.handle === handle);
     }
     _getCellIndexWithOutputIdHandleFromEdits(outputId, rawEdits) {
-        const edit = rawEdits.find(e => 'outputs' in e && ( e.outputs.some(o => o.outputId === outputId)));
+        const edit = rawEdits.find(e => hasKey(e, { outputs: true }) && ( e.outputs.some(o => o.outputId === outputId)));
         if (edit) {
-            if ('index' in edit) {
+            if (hasKey(edit, { index: true })) {
                 return edit.index;
             }
-            else if ('handle' in edit) {
+            else if (hasKey(edit, { handle: true })) {
                 const cellIndex = this._getCellIndexByHandle(edit.handle);
                 this._assertIndex(cellIndex);
                 return cellIndex;
@@ -501,10 +501,10 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             if (edit.editType !== CellEditType.Metadata && edit.editType !== CellEditType.PartialMetadata) {
                 return false;
             }
-            if (('index' in edit) && !( this.newCellsFromLastEdit.has(this.cells[edit.index].handle))) {
+            if (hasKey(edit, { index: true }) && !( this.newCellsFromLastEdit.has(this.cells[edit.index].handle))) {
                 return false;
             }
-            if ('handle' in edit && !( this.newCellsFromLastEdit.has(edit.handle))) {
+            if (hasKey(edit, { handle: true }) && !( this.newCellsFromLastEdit.has(edit.handle))) {
                 return false;
             }
         }
@@ -548,14 +548,14 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
     _doApplyEdits(rawEdits, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup) {
         const editsWithDetails = ( rawEdits.map((edit, index) => {
             let cellIndex = -1;
-            if ('index' in edit) {
+            if (hasKey(edit, { index: true })) {
                 cellIndex = edit.index;
             }
-            else if ('handle' in edit) {
+            else if (hasKey(edit, { handle: true })) {
                 cellIndex = this._getCellIndexByHandle(edit.handle);
                 this._assertIndex(cellIndex);
             }
-            else if ('outputId' in edit) {
+            else if (hasKey(edit, { outputId: true })) {
                 cellIndex = this._getCellIndexWithOutputIdHandle(edit.outputId);
                 if (this._indexIsInvalid(cellIndex)) {
                     cellIndex = this._getCellIndexWithOutputIdHandleFromEdits(edit.outputId, rawEdits.slice(0, index));

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.js

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { NotebookWorkingCopyTypeIdentifier, NotebookSetting, CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 import { ReferenceCollection, DisposableStore, dispose, combinedDisposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { Emitter, AsyncEmitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';

package/vscode/src/vs/workbench/contrib/notebook/common/services/notebookWebWorker.js

@@ -12,7 +12,7 @@ import { filter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objec
 import { matchCellBasedOnSimilarties } from './notebookCellMatching.js';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { DiffChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/diff/diffChange';
-import { computeDiff } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/common/notebookDiff';
+import { computeDiff } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/common/notebookDiff';
 
 const PREFIX_FOR_UNMATCHED_ORIGINAL_CELLS = `unmatchedOriginalCell`;
 class MirrorCell {

package/vscode/src/vs/workbench/contrib/replNotebook/browser/repl.contribution.js

@@ -21,7 +21,7 @@ import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight, KeybindingsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
-import { EditorPaneDescriptor } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/editor';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/editor';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { RegisteredEditorPriority } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
@@ -30,22 +30,22 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { IWorkingCopyEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service';
-import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { getReplView } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/repl';
+import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { getReplView } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/browser/repl';
 import { REPL_VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
-import { InlineChatController } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { IInteractiveHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/interactive/browser/interactiveHistoryService.service';
-import { NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { executeIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { executeIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { ReplEditorAccessibleView } from '../../notebook/browser/replEditorAccessibleView.js';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { REPL_EDITOR_ID, NotebookSetting, NotebookWorkingCopyTypeIdentifier, CellKind, CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { MOST_RECENT_REPL_EDITOR, IS_COMPOSITE_NOTEBOOK, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_FOCUSED } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { MOST_RECENT_REPL_EDITOR, IS_COMPOSITE_NOTEBOOK, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_FOCUSED } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
-import { ReplEditor, isReplEditorControl } from '@codingame/monaco-vscode-fc28fb90-97de-5e74-89a9-4cfe44128227-common/vscode/vs/workbench/contrib/replNotebook/browser/replEditor';
+import { ReplEditor, isReplEditorControl } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/replNotebook/browser/replEditor';
 import { ReplEditorInputAccessibilityHelp, ReplEditorHistoryAccessibilityHelp } from './replEditorAccessibilityHelp.js';
-import { ReplEditorInput } from '@codingame/monaco-vscode-fc28fb90-97de-5e74-89a9-4cfe44128227-common/vscode/vs/workbench/contrib/replNotebook/browser/replEditorInput';
+import { ReplEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/replNotebook/browser/replEditorInput';
 
 class ReplEditorSerializer {
     canSerialize(input) {
@@ -186,7 +186,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'repl.focusLastItemExecuted',
-            title: ( localize2(10251, 'Focus Most Recent REPL Execution')),
+            title: ( localize2(10386, 'Focus Most Recent REPL Execution')),
             category: 'REPL',
             menu: {
                 id: MenuId.CommandPalette,
@@ -237,7 +237,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'repl.input.focus',
-            title: ( localize2(10252, 'Focus Input Editor')),
+            title: ( localize2(10387, 'Focus Input Editor')),
             category: 'REPL',
             menu: {
                 id: MenuId.CommandPalette,
@@ -278,7 +278,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'repl.execute',
-            title: ( localize2(10253, 'Execute REPL input')),
+            title: ( localize2(10388, 'Execute REPL input')),
             category: 'REPL',
             keybinding: [{
                     when: ( ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, ( ContextKeyExpr.equals('activeEditor', 'workbench.editor.repl')), ( NOTEBOOK_CELL_LIST_FOCUSED.negate()))),

package/vscode/src/vs/workbench/contrib/replNotebook/browser/replEditorAccessibilityHelp.js

@@ -4,7 +4,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView';
 import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
-import { IS_COMPOSITE_NOTEBOOK, NOTEBOOK_CELL_LIST_FOCUSED } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { IS_COMPOSITE_NOTEBOOK, NOTEBOOK_CELL_LIST_FOCUSED } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
 class ReplEditorInputAccessibilityHelp {
     constructor() {
@@ -20,34 +20,34 @@ class ReplEditorInputAccessibilityHelp {
 function getAccessibilityInputHelpText() {
     return [
         ( localize(
-        10255,
+        10390,
         'You are in a REPL Editor Input box which will accept code to be executed in the REPL.'
     )),
         ( localize(
-        10256,
+        10391,
         'The Execute command{0} will evaluate the expression in the input box.',
         '<keybinding:repl.execute>'
     )),
         ( localize(
-        10257,
+        10392,
         'The setting `accessibility.replEditor.readLastExecutionOutput` controls if output will be automatically read when execution completes.'
     )),
         ( localize(
-        10258,
+        10393,
         'The setting `accessibility.replEditor.autoFocusReplExecution` controls if focus will automatically move to the REPL after executing code.'
     )),
         ( localize(
-        10259,
+        10394,
         'The Focus Last executed command{0} will move focus to the last executed item in the REPL history.',
         '<keybinding:repl.focusLastItemExecuted>'
     )),
         ( localize(
-        10260,
+        10395,
         'When you run the Open Accessbility View command{0} from this input box, the output from the last execution will be shown in the accessibility view.',
         '<keybinding:editor.action.accessibleView>'
     )),
         ( localize(
-        10261,
+        10396,
         'The Focus Input Editor command{0} will bring the focus back to this editor.',
         '<keybinding:repl.input.focus>'
     )),
@@ -67,36 +67,36 @@ class ReplEditorHistoryAccessibilityHelp {
 function getAccessibilityHistoryHelpText() {
     return [
         ( localize(
-        10262,
+        10397,
         'You are in a REPL History which is a list of cells that have been executed in the REPL. Each cell has an input, an output, and the cell container.'
     )),
         ( localize(
-        10263,
+        10398,
         'The Edit Cell command{0} will move focus to the read-only editor for the input of the cell.',
         '<keybinding:notebook.cell.edit>'
     )),
         ( localize(
-        10264,
+        10399,
         'The Quit Edit command{0} will move focus to the cell container, where the up and down arrows will also move focus between cells in the history.',
         '<keybinding:notebook.cell.quitEdit>'
     )),
         ( localize(
-        10265,
+        10400,
         'Run the Open Accessbility View command{0} while navigating the history for an accessible view of the item\'s output.',
         '<keybinding:editor.action.accessibleView>'
     )),
         ( localize(
-        10266,
+        10401,
         'The Focus Output command{0} will set focus on the output when focused on a previously executed item.',
         '<keybinding:notebook.cell.focusInOutput>'
     )),
         ( localize(
-        10267,
+        10402,
         'The Focus Input Editor command{0} will move focus to the REPL input box.',
         '<keybinding:repl.input.focus>'
     )),
         ( localize(
-        10259,
+        10394,
         'The Focus Last executed command{0} will move focus to the last executed item in the REPL history.',
         '<keybinding:repl.focusLastItemExecuted>'
     )),

package/vscode/src/vs/workbench/services/workingCopy/common/abstractFileWorkingCopyManager.d.ts

@@ -4,7 +4,7 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IWorkingCopyBackupService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service";
-import { IFileWorkingCopy, IFileWorkingCopyModel } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
+import { IFileWorkingCopy, IFileWorkingCopyModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
 export interface IBaseFileWorkingCopyManager<M extends IFileWorkingCopyModel, W extends IFileWorkingCopy<M>> extends IDisposable {
     /**
      * An event for when a file working copy was created.

package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.d.ts

@@ -8,13 +8,13 @@ import { ISaveOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopyResolveOptions } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopyResolveOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
 import { IStoredFileWorkingCopyManager, IStoredFileWorkingCopyManagerResolveOptions } from "./storedFileWorkingCopyManager.js";
 import { IUntitledFileWorkingCopy, IUntitledFileWorkingCopyModel, IUntitledFileWorkingCopyModelFactory } from "./untitledFileWorkingCopy.js";
 import { INewOrExistingUntitledFileWorkingCopyOptions, INewUntitledFileWorkingCopyOptions, INewUntitledFileWorkingCopyWithAssociatedResourceOptions, IUntitledFileWorkingCopyManager } from "./untitledFileWorkingCopyManager.js";
 import { IWorkingCopyFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service";
 import { IBaseFileWorkingCopyManager } from "./abstractFileWorkingCopyManager.js";
-import { IFileWorkingCopy } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
+import { IFileWorkingCopy } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";