@codingame/monaco-vscode-api 15.0.0 → 15.0.2

package/missing-services.js

@@ -233,6 +233,39 @@ import { unsupported } from './tools.js';
 import { ITreeSitterImporter } from './vscode/src/vs/editor/common/services/treeSitterParserService.service.js';
 import { IChatEntitlementsService } from './vscode/src/vs/workbench/contrib/chat/common/chatEntitlementsService.service.js';
 import { IPromptsService } from './vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/types.service.js';
+import { ISuggestMemoryService } from './vscode/src/vs/editor/contrib/suggest/browser/suggestMemory.service.js';
+import { LanguageConfigurationService } from './vscode/src/vs/editor/common/languages/languageConfigurationRegistry.js';
+import { ILanguageConfigurationService } from './vscode/src/vs/editor/common/languages/languageConfigurationRegistry.service.js';
+import { ISemanticTokensStylingService } from './vscode/src/vs/editor/common/services/semanticTokensStyling.service.js';
+import { ILanguageFeatureDebounceService } from './vscode/src/vs/editor/common/services/languageFeatureDebounce.service.js';
+import { ILanguageFeaturesService } from './vscode/src/vs/editor/common/services/languageFeatures.service.js';
+import { IDiffProviderFactoryService } from './vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.service.js';
+import { IOutlineModelService } from './vscode/src/vs/editor/contrib/documentSymbols/browser/outlineModel.service.js';
+import { IMarkerNavigationService } from './vscode/src/vs/editor/contrib/gotoError/browser/markerNavigationService.service.js';
+import { ICodeLensCache } from './vscode/src/vs/editor/contrib/codelens/browser/codeLensCache.service.js';
+import { IInlayHintsCache } from './vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.service.js';
+import { ISymbolNavigationService } from './vscode/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.service.js';
+import { IEditorCancellationTokens } from './vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.service.js';
+import { IPeekViewService } from './vscode/src/vs/editor/contrib/peekView/browser/peekView.service.js';
+import { SemanticTokensStylingService } from './vscode/src/vs/editor/common/services/semanticTokensStylingService.js';
+import { LanguageFeatureDebounceService } from './vscode/src/vs/editor/common/services/languageFeatureDebounce.js';
+import { CodeEditorService } from './vscode/src/vs/workbench/services/editor/browser/codeEditorService.js';
+import { LanguageFeaturesService } from './vscode/src/vs/editor/common/services/languageFeaturesService.js';
+import { WorkerBasedDiffProviderFactoryService } from './vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.js';
+import { OutlineModelService } from './vscode/src/vs/editor/contrib/documentSymbols/browser/outlineModel.js';
+import { SuggestMemoryService } from './vscode/src/vs/editor/contrib/suggest/browser/suggestMemory.js';
+import { CodeLensCache } from './vscode/src/vs/editor/contrib/codelens/browser/codeLensCache.js';
+import { PeekViewService } from './vscode/src/vs/editor/contrib/peekView/browser/peekView.js';
+import { MarkerNavigationService } from './vscode/src/vs/editor/contrib/gotoError/browser/markerNavigationService.js';
+import { InlayHintsCache } from './vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.js';
+import { IUndoRedoService } from './vscode/src/vs/platform/undoRedo/common/undoRedo.service.js';
+import { UndoRedoService } from './vscode/src/vs/platform/undoRedo/common/undoRedoService.js';
+import { ActionWidgetService } from './vscode/src/vs/platform/actionWidget/browser/actionWidget.js';
+import { IActionWidgetService } from './vscode/src/vs/platform/actionWidget/browser/actionWidget.service.js';
+import { EditorCancellationTokens } from './vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js';
+import { SymbolNavigationService } from './vscode/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.js';
+import { IHoverService } from './vscode/src/vs/platform/hover/browser/hover.service.js';
+import { HoverService } from './vscode/src/vs/editor/browser/services/hoverService/hoverService.js';
 
 function Unsupported(target, propertyKey, descriptor) {
     function unsupported() {
@@ -245,6 +278,23 @@ function Unsupported(target, propertyKey, descriptor) {
         descriptor.get = unsupported;
     }
 }
+registerSingleton(ILanguageConfigurationService, LanguageConfigurationService, InstantiationType.Delayed);
+registerSingleton(ISemanticTokensStylingService, SemanticTokensStylingService, InstantiationType.Delayed);
+registerSingleton(ILanguageFeatureDebounceService, LanguageFeatureDebounceService, InstantiationType.Delayed);
+registerSingleton(ILanguageFeaturesService, LanguageFeaturesService, InstantiationType.Delayed);
+registerSingleton(ICodeEditorService, CodeEditorService, InstantiationType.Delayed);
+registerSingleton(IDiffProviderFactoryService, WorkerBasedDiffProviderFactoryService, InstantiationType.Delayed);
+registerSingleton(ISymbolNavigationService, SymbolNavigationService, InstantiationType.Delayed);
+registerSingleton(IEditorCancellationTokens, EditorCancellationTokens, InstantiationType.Delayed);
+registerSingleton(IPeekViewService, PeekViewService, InstantiationType.Delayed);
+registerSingleton(IOutlineModelService, OutlineModelService, InstantiationType.Delayed);
+registerSingleton(IMarkerNavigationService, MarkerNavigationService, InstantiationType.Delayed);
+registerSingleton(ISuggestMemoryService, SuggestMemoryService, InstantiationType.Delayed);
+registerSingleton(ICodeLensCache, CodeLensCache, InstantiationType.Delayed);
+registerSingleton(IHoverService, HoverService, InstantiationType.Delayed);
+registerSingleton(IInlayHintsCache, InlayHintsCache, InstantiationType.Delayed);
+registerSingleton(IActionWidgetService, ActionWidgetService, InstantiationType.Delayed);
+registerSingleton(IUndoRedoService, UndoRedoService, InstantiationType.Delayed);
 registerSingleton(ILoggerService, class NullLoggerService extends AbstractLoggerService {
     constructor() {
         super(LogLevel.Info, URI.file('logs.log'));
@@ -1247,8 +1297,8 @@ registerSingleton(IPathService, PathService, InstantiationType.Delayed);
 class ProductService {
     constructor() {
         this._serviceBrand = undefined;
-        this.version = "1.98.0";
-        this.commit = "6609ac3d66f4eade5cf376d1cb76f13985724bcb";
+        this.version = "1.98.1";
+        this.commit = "2fc07b811f760549dab9be9d2bedd06c51dfcb9a";
         this.quality = 'oss';
         this.nameShort = 'Code - OSS Dev';
         this.nameLong = 'Code - OSS Dev';
@@ -9246,8 +9296,7 @@ class PromptsService {
     getSyntaxParserFor() {
         unsupported();
     }
-    dispose() {
-    }
+    dispose() { }
 }
 __decorate([
     Unsupported

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "15.0.0",
+  "version": "15.0.2",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
@@ -15,13 +15,13 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-base-service-override": "15.0.0",
-    "@codingame/monaco-vscode-environment-service-override": "15.0.0",
-    "@codingame/monaco-vscode-extensions-service-override": "15.0.0",
-    "@codingame/monaco-vscode-files-service-override": "15.0.0",
-    "@codingame/monaco-vscode-host-service-override": "15.0.0",
-    "@codingame/monaco-vscode-layout-service-override": "15.0.0",
-    "@codingame/monaco-vscode-quickaccess-service-override": "15.0.0",
+    "@codingame/monaco-vscode-base-service-override": "15.0.2",
+    "@codingame/monaco-vscode-environment-service-override": "15.0.2",
+    "@codingame/monaco-vscode-extensions-service-override": "15.0.2",
+    "@codingame/monaco-vscode-files-service-override": "15.0.2",
+    "@codingame/monaco-vscode-host-service-override": "15.0.2",
+    "@codingame/monaco-vscode-layout-service-override": "15.0.2",
+    "@codingame/monaco-vscode-quickaccess-service-override": "15.0.2",
     "marked": "14.0.0"
   },
   "main": "services.js",

package/services.js

@@ -181,18 +181,18 @@ export { IKeybindingService } from './vscode/src/vs/platform/keybinding/common/k
 export { ISecretStorageService } from './vscode/src/vs/platform/secrets/common/secrets.service.js';
 export { ConfigurationTarget } from './vscode/src/vs/platform/configuration/common/configuration.js';
 
-if (window.monacoVscodeApiBuildId != null && window.monacoVscodeApiBuildId !== "1.98.0-eaf2baaa-bad5-400b-b0c3-9ecd0ada6759") {
-    throw new Error(`Another version of monaco-vscode-api has already been loaded. Trying to load ${"1.98.0-eaf2baaa-bad5-400b-b0c3-9ecd0ada6759"}, ${window.monacoVscodeApiBuildId} is already loaded`);
+if (window.monacoVscodeApiBuildId != null && window.monacoVscodeApiBuildId !== "1.98.1-f3054d0e-d620-44fc-97ab-4a97c3d7c636") {
+    throw new Error(`Another version of monaco-vscode-api has already been loaded. Trying to load ${"1.98.1-f3054d0e-d620-44fc-97ab-4a97c3d7c636"}, ${window.monacoVscodeApiBuildId} is already loaded`);
 }
-window.monacoVscodeApiBuildId = "1.98.0-eaf2baaa-bad5-400b-b0c3-9ecd0ada6759";
+window.monacoVscodeApiBuildId = "1.98.1-f3054d0e-d620-44fc-97ab-4a97c3d7c636";
 async function initialize(overrides, container = document.body, configuration = {}, env) {
     checkServicesNotInitialized();
     initialize$1(container, configuration, env);
     const instantiationService = StandaloneServices.initialize({
         [IProductService.toString()]: mixin({
-            version: "1.98.0",
+            version: "1.98.1",
             quality: 'stable',
-            commit: "6609ac3d66f4eade5cf376d1cb76f13985724bcb",
+            commit: "2fc07b811f760549dab9be9d2bedd06c51dfcb9a",
             nameShort: 'Code - OSS',
             nameLong: 'Code - OSS',
             applicationName: 'code-oss',

package/vscode/src/vs/editor/browser/observableCodeEditor.js

@@ -11,8 +11,8 @@ import { Point } from './point.js';
 import { TransactionImpl, observableValue } from '../../base/common/observableInternal/base.js';
 import { derivedOpts, derivedWithSetter, derived } from '../../base/common/observableInternal/derived.js';
 import { observableFromEvent, observableSignal } from '../../base/common/observableInternal/utils.js';
-import { observableValueOpts } from '../../base/common/observableInternal/api.js';
 import { autorunOpts, autorun } from '../../base/common/observableInternal/autorun.js';
+import { observableValueOpts } from '../../base/common/observableInternal/api.js';
 
 function observableCodeEditor(editor) {
     return ObservableCodeEditor.get(editor);

package/vscode/src/vs/editor/browser/services/hoverService/hoverService.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
+import '../../../../platform/instantiation/common/extensions.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
@@ -13,9 +13,8 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { HoverWidget } from './hoverWidget.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { addDisposableListener, EventType, getActiveElement, isHTMLElement, isAncestorOfActiveElement, getWindow, isAncestor, isEditableElement } from '../../../../base/browser/dom.js';
@@ -450,7 +449,6 @@ function getHoverTargetElement(element, stopElement) {
     }
     return element;
 }
-registerSingleton(IHoverService, HoverService, InstantiationType.Delayed);
 registerThemingParticipant((theme, collector) => {
     const hoverBorder = theme.getColor(editorHoverBorder);
     if (hoverBorder) {

package/vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.js

@@ -0,0 +1,125 @@
+
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import '../../../../platform/instantiation/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
+import { LineRange } from '../../../common/core/lineRange.js';
+import { DetailedLineRangeMapping, RangeMapping } from '../../../common/diff/rangeMapping.js';
+import { IEditorWorkerService } from '../../../common/services/editorWorker.service.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
+
+var WorkerBasedDocumentDiffProvider_1;
+let WorkerBasedDiffProviderFactoryService = class WorkerBasedDiffProviderFactoryService {
+    constructor(instantiationService) {
+        this.instantiationService = instantiationService;
+    }
+    createDiffProvider(options) {
+        return this.instantiationService.createInstance(WorkerBasedDocumentDiffProvider, options);
+    }
+};
+WorkerBasedDiffProviderFactoryService = ( __decorate([
+    ( __param(0, IInstantiationService))
+], WorkerBasedDiffProviderFactoryService));
+let WorkerBasedDocumentDiffProvider = class WorkerBasedDocumentDiffProvider {
+    static { WorkerBasedDocumentDiffProvider_1 = this; }
+    static { this.diffCache = ( new Map()); }
+    constructor(options, editorWorkerService, telemetryService) {
+        this.editorWorkerService = editorWorkerService;
+        this.telemetryService = telemetryService;
+        this.onDidChangeEventEmitter = ( new Emitter());
+        this.onDidChange = this.onDidChangeEventEmitter.event;
+        this.diffAlgorithm = 'advanced';
+        this.diffAlgorithmOnDidChangeSubscription = undefined;
+        this.setOptions(options);
+    }
+    dispose() {
+        this.diffAlgorithmOnDidChangeSubscription?.dispose();
+    }
+    async computeDiff(original, modified, options, cancellationToken) {
+        if (typeof this.diffAlgorithm !== 'string') {
+            return this.diffAlgorithm.computeDiff(original, modified, options, cancellationToken);
+        }
+        if (original.isDisposed() || modified.isDisposed()) {
+            return {
+                changes: [],
+                identical: true,
+                quitEarly: false,
+                moves: [],
+            };
+        }
+        if (original.getLineCount() === 1 && original.getLineMaxColumn(1) === 1) {
+            if (modified.getLineCount() === 1 && modified.getLineMaxColumn(1) === 1) {
+                return {
+                    changes: [],
+                    identical: true,
+                    quitEarly: false,
+                    moves: [],
+                };
+            }
+            return {
+                changes: [
+                    ( new DetailedLineRangeMapping(( new LineRange(1, 2)), ( new LineRange(1, modified.getLineCount() + 1)), [
+                        ( new RangeMapping(original.getFullModelRange(), modified.getFullModelRange()))
+                    ]))
+                ],
+                identical: false,
+                quitEarly: false,
+                moves: [],
+            };
+        }
+        const uriKey = JSON.stringify([( original.uri.toString()), ( modified.uri.toString())]);
+        const context = JSON.stringify([original.id, modified.id, original.getAlternativeVersionId(), modified.getAlternativeVersionId(), JSON.stringify(options)]);
+        const c = WorkerBasedDocumentDiffProvider_1.diffCache.get(uriKey);
+        if (c && c.context === context) {
+            return c.result;
+        }
+        const sw = StopWatch.create();
+        const result = await this.editorWorkerService.computeDiff(original.uri, modified.uri, options, this.diffAlgorithm);
+        const timeMs = sw.elapsed();
+        this.telemetryService.publicLog2('diffEditor.computeDiff', {
+            timeMs,
+            timedOut: result?.quitEarly ?? true,
+            detectedMoves: options.computeMoves ? (result?.moves.length ?? 0) : -1,
+        });
+        if (cancellationToken.isCancellationRequested) {
+            return {
+                changes: [],
+                identical: false,
+                quitEarly: true,
+                moves: [],
+            };
+        }
+        if (!result) {
+            throw ( new Error('no diff result available'));
+        }
+        if (WorkerBasedDocumentDiffProvider_1.diffCache.size > 10) {
+            WorkerBasedDocumentDiffProvider_1.diffCache.delete(( WorkerBasedDocumentDiffProvider_1.diffCache.keys()).next().value);
+        }
+        WorkerBasedDocumentDiffProvider_1.diffCache.set(uriKey, { result, context });
+        return result;
+    }
+    setOptions(newOptions) {
+        let didChange = false;
+        if (newOptions.diffAlgorithm) {
+            if (this.diffAlgorithm !== newOptions.diffAlgorithm) {
+                this.diffAlgorithmOnDidChangeSubscription?.dispose();
+                this.diffAlgorithmOnDidChangeSubscription = undefined;
+                this.diffAlgorithm = newOptions.diffAlgorithm;
+                if (typeof newOptions.diffAlgorithm !== 'string') {
+                    this.diffAlgorithmOnDidChangeSubscription = newOptions.diffAlgorithm.onDidChange(() => this.onDidChangeEventEmitter.fire());
+                }
+                didChange = true;
+            }
+        }
+        if (didChange) {
+            this.onDidChangeEventEmitter.fire();
+        }
+    }
+};
+WorkerBasedDocumentDiffProvider = WorkerBasedDocumentDiffProvider_1 = ( __decorate([
+    ( __param(1, IEditorWorkerService)),
+    ( __param(2, ITelemetryService))
+], WorkerBasedDocumentDiffProvider));
+
+export { WorkerBasedDiffProviderFactoryService, WorkerBasedDocumentDiffProvider };

package/vscode/src/vs/editor/common/languages/languageConfigurationRegistry.js

@@ -12,10 +12,10 @@ import { OnEnterSupport } from './supports/onEnter.js';
 import { RichEditBrackets } from './supports/richEditBrackets.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.service.js';
 import { ILanguageService } from './language.service.js';
-import { registerSingleton, InstantiationType } from '../../../platform/instantiation/common/extensions.js';
+import '../../../platform/instantiation/common/extensions.js';
 import { PLAINTEXT_LANGUAGE_ID } from './modesRegistry.js';
 import { LanguageBracketsConfiguration } from './supports/languageBracketsConfiguration.js';
-import { ILanguageConfigurationService } from './languageConfigurationRegistry.service.js';
+import '../../../platform/instantiation/common/instantiation.js';
 
 class LanguageConfigurationServiceChangeEvent {
     constructor(languageId) {
@@ -327,6 +327,5 @@ class ResolvedLanguageConfiguration {
         return comments;
     }
 }
-registerSingleton(ILanguageConfigurationService, LanguageConfigurationService, InstantiationType.Delayed);
 
 export { LanguageConfigurationChangeEvent, LanguageConfigurationRegistry, LanguageConfigurationService, LanguageConfigurationServiceChangeEvent, ResolvedLanguageConfiguration, getIndentationAtPosition };

package/vscode/src/vs/editor/common/services/languageFeatureDebounce.js

@@ -4,10 +4,10 @@ import { doHash } from '../../../base/common/hash.js';
 import { LRUCache } from '../../../base/common/map.js';
 import { clamp, SlidingWindowAverage, MovingAverage } from '../../../base/common/numbers.js';
 import { IEnvironmentService } from '../../../platform/environment/common/environment.service.js';
-import { registerSingleton, InstantiationType } from '../../../platform/instantiation/common/extensions.js';
+import '../../../platform/instantiation/common/extensions.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { matchesScheme } from '../../../base/common/network.js';
-import { ILanguageFeatureDebounceService } from './languageFeatureDebounce.service.js';
+import '../../../platform/instantiation/common/instantiation.js';
 
 var IdentityHash;
 (function (IdentityHash) {
@@ -125,6 +125,5 @@ LanguageFeatureDebounceService = ( __decorate([
     ( __param(0, ILogService)),
     ( __param(1, IEnvironmentService))
 ], LanguageFeatureDebounceService));
-registerSingleton(ILanguageFeatureDebounceService, LanguageFeatureDebounceService, InstantiationType.Delayed);
 
 export { LanguageFeatureDebounceService };

package/vscode/src/vs/editor/common/services/languageFeaturesService.js

@@ -1,7 +1,7 @@
 
 import { LanguageFeatureRegistry } from '../languageFeatureRegistry.js';
-import { ILanguageFeaturesService } from './languageFeatures.service.js';
-import { registerSingleton, InstantiationType } from '../../../platform/instantiation/common/extensions.js';
+import '../../../platform/instantiation/common/instantiation.js';
+import '../../../platform/instantiation/common/extensions.js';
 
 class LanguageFeaturesService {
     constructor() {
@@ -45,6 +45,5 @@ class LanguageFeaturesService {
         return this._notebookTypeResolver?.(uri);
     }
 }
-registerSingleton(ILanguageFeaturesService, LanguageFeaturesService, InstantiationType.Delayed);
 
 export { LanguageFeaturesService };

package/vscode/src/vs/editor/common/services/semanticTokensStylingService.js

@@ -5,8 +5,8 @@ import { ILanguageService } from '../languages/language.service.js';
 import { IThemeService } from '../../../platform/theme/common/themeService.service.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { SemanticTokensProviderStyling } from './semanticTokensProviderStyling.js';
-import { ISemanticTokensStylingService } from './semanticTokensStyling.service.js';
-import { registerSingleton, InstantiationType } from '../../../platform/instantiation/common/extensions.js';
+import '../../../platform/instantiation/common/instantiation.js';
+import '../../../platform/instantiation/common/extensions.js';
 
 let SemanticTokensStylingService = class SemanticTokensStylingService extends Disposable {
     constructor(_themeService, _logService, _languageService) {
@@ -36,6 +36,5 @@ SemanticTokensStylingService = ( __decorate([
     ( __param(1, ILogService)),
     ( __param(2, ILanguageService))
 ], SemanticTokensStylingService));
-registerSingleton(ISemanticTokensStylingService, SemanticTokensStylingService, InstantiationType.Delayed);
 
 export { SemanticTokensStylingService };

package/vscode/src/vs/editor/contrib/codelens/browser/codeLensCache.d.ts

@@ -0,0 +1,15 @@
+import { ITextModel } from "../../../common/model.js";
+import { CodeLensModel } from "./codelens.js";
+import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
+import { ICodeLensCache } from "./codeLensCache.service.js";
+export declare class CodeLensCache implements ICodeLensCache {
+    readonly _serviceBrand: undefined;
+    private readonly _fakeProvider;
+    private readonly _cache;
+    constructor(storageService: IStorageService);
+    put(model: ITextModel, data: CodeLensModel): void;
+    get(model: ITextModel): CodeLensModel | undefined;
+    delete(model: ITextModel): void;
+    private _serialize;
+    private _deserialize;
+}

package/vscode/src/vs/editor/contrib/codelens/browser/codeLensCache.js

@@ -0,0 +1,93 @@
+
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { Event } from '../../../../base/common/event.js';
+import { LRUCache } from '../../../../base/common/map.js';
+import { Range } from '../../../common/core/range.js';
+import { CodeLensModel } from './codelens.js';
+import '../../../../platform/instantiation/common/extensions.js';
+import { StorageScope, WillSaveStateReason, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { runWhenWindowIdle } from '../../../../base/browser/dom.js';
+import '../../../../platform/instantiation/common/instantiation.js';
+
+class CacheItem {
+    constructor(lineCount, data) {
+        this.lineCount = lineCount;
+        this.data = data;
+    }
+}
+let CodeLensCache = class CodeLensCache {
+    constructor(storageService) {
+        this._fakeProvider = new class {
+            provideCodeLenses() {
+                throw ( new Error('not supported'));
+            }
+        };
+        this._cache = ( new LRUCache(20, 0.75));
+        const oldkey = 'codelens/cache';
+        runWhenWindowIdle(mainWindow, () => storageService.remove(oldkey, StorageScope.WORKSPACE));
+        const key = 'codelens/cache2';
+        const raw = storageService.get(key, StorageScope.WORKSPACE, '{}');
+        this._deserialize(raw);
+        const onWillSaveStateBecauseOfShutdown = Event.filter(storageService.onWillSaveState, e => e.reason === WillSaveStateReason.SHUTDOWN);
+        Event.once(onWillSaveStateBecauseOfShutdown)(e => {
+            storageService.store(key, this._serialize(), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        });
+    }
+    put(model, data) {
+        const copyItems = ( data.lenses.map((item) => {
+            return {
+                range: item.symbol.range,
+                command: item.symbol.command && { id: '', title: item.symbol.command?.title },
+            };
+        }));
+        const copyModel = ( new CodeLensModel());
+        copyModel.add({ lenses: copyItems }, this._fakeProvider);
+        const item = ( new CacheItem(model.getLineCount(), copyModel));
+        this._cache.set(( model.uri.toString()), item);
+    }
+    get(model) {
+        const item = this._cache.get(( model.uri.toString()));
+        return item && item.lineCount === model.getLineCount() ? item.data : undefined;
+    }
+    delete(model) {
+        this._cache.delete(( model.uri.toString()));
+    }
+    _serialize() {
+        const data = Object.create(null);
+        for (const [key, value] of this._cache) {
+            const lines = ( new Set());
+            for (const d of value.data.lenses) {
+                lines.add(d.symbol.range.startLineNumber);
+            }
+            data[key] = {
+                lineCount: value.lineCount,
+                lines: [...( lines.values())]
+            };
+        }
+        return JSON.stringify(data);
+    }
+    _deserialize(raw) {
+        try {
+            const data = JSON.parse(raw);
+            for (const key in data) {
+                const element = data[key];
+                const lenses = [];
+                for (const line of element.lines) {
+                    lenses.push({ range: ( new Range(line, 1, line, 11)) });
+                }
+                const model = ( new CodeLensModel());
+                model.add({ lenses }, this._fakeProvider);
+                this._cache.set(key, ( new CacheItem(element.lineCount, model)));
+            }
+        }
+        catch {
+        }
+    }
+};
+CodeLensCache = ( __decorate([
+    ( __param(0, IStorageService))
+], CodeLensCache));
+
+export { CodeLensCache };

package/vscode/src/vs/editor/contrib/documentSymbols/browser/outlineModel.js

@@ -9,11 +9,11 @@ import { commonPrefixLength } from '../../../../base/common/strings.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.service.js';
-import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
+import '../../../../platform/instantiation/common/extensions.js';
 import { IModelService } from '../../../common/services/model.service.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
-import { IOutlineModelService } from './outlineModel.service.js';
+import '../../../../platform/instantiation/common/instantiation.js';
 
 class TreeElement {
     remove() {
@@ -372,6 +372,5 @@ OutlineModelService = ( __decorate([
     ( __param(1, ILanguageFeatureDebounceService)),
     ( __param(2, IModelService))
 ], OutlineModelService));
-registerSingleton(IOutlineModelService, OutlineModelService, InstantiationType.Delayed);
 
 export { OutlineElement, OutlineGroup, OutlineModel, OutlineModelService, TreeElement };

package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.d.ts

@@ -1,5 +1,12 @@
 import { ICodeEditor } from "../../../browser/editorBrowser.js";
 import { CancellationTokenSource, CancellationToken } from "../../../../base/common/cancellation.js";
+import { IEditorCancellationTokens } from "./keybindingCancellation.service.js";
+export declare class EditorCancellationTokens implements IEditorCancellationTokens {
+    readonly _serviceBrand: undefined;
+    private readonly _tokens;
+    add(editor: ICodeEditor, cts: CancellationTokenSource): () => void;
+    cancel(editor: ICodeEditor): void;
+}
 export declare class EditorKeybindingCancellationTokenSource extends CancellationTokenSource {
     readonly editor: ICodeEditor;
     private readonly _unregister;

package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js

@@ -6,7 +6,7 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { LinkedList } from '../../../../base/common/linkedList.js';
-import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
+import '../../../../platform/instantiation/common/extensions.js';
 import { localize } from '../../../../nls.js';
 import { IEditorCancellationTokens } from './keybindingCancellation.service.js';
 
@@ -14,7 +14,7 @@ const ctxCancellableOperation = ( new RawContextKey('cancellableOperation', fals
     972,
     'Whether the editor runs a cancellable operation, e.g. like \'Peek References\''
 ))));
-registerSingleton(IEditorCancellationTokens, class {
+class EditorCancellationTokens {
     constructor() {
         this._tokens = ( new WeakMap());
     }
@@ -50,7 +50,7 @@ registerSingleton(IEditorCancellationTokens, class {
             data.key.set(!data.tokens.isEmpty());
         }
     }
-}, InstantiationType.Delayed);
+}
 class EditorKeybindingCancellationTokenSource extends CancellationTokenSource {
     constructor(editor, parent) {
         super(parent);
@@ -78,4 +78,4 @@ registerEditorCommand(new (class extends EditorCommand {
     }
 }));
 
-export { EditorKeybindingCancellationTokenSource };
+export { EditorCancellationTokens, EditorKeybindingCancellationTokenSource };

package/vscode/src/vs/editor/contrib/gotoError/browser/markerNavigationService.d.ts

@@ -0,0 +1,45 @@
+import { Event } from "../../../../base/common/event.js";
+import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { URI } from "../../../../base/common/uri.js";
+import { Position } from "../../../common/core/position.js";
+import { ITextModel } from "../../../common/model.js";
+import { IMarker } from "../../../../platform/markers/common/markers.js";
+import { IMarkerService } from "../../../../platform/markers/common/markers.service.js";
+import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
+import { IMarkerNavigationService } from "./markerNavigationService.service.js";
+export declare class MarkerCoordinate {
+    readonly marker: IMarker;
+    readonly index: number;
+    readonly total: number;
+    constructor(marker: IMarker, index: number, total: number);
+}
+export declare class MarkerList {
+    private readonly _markerService;
+    private readonly _configService;
+    private readonly _onDidChange;
+    readonly onDidChange: Event<void>;
+    private readonly _resourceFilter?;
+    private readonly _dispoables;
+    private _markers;
+    private _nextIdx;
+    constructor(resourceFilter: URI | ((uri: URI) => boolean) | undefined, _markerService: IMarkerService, _configService: IConfigurationService);
+    dispose(): void;
+    matches(uri: URI | undefined): boolean;
+    get selected(): MarkerCoordinate | undefined;
+    private _initIdx;
+    resetIndex(): void;
+    move(fwd: boolean, model: ITextModel, position: Position): boolean;
+    find(uri: URI, position: Position): MarkerCoordinate | undefined;
+}
+export interface IMarkerListProvider {
+    getMarkerList(resource: URI | undefined): MarkerList | undefined;
+}
+export declare class MarkerNavigationService implements IMarkerNavigationService, IMarkerListProvider {
+    private readonly _markerService;
+    private readonly _configService;
+    readonly _serviceBrand: undefined;
+    private readonly _provider;
+    constructor(_markerService: IMarkerService, _configService: IConfigurationService);
+    registerProvider(provider: IMarkerListProvider): IDisposable;
+    getMarkerList(resource: URI | undefined): MarkerList;
+}