@codingame/monaco-vscode-api 3.2.3 → 4.0.0

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

@@ -3,103 +3,15 @@ import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { getLeadingWhitespace } from '../../../../base/common/strings.js';
 import { EditorAction, registerEditorContribution, registerEditorAction } from '../../../browser/editorExtensions.js';
 import { ShiftCommand } from '../../../common/commands/shiftCommand.js';
-import { EditOperation } from '../../../common/core/editOperation.js';
 import { Range } from '../../../common/core/range.js';
-import { Selection } from '../../../common/core/selection.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { IModelService } from '../../../common/services/model.js';
-import { getSpaceCnt, generateIndent } from './indentUtils.js';
+import { getSpaceCnt, generateIndent } from '../common/indentUtils.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
-import { normalizeIndentation } from '../../../common/core/indentation.js';
 import { getGoodIndentForLine, getIndentMetadata } from '../../../common/languages/autoIndent.js';
-function getReindentEditOperations(model, languageConfigurationService, startLineNumber, endLineNumber, inheritedIndent) {
-    if (model.getLineCount() === 1 && model.getLineMaxColumn(1) === 1) {
-        return [];
-    }
-    const indentationRules = languageConfigurationService.getLanguageConfiguration(model.getLanguageId()).indentationRules;
-    if (!indentationRules) {
-        return [];
-    }
-    endLineNumber = Math.min(endLineNumber, model.getLineCount());
-    while (startLineNumber <= endLineNumber) {
-        if (!indentationRules.unIndentedLinePattern) {
-            break;
-        }
-        const text = model.getLineContent(startLineNumber);
-        if (!indentationRules.unIndentedLinePattern.test(text)) {
-            break;
-        }
-        startLineNumber++;
-    }
-    if (startLineNumber > endLineNumber - 1) {
-        return [];
-    }
-    const { tabSize, indentSize, insertSpaces } = model.getOptions();
-    const shiftIndent = (indentation, count) => {
-        count = count || 1;
-        return ShiftCommand.shiftIndent(indentation, indentation.length + count, tabSize, indentSize, insertSpaces);
-    };
-    const unshiftIndent = (indentation, count) => {
-        count = count || 1;
-        return ShiftCommand.unshiftIndent(indentation, indentation.length + count, tabSize, indentSize, insertSpaces);
-    };
-    const indentEdits = [];
-    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;
-    if (indentationRules.increaseIndentPattern && indentationRules.increaseIndentPattern.test(adjustedLineContent)) {
-        idealIndentForNextLine = shiftIndent(idealIndentForNextLine);
-        globalIndent = shiftIndent(globalIndent);
-    }
-    else if (indentationRules.indentNextLinePattern && indentationRules.indentNextLinePattern.test(adjustedLineContent)) {
-        idealIndentForNextLine = shiftIndent(idealIndentForNextLine);
-    }
-    startLineNumber++;
-    for (let lineNumber = startLineNumber; lineNumber <= endLineNumber; lineNumber++) {
-        const text = model.getLineContent(lineNumber);
-        const oldIndentation = getLeadingWhitespace(text);
-        const adjustedLineContent = idealIndentForNextLine + text.substring(oldIndentation.length);
-        if (indentationRules.decreaseIndentPattern && indentationRules.decreaseIndentPattern.test(adjustedLineContent)) {
-            idealIndentForNextLine = unshiftIndent(idealIndentForNextLine);
-            globalIndent = unshiftIndent(globalIndent);
-        }
-        if (oldIndentation !== idealIndentForNextLine) {
-            indentEdits.push(EditOperation.replaceMove(( new Selection(lineNumber, 1, lineNumber, oldIndentation.length + 1)), normalizeIndentation(idealIndentForNextLine, indentSize, insertSpaces)));
-        }
-        if (indentationRules.unIndentedLinePattern && indentationRules.unIndentedLinePattern.test(text)) {
-            continue;
-        }
-        else if (indentationRules.increaseIndentPattern && indentationRules.increaseIndentPattern.test(adjustedLineContent)) {
-            globalIndent = shiftIndent(globalIndent);
-            idealIndentForNextLine = globalIndent;
-        }
-        else if (indentationRules.indentNextLinePattern && indentationRules.indentNextLinePattern.test(adjustedLineContent)) {
-            idealIndentForNextLine = shiftIndent(idealIndentForNextLine);
-        }
-        else {
-            idealIndentForNextLine = globalIndent;
-        }
-    }
-    return indentEdits;
-}
+import { getReindentEditOperations } from '../common/indentation.js';
 class IndentationToSpacesAction extends EditorAction {
     static { this.ID = 'editor.action.indentationToSpaces'; }
     constructor() {
@@ -636,4 +548,4 @@ registerEditorAction(ChangeTabDisplaySize);
 registerEditorAction(DetectIndentation);
 registerEditorAction(ReindentLinesAction);
 registerEditorAction(ReindentSelectedLinesAction);
-export { AutoIndentOnPaste, AutoIndentOnPasteCommand, ChangeIndentationSizeAction, ChangeTabDisplaySize, DetectIndentation, IndentUsingSpaces, IndentUsingTabs, IndentationToSpacesAction, IndentationToSpacesCommand, IndentationToTabsAction, IndentationToTabsCommand, ReindentLinesAction, ReindentSelectedLinesAction, getReindentEditOperations };
+export { AutoIndentOnPaste, AutoIndentOnPasteCommand, ChangeIndentationSizeAction, ChangeTabDisplaySize, DetectIndentation, IndentUsingSpaces, IndentUsingTabs, IndentationToSpacesAction, IndentationToSpacesCommand, IndentationToTabsAction, IndentationToTabsCommand, ReindentLinesAction, ReindentSelectedLinesAction };

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

@@ -0,0 +1,92 @@
+import { getLeadingWhitespace } from '../../../../base/common/strings.js';
+import { ShiftCommand } from '../../../common/commands/shiftCommand.js';
+import { EditOperation } from '../../../common/core/editOperation.js';
+import { normalizeIndentation } from '../../../common/core/indentation.js';
+import { Selection } from '../../../common/core/selection.js';
+function getReindentEditOperations(model, languageConfigurationService, startLineNumber, endLineNumber, inheritedIndent) {
+    if (model.getLineCount() === 1 && model.getLineMaxColumn(1) === 1) {
+        return [];
+    }
+    const indentationRules = languageConfigurationService.getLanguageConfiguration(model.getLanguageId()).indentationRules;
+    if (!indentationRules) {
+        return [];
+    }
+    endLineNumber = Math.min(endLineNumber, model.getLineCount());
+    while (startLineNumber <= endLineNumber) {
+        if (!indentationRules.unIndentedLinePattern) {
+            break;
+        }
+        const text = model.getLineContent(startLineNumber);
+        if (!indentationRules.unIndentedLinePattern.test(text)) {
+            break;
+        }
+        startLineNumber++;
+    }
+    if (startLineNumber > endLineNumber - 1) {
+        return [];
+    }
+    const { tabSize, indentSize, insertSpaces } = model.getOptions();
+    const shiftIndent = (indentation, count) => {
+        count = count || 1;
+        return ShiftCommand.shiftIndent(indentation, indentation.length + count, tabSize, indentSize, insertSpaces);
+    };
+    const unshiftIndent = (indentation, count) => {
+        count = count || 1;
+        return ShiftCommand.unshiftIndent(indentation, indentation.length + count, tabSize, indentSize, insertSpaces);
+    };
+    const indentEdits = [];
+    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;
+    if (indentationRules.increaseIndentPattern && indentationRules.increaseIndentPattern.test(adjustedLineContent)) {
+        idealIndentForNextLine = shiftIndent(idealIndentForNextLine);
+        globalIndent = shiftIndent(globalIndent);
+    }
+    else if (indentationRules.indentNextLinePattern && indentationRules.indentNextLinePattern.test(adjustedLineContent)) {
+        idealIndentForNextLine = shiftIndent(idealIndentForNextLine);
+    }
+    startLineNumber++;
+    for (let lineNumber = startLineNumber; lineNumber <= endLineNumber; lineNumber++) {
+        const text = model.getLineContent(lineNumber);
+        const oldIndentation = getLeadingWhitespace(text);
+        const adjustedLineContent = idealIndentForNextLine + text.substring(oldIndentation.length);
+        if (indentationRules.decreaseIndentPattern && indentationRules.decreaseIndentPattern.test(adjustedLineContent)) {
+            idealIndentForNextLine = unshiftIndent(idealIndentForNextLine);
+            globalIndent = unshiftIndent(globalIndent);
+        }
+        if (oldIndentation !== idealIndentForNextLine) {
+            indentEdits.push(EditOperation.replaceMove(( new Selection(lineNumber, 1, lineNumber, oldIndentation.length + 1)), normalizeIndentation(idealIndentForNextLine, indentSize, insertSpaces)));
+        }
+        if (indentationRules.unIndentedLinePattern && indentationRules.unIndentedLinePattern.test(text)) {
+            continue;
+        }
+        else if (indentationRules.increaseIndentPattern && indentationRules.increaseIndentPattern.test(adjustedLineContent)) {
+            globalIndent = shiftIndent(globalIndent);
+            idealIndentForNextLine = globalIndent;
+        }
+        else if (indentationRules.indentNextLinePattern && indentationRules.indentNextLinePattern.test(adjustedLineContent)) {
+            idealIndentForNextLine = shiftIndent(idealIndentForNextLine);
+        }
+        else {
+            idealIndentForNextLine = globalIndent;
+        }
+    }
+    return indentEdits;
+}
+export { getReindentEditOperations };

package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.js

@@ -26,7 +26,17 @@ import { CommandsRegistry, ICommandService } from '../../../../platform/commands
 import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { Severity, INotificationService } from '../../../../platform/notification/common/notification.js';
-import { editorActiveLinkForeground, editorInlayHintParameterBackground, editorInlayHintParameterForeground, editorInlayHintTypeBackground, editorInlayHintTypeForeground, editorInlayHintBackground, editorInlayHintForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorActiveLinkForeground, editorInlayHintParameterBackground, editorInlayHintParameterForeground, editorInlayHintTypeBackground, editorInlayHintTypeForeground, editorInlayHintBackground, editorInlayHintForeground } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+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 { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 var InlayHintsController_1;
 class InlayHintsCache {
@@ -93,7 +103,7 @@ let InlayHintsController = class InlayHintsController {
         this._disposables.add(_editor.onDidChangeModel(() => this._update()));
         this._disposables.add(_editor.onDidChangeModelLanguage(() => this._update()));
         this._disposables.add(_editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(140 )) {
+            if (e.hasChanged(141 )) {
                 this._update();
             }
         }));
@@ -107,7 +117,7 @@ let InlayHintsController = class InlayHintsController {
     _update() {
         this._sessionDisposables.clear();
         this._removeAllDecorations();
-        const options = this._editor.getOption(140 );
+        const options = this._editor.getOption(141 );
         if (options.enabled === 'off') {
             return;
         }
@@ -491,7 +501,7 @@ let InlayHintsController = class InlayHintsController {
         }
     }
     _getLayoutInfo() {
-        const options = this._editor.getOption(140 );
+        const options = this._editor.getOption(141 );
         const padding = options.padding;
         const editorFontSize = this._editor.getOption(52 );
         const editorFontFamily = this._editor.getOption(49 );

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/commands.js

@@ -1,4 +1,8 @@
 import { transaction, asyncTransaction } from '../../../../base/common/observableInternal/base.js';
+import '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/observableInternal/autorun.js';
+import '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { EditorAction } from '../../../browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId, inlineSuggestCommitId } from './commandIds.js';

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/ghostText.js

@@ -1,7 +1,8 @@
 import { equals } from '../../../../base/common/arrays.js';
 import { splitLines } from '../../../../base/common/strings.js';
+import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
-import { applyEdits } from './utils.js';
+import { TextEdit, SingleTextEdit } from '../../../common/core/textEdit.js';
 class GhostText {
     constructor(lineNumber, parts) {
         this.lineNumber = lineNumber;
@@ -13,13 +14,9 @@ class GhostText {
             this.parts.every((part, index) => part.equals(other.parts[index]));
     }
     render(documentText, debug = false) {
-        const l = this.lineNumber;
-        return applyEdits(documentText, [
-            ...( this.parts.map(p => ({
-                range: { startLineNumber: l, endLineNumber: l, startColumn: p.column, endColumn: p.column },
-                text: debug ? `[${p.lines.join('\n')}]` : p.lines.join('\n')
-            }))),
-        ]);
+        return ( new TextEdit([
+            ...( this.parts.map(p => ( new SingleTextEdit(Range.fromPositions(( new Position(this.lineNumber, p.column))), debug ? `[${p.lines.join('\n')}]` : p.lines.join('\n'))))),
+        ])).applyToString(documentText);
     }
     renderForScreenReader(lineText) {
         if (this.parts.length === 0) {
@@ -27,10 +24,9 @@ class GhostText {
         }
         const lastPart = this.parts[this.parts.length - 1];
         const cappedLineText = lineText.substr(0, lastPart.column - 1);
-        const text = applyEdits(cappedLineText, ( this.parts.map(p => ({
-            range: { startLineNumber: 1, endLineNumber: 1, startColumn: p.column, endColumn: p.column },
-            text: p.lines.join('\n')
-        }))));
+        const text = ( new TextEdit([
+            ...( this.parts.map(p => ( new SingleTextEdit(Range.fromPositions(( new Position(1, p.column))), p.lines.join('\n'))))),
+        ])).applyToString(cappedLineText);
         return text.substring(this.parts[0].column - 1);
     }
     isEmpty() {
@@ -72,15 +68,18 @@ class GhostTextReplacement {
     render(documentText, debug = false) {
         const replaceRange = this.columnRange.toRange(this.lineNumber);
         if (debug) {
-            return applyEdits(documentText, [
-                { range: Range.fromPositions(replaceRange.getStartPosition()), text: `(` },
-                { range: Range.fromPositions(replaceRange.getEndPosition()), text: `)[${this.newLines.join('\n')}]` }
-            ]);
+            return ( new TextEdit([
+                ( new SingleTextEdit(Range.fromPositions(replaceRange.getStartPosition()), '(')),
+                ( new SingleTextEdit(
+                    Range.fromPositions(replaceRange.getEndPosition()),
+                    `)[${this.newLines.join('\n')}]`
+                )),
+            ])).applyToString(documentText);
         }
         else {
-            return applyEdits(documentText, [
-                { range: replaceRange, text: this.newLines.join('\n') }
-            ]);
+            return ( new TextEdit([
+                ( new SingleTextEdit(replaceRange, this.newLines.join('\n'))),
+            ])).applyToString(documentText);
         }
     }
     get lineCount() {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.js

@@ -2,6 +2,11 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { createTrustedTypesPolicy } from '../../../../base/browser/trustedTypes.js';
 import { Event } from '../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../base/common/observableInternal/base.js';
+import { derived } from '../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { observableSignalFromEvent, observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { containsRTL, isBasicASCII } from '../../../../base/common/strings.js';
 import './ghostText.css.js';
 import { applyFontInfo } from '../../../browser/config/domFontInfo.js';
@@ -16,10 +21,6 @@ import { LineDecoration } from '../../../common/viewLayout/lineDecorations.js';
 import { renderViewLine, RenderLineInput } from '../../../common/viewLayout/viewLineRenderer.js';
 import { GhostTextReplacement } from './ghostText.js';
 import { ColumnRange, applyObservableDecorations } from './utils.js';
-import { observableSignalFromEvent, observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
-import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
 const GHOST_TEXT_DESCRIPTION = 'ghost-text';
 let GhostTextWidget = class GhostTextWidget extends Disposable {
     constructor(editor, model, languageService) {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.js

@@ -2,6 +2,10 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { append, reset, $ } from '../../../../base/browser/dom.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import '../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { constObservable } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { Range } from '../../../common/core/range.js';
 import { ILanguageService } from '../../../common/languages/language.js';
 import { HoverForeignElementAnchor } from '../../hover/browser/hoverTypes.js';
@@ -13,8 +17,6 @@ import { IAccessibilityService } from '../../../../platform/accessibility/common
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { constObservable } from '../../../../base/common/observableInternal/utils.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
 class InlineCompletionsHover {
     constructor(owner, range, controller) {
         this.owner = owner;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys.js

@@ -1,9 +1,12 @@
+import '../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { firstNonWhitespaceIndex } from '../../../../base/common/strings.js';
 import { CursorColumns } from '../../../common/core/cursorColumns.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
 class InlineCompletionContextKeys extends Disposable {
     static { this.inlineSuggestionVisible = ( new RawContextKey('inlineSuggestionVisible', false, ( localizeWithPath(
         'vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys',

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.js

@@ -2,6 +2,11 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { createStyleSheet2 } from '../../../../base/browser/dom.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { disposableObservableValue, observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
+import { derived } from '../../../../base/common/observableInternal/derived.js';
+import { autorun, autorunHandleChanges } from '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent, mapObservableArrayCached, observableSignal, constObservable } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { CoreEditingCommands } from '../../../browser/coreCommands.js';
 import { Position } from '../../../common/core/position.js';
 import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
@@ -19,10 +24,6 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { observableFromEvent, mapObservableArrayCached, observableSignal, constObservable } from '../../../../base/common/observableInternal/utils.js';
-import { disposableObservableValue, observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
-import { autorun, autorunHandleChanges } from '../../../../base/common/observableInternal/autorun.js';
 var InlineCompletionsController_1;
 let InlineCompletionsController = class InlineCompletionsController extends Disposable {
     static { InlineCompletionsController_1 = this; }
@@ -203,7 +204,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         const accessibleViewShowing = this._contextKeyService.getContextKeyValue('accessibleViewIsShown');
         const accessibleViewKeybinding = this._keybindingService.lookupKeybinding('editor.action.accessibleView');
         let hint;
-        if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(148 )) {
+        if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(149 )) {
             hint = ( localizeWithPath(
                 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController',
                 'showAccessibleViewHint',

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.js

@@ -7,6 +7,10 @@ import { equals } from '../../../../base/common/arrays.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { derived } from '../../../../base/common/observableInternal/derived.js';
+import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { OS } from '../../../../base/common/platform.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import './inlineCompletionsHintsWidget.css.js';
@@ -24,9 +28,6 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
 var InlineSuggestionHintsContentWidget_1;
 let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Disposable {
     constructor(editor, model, instantiationService) {
@@ -271,7 +272,7 @@ class StatusBarViewItem extends MenuEntryActionViewItem {
         }
         if (this.label) {
             const div = h('div.keybinding').root;
-            const k = ( new KeybindingLabel(div, OS, { disableTitle: true, ...unthemedKeybindingLabelOptions }));
+            const k = this._register(( new KeybindingLabel(div, OS, { disableTitle: true, ...unthemedKeybindingLabelOptions })));
             k.set(kb);
             this.label.textContent = this._action.label;
             this.label.appendChild(div);

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.js

@@ -1,7 +1,13 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { Permutation } from '../../../../base/common/arrays.js';
 import { mapFindFirst } from '../../../../base/common/arraysFind.js';
 import { BugIndicatingError, onUnexpectedExternalError, onUnexpectedError } from '../../../../base/common/errors.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { observableValue, subtransaction, transaction } from '../../../../base/common/observableInternal/base.js';
+import { derived, derivedHandleChanges, derivedOpts } from '../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { observableSignal, recomputeInitiallyAndOnChange } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { commonPrefixLength, splitLinesIncludeSeparators } from '../../../../base/common/strings.js';
 import { isDefined } from '../../../../base/common/types.js';
 import { EditOperation } from '../../../common/core/editOperation.js';
@@ -12,15 +18,13 @@ import { InlineCompletionTriggerKind } from '../../../common/languages.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { GhostText, ghostTextsOrReplacementsEqual, ghostTextOrReplacementEquals } from './ghostText.js';
 import { InlineCompletionsSource } from './inlineCompletionsSource.js';
-import { SingleTextEdit } from './singleTextEdit.js';
-import { addPositions, lengthOfText, subtractPositions, Permutation, getNewRanges } from './utils.js';
+import { SingleTextEdit, TextEdit } from '../../../common/core/textEdit.js';
+import { subtractPositions, addPositions } from './utils.js';
 import { SnippetController2 } from '../../snippet/browser/snippetController2.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { observableValue, subtransaction, transaction } from '../../../../base/common/observableInternal/base.js';
-import { observableSignal, recomputeInitiallyAndOnChange } from '../../../../base/common/observableInternal/utils.js';
-import { derived, derivedHandleChanges, derivedOpts } from '../../../../base/common/observableInternal/derived.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { singleTextRemoveCommonPrefix, computeGhostText, singleTextEditAugments } from './singleTextEdit.js';
+import { TextLength } from '../../../common/core/textLength.js';
 var VersionIdChangeReason;
 ( (function(VersionIdChangeReason) {
     VersionIdChangeReason[VersionIdChangeReason["Undo"] = 0] = "Undo";
@@ -147,7 +151,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             const model = this.textModel;
             const suggestItem = this.selectedSuggestItem.read(reader);
             if (suggestItem) {
-                const suggestCompletionEdit = suggestItem.toSingleTextEdit().removeCommonPrefix(model);
+                const suggestCompletionEdit = singleTextRemoveCommonPrefix(suggestItem.toSingleTextEdit(), model);
                 const augmentation = this._computeAugmentation(suggestCompletionEdit, reader);
                 const isSuggestionPreviewEnabled = this._suggestPreviewEnabled.read(reader);
                 if (!isSuggestionPreviewEnabled && !augmentation) {
@@ -160,7 +164,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const edits = [fullEdit, ...getSecondaryEdits(this.textModel, positions, fullEdit)];
                 const ghostTexts = ( edits
                     .map(
-                    (edit, idx) => edit.computeGhostText(model, mode, positions[idx], fullEditPreviewLength)
+                    (edit, idx) => computeGhostText(edit, model, mode, positions[idx], fullEditPreviewLength)
                 ))
                     .filter(isDefined);
                 const primaryGhostText = ghostTexts[0] ?? ( new GhostText(fullEdit.range.endLineNumber, []));
@@ -179,7 +183,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const positions = this._positions.read(reader);
                 const edits = [replacement, ...getSecondaryEdits(this.textModel, positions, replacement)];
                 const ghostTexts = ( edits
-                    .map((edit, idx) => edit.computeGhostText(model, mode, positions[idx], 0)))
+                    .map((edit, idx) => computeGhostText(edit, model, mode, positions[idx], 0)))
                     .filter(isDefined);
                 if (!ghostTexts[0]) {
                     return undefined;
@@ -247,8 +251,8 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             : [this.selectedInlineCompletion.read(reader)].filter(isDefined);
         const augmentedCompletion = mapFindFirst(candidateInlineCompletions, completion => {
             let r = completion.toSingleTextEdit(reader);
-            r = r.removeCommonPrefix(model, Range.fromPositions(r.range.getStartPosition(), suggestCompletion.range.getEndPosition()));
-            return r.augments(suggestCompletion) ? { completion, edit: r } : undefined;
+            r = singleTextRemoveCommonPrefix(r, model, Range.fromPositions(r.range.getStartPosition(), suggestCompletion.range.getEndPosition()));
+            return singleTextEditAugments(r, suggestCompletion) ? { completion, edit: r } : undefined;
         });
         return augmentedCompletion;
     }
@@ -336,7 +340,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 }
             }
             return acceptUntilIndexExclusive;
-        });
+        }, 0 );
     }
     async acceptNextLine(editor) {
         await this._acceptNext(editor, (pos, text) => {
@@ -345,9 +349,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 return m.index + 1;
             }
             return text.length;
-        });
+        }, 1 );
     }
-    async _acceptNext(editor, getAcceptUntilIndex) {
+    async _acceptNext(editor, getAcceptUntilIndex, kind) {
         if (editor.getModel() !== this.textModel) {
             throw new BugIndicatingError();
         }
@@ -389,9 +393,11 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 this._isAcceptingPartially = false;
             }
             if (completion.source.provider.handlePartialAccept) {
-                const acceptedRange = Range.fromPositions(completion.range.getStartPosition(), addPositions(ghostTextPos, lengthOfText(partialGhostTextVal)));
+                const acceptedRange = Range.fromPositions(completion.range.getStartPosition(), TextLength.ofText(partialGhostTextVal).addToPosition(ghostTextPos));
                 const text = editor.getModel().getValueInRange(acceptedRange, 1 );
-                completion.source.provider.handlePartialAccept(completion.source.inlineCompletions, completion.sourceInlineCompletion, text.length);
+                completion.source.provider.handlePartialAccept(completion.source.inlineCompletions, completion.sourceInlineCompletion, text.length, {
+                    kind,
+                });
             }
         }
         finally {
@@ -399,13 +405,15 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }
     }
     handleSuggestAccepted(item) {
-        const itemEdit = item.toSingleTextEdit().removeCommonPrefix(this.textModel);
+        const itemEdit = singleTextRemoveCommonPrefix(item.toSingleTextEdit(), this.textModel);
         const augmentedCompletion = this._computeAugmentation(itemEdit, undefined);
         if (!augmentedCompletion) {
             return;
         }
         const inlineCompletion = augmentedCompletion.completion.inlineCompletion;
-        inlineCompletion.source.provider.handlePartialAccept?.(inlineCompletion.source.inlineCompletions, inlineCompletion.sourceInlineCompletion, itemEdit.text.length);
+        inlineCompletion.source.provider.handlePartialAccept?.(inlineCompletion.source.inlineCompletions, inlineCompletion.sourceInlineCompletion, itemEdit.text.length, {
+            kind: 2 ,
+        });
     }
 };
 InlineCompletionsModel = ( __decorate([
@@ -447,7 +455,8 @@ function substringPos(text, pos) {
 }
 function getEndPositionsAfterApplying(edits) {
     const sortPerm = Permutation.createSortPermutation(edits, (edit1, edit2) => Range.compareRangesUsingStarts(edit1.range, edit2.range));
-    const sortedNewRanges = getNewRanges(sortPerm.apply(edits));
+    const edit = ( new TextEdit(sortPerm.apply(edits)));
+    const sortedNewRanges = edit.getNewRanges();
     const newRanges = sortPerm.inverse().apply(sortedNewRanges);
     return ( newRanges.map(range => range.getEndPosition()));
 }

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.js

@@ -2,14 +2,17 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { matchesSubString } from '../../../../base/common/filters.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { disposableObservableValue, transaction } from '../../../../base/common/observableInternal/base.js';
+import { derived } from '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/observableInternal/autorun.js';
+import '../../../../base/common/observableInternal/utils.js';
 import { Position } from '../../../common/core/position.js';
 import { InlineCompletionTriggerKind } from '../../../common/languages.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { provideInlineCompletions } from './provideInlineCompletions.js';
-import { SingleTextEdit } from './singleTextEdit.js';
-import { disposableObservableValue, transaction } from '../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
+import { SingleTextEdit } from '../../../common/core/textEdit.js';
+import { singleTextRemoveCommonPrefix } from './singleTextEdit.js';
 let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
     constructor(textModel, versionId, _debounceValue, languageFeaturesService, languageConfigurationService) {
         super();
@@ -222,7 +225,7 @@ class InlineCompletionWithUpdatedRange {
         return ( new SingleTextEdit(this._getUpdatedRange(reader), this.inlineCompletion.insertText));
     }
     isVisible(model, cursorPosition, reader) {
-        const minimizedReplacement = this._toFilterTextReplacement(reader).removeCommonPrefix(model);
+        const minimizedReplacement = singleTextRemoveCommonPrefix(this._toFilterTextReplacement(reader), model);
         if (!this._isValid
             || !this.inlineCompletion.range.getStartPosition().equals(this._getUpdatedRange(reader).getStartPosition())
             || cursorPosition.lineNumber !== minimizedReplacement.range.startLineNumber) {