@codingame/monaco-vscode-api 5.2.0 → 6.0.0

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

@@ -1,22 +1,25 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { CharCode } from '../../../../base/common/charCode.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { language } from '../../../../base/common/platform.js';
 import { isBasicASCII, InvisibleCharacters } from '../../../../base/common/strings.js';
 import './unicodeHighlighter.css.js';
-import { EditorAction, registerEditorAction, registerEditorContribution } from '../../../browser/editorExtensions.js';
-import { inUntrustedWorkspace, unicodeHighlightConfigKeys } from '../../../common/config/editorOptions.js';
+import { EditorAction, registerEditorAction, registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
+import { EditorOption, inUntrustedWorkspace, unicodeHighlightConfigKeys } from '../../../common/config/editorOptions.js';
+import { TrackedRangeStickiness } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
-import { UnicodeTextModelHighlighter } from '../../../common/services/unicodeTextModelHighlighter.js';
+import { UnicodeTextModelHighlighter, UnicodeHighlighterReasonKind } from '../../../common/services/unicodeTextModelHighlighter.js';
 import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
 import { ILanguageService } from '../../../common/languages/language.js';
 import { isModelDecorationVisible, isModelDecorationInComment, isModelDecorationInString } from '../../../common/viewModel/viewModelDecorations.js';
-import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
+import { HoverParticipantRegistry, HoverAnchorType } from '../../hover/browser/hoverTypes.js';
 import { MarkdownHover, renderMarkdownHovers } from '../../hover/browser/markdownHoverParticipant.js';
 import { BannerController } from './bannerController.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
@@ -94,13 +97,13 @@ let UnicodeHighlighter = class UnicodeHighlighter extends Disposable {
             this._bannerClosed = false;
             this._updateHighlighter();
         }));
-        this._options = _editor.getOption(125 );
+        this._options = _editor.getOption(EditorOption.unicodeHighlighting);
         this._register(_workspaceTrustService.onDidChangeTrust(e => {
             this._updateHighlighter();
         }));
         this._register(_editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(125 )) {
-                this._options = _editor.getOption(125 );
+            if (e.hasChanged(EditorOption.unicodeHighlighting)) {
+                this._options = _editor.getOption(EditorOption.unicodeHighlighting);
                 this._updateHighlighter();
             }
         }));
@@ -339,7 +342,7 @@ let UnicodeHighlighterHoverParticipant = class UnicodeHighlighterHoverParticipan
         this.hoverOrdinal = 5;
     }
     computeSync(anchor, lineDecorations) {
-        if (!this._editor.hasModel() || anchor.type !== 1 ) {
+        if (!this._editor.hasModel() || anchor.type !== HoverAnchorType.Range) {
             return [];
         }
         const model = this._editor.getModel();
@@ -360,7 +363,7 @@ let UnicodeHighlighterHoverParticipant = class UnicodeHighlighterHoverParticipan
             const codePointStr = formatCodePointMarkdown(codePoint);
             let reason;
             switch (highlightInfo.reason.kind) {
-                case 0 : {
+                case UnicodeHighlighterReasonKind.Ambiguous: {
                     if (isBasicASCII(highlightInfo.reason.confusableWith)) {
                         reason = ( localizeWithPath(
                             _moduleId,
@@ -381,10 +384,10 @@ let UnicodeHighlighterHoverParticipant = class UnicodeHighlighterHoverParticipan
                     }
                     break;
                 }
-                case 1 :
+                case UnicodeHighlighterReasonKind.Invisible:
                     reason = ( localizeWithPath(_moduleId, 7, 'The character {0} is invisible.', codePointStr));
                     break;
-                case 2 :
+                case UnicodeHighlighterReasonKind.NonBasicAscii:
                     reason = ( localizeWithPath(
                         _moduleId,
                         8,
@@ -432,7 +435,7 @@ function formatCodePointMarkdown(codePoint) {
     return value;
 }
 function renderCodePointAsInlineCode(codePoint) {
-    if (codePoint === 96 ) {
+    if (codePoint === CharCode.BackTick) {
         return '`` ` ``';
     }
     return '`' + String.fromCodePoint(codePoint) + '`';
@@ -454,7 +457,7 @@ class Decorations {
         if (!options) {
             options = ModelDecorationOptions.createDynamic({
                 description: 'unicode-highlight',
-                stickiness: 1 ,
+                stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
                 className: 'unicode-highlight',
                 showIfCollapsed: true,
                 overviewRuler: null,
@@ -485,7 +488,7 @@ class DisableHighlightingInCommentsAction extends EditorAction {
         }
     }
     async runAction(configurationService) {
-        await configurationService.updateValue(unicodeHighlightConfigKeys.includeComments, false, 2 );
+        await configurationService.updateValue(unicodeHighlightConfigKeys.includeComments, false, ConfigurationTarget.USER);
     }
 }
 class DisableHighlightingInStringsAction extends EditorAction {
@@ -506,7 +509,7 @@ class DisableHighlightingInStringsAction extends EditorAction {
         }
     }
     async runAction(configurationService) {
-        await configurationService.updateValue(unicodeHighlightConfigKeys.includeStrings, false, 2 );
+        await configurationService.updateValue(unicodeHighlightConfigKeys.includeStrings, false, ConfigurationTarget.USER);
     }
 }
 class DisableHighlightingOfAmbiguousCharactersAction extends EditorAction {
@@ -527,7 +530,7 @@ class DisableHighlightingOfAmbiguousCharactersAction extends EditorAction {
         }
     }
     async runAction(configurationService) {
-        await configurationService.updateValue(unicodeHighlightConfigKeys.ambiguousCharacters, false, 2 );
+        await configurationService.updateValue(unicodeHighlightConfigKeys.ambiguousCharacters, false, ConfigurationTarget.USER);
     }
 }
 class DisableHighlightingOfInvisibleCharactersAction extends EditorAction {
@@ -548,7 +551,7 @@ class DisableHighlightingOfInvisibleCharactersAction extends EditorAction {
         }
     }
     async runAction(configurationService) {
-        await configurationService.updateValue(unicodeHighlightConfigKeys.invisibleCharacters, false, 2 );
+        await configurationService.updateValue(unicodeHighlightConfigKeys.invisibleCharacters, false, ConfigurationTarget.USER);
     }
 }
 class DisableHighlightingOfNonBasicAsciiCharactersAction extends EditorAction {
@@ -569,7 +572,7 @@ class DisableHighlightingOfNonBasicAsciiCharactersAction extends EditorAction {
         }
     }
     async runAction(configurationService) {
-        await configurationService.updateValue(unicodeHighlightConfigKeys.nonBasicASCII, false, 2 );
+        await configurationService.updateValue(unicodeHighlightConfigKeys.nonBasicASCII, false, ConfigurationTarget.USER);
     }
 }
 class ShowExcludeOptions extends EditorAction {
@@ -604,7 +607,7 @@ class ShowExcludeOptions extends EditorAction {
             ));
         }
         const options = [];
-        if (reason.kind === 0 ) {
+        if (reason.kind === UnicodeHighlighterReasonKind.Ambiguous) {
             for (const locale of reason.notAmbiguousInLocales) {
                 options.push({
                     label: ( localizeWithPath(
@@ -631,15 +634,15 @@ class ShowExcludeOptions extends EditorAction {
             const action = ( (new DisableHighlightingInStringsAction()));
             options.push({ label: action.label, run: async () => action.runAction(configurationService) });
         }
-        if (reason.kind === 0 ) {
+        if (reason.kind === UnicodeHighlighterReasonKind.Ambiguous) {
             const action = ( (new DisableHighlightingOfAmbiguousCharactersAction()));
             options.push({ label: action.label, run: async () => action.runAction(configurationService) });
         }
-        else if (reason.kind === 1 ) {
+        else if (reason.kind === UnicodeHighlighterReasonKind.Invisible) {
             const action = ( (new DisableHighlightingOfInvisibleCharactersAction()));
             options.push({ label: action.label, run: async () => action.runAction(configurationService) });
         }
-        else if (reason.kind === 2 ) {
+        else if (reason.kind === UnicodeHighlighterReasonKind.NonBasicAscii) {
             const action = ( (new DisableHighlightingOfNonBasicAsciiCharactersAction()));
             options.push({ label: action.label, run: async () => action.runAction(configurationService) });
         }
@@ -664,7 +667,7 @@ async function excludeCharFromBeingHighlighted(configurationService, charCodes)
     for (const charCode of charCodes) {
         value[String.fromCodePoint(charCode)] = true;
     }
-    await configurationService.updateValue(unicodeHighlightConfigKeys.allowedCharacters, value, 2 );
+    await configurationService.updateValue(unicodeHighlightConfigKeys.allowedCharacters, value, ConfigurationTarget.USER);
 }
 async function excludeLocaleFromBeingHighlighted(configurationService, locales) {
     const existingValue = configurationService.inspect(unicodeHighlightConfigKeys.allowedLocales).user?.value;
@@ -678,7 +681,7 @@ async function excludeLocaleFromBeingHighlighted(configurationService, locales)
     for (const locale of locales) {
         value[locale] = true;
     }
-    await configurationService.updateValue(unicodeHighlightConfigKeys.allowedLocales, value, 2 );
+    await configurationService.updateValue(unicodeHighlightConfigKeys.allowedLocales, value, ConfigurationTarget.USER);
 }
 function expectNever(value) {
     throw ( (new Error(`Unexpected value: ${value}`)));
@@ -687,6 +690,6 @@ registerEditorAction(DisableHighlightingOfAmbiguousCharactersAction);
 registerEditorAction(DisableHighlightingOfInvisibleCharactersAction);
 registerEditorAction(DisableHighlightingOfNonBasicAsciiCharactersAction);
 registerEditorAction(ShowExcludeOptions);
-registerEditorContribution(UnicodeHighlighter.ID, UnicodeHighlighter, 1 );
+registerEditorContribution(UnicodeHighlighter.ID, UnicodeHighlighter, EditorContributionInstantiation.AfterFirstRender);
 HoverParticipantRegistry.register(UnicodeHighlighterHoverParticipant);
 export { DisableHighlightingInCommentsAction, DisableHighlightingInStringsAction, DisableHighlightingOfAmbiguousCharactersAction, DisableHighlightingOfInvisibleCharactersAction, DisableHighlightingOfNonBasicAsciiCharactersAction, ShowExcludeOptions, UnicodeHighlighter, UnicodeHighlighterHoverParticipant, warningIcon };

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

@@ -1,8 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { basename } from '../../../../base/common/resources.js';
-import { registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 const _moduleId = "vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators";
@@ -21,10 +22,10 @@ let UnusualLineTerminatorsDetector = class UnusualLineTerminatorsDetector extend
         this._dialogService = _dialogService;
         this._codeEditorService = _codeEditorService;
         this._isPresentingDialog = false;
-        this._config = this._editor.getOption(126 );
+        this._config = this._editor.getOption(EditorOption.unusualLineTerminators);
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(126 )) {
-                this._config = this._editor.getOption(126 );
+            if (e.hasChanged(EditorOption.unusualLineTerminators)) {
+                this._config = this._editor.getOption(EditorOption.unusualLineTerminators);
                 this._checkForUnusualLineTerminators();
             }
         }));
@@ -54,7 +55,7 @@ let UnusualLineTerminatorsDetector = class UnusualLineTerminatorsDetector extend
         if (ignoreState === true) {
             return;
         }
-        if (this._editor.getOption(91 )) {
+        if (this._editor.getOption(EditorOption.readOnly)) {
             return;
         }
         if (this._config === 'auto') {
@@ -94,5 +95,5 @@ UnusualLineTerminatorsDetector = ( (__decorate([
     ( (__param(1, IDialogService))),
     ( (__param(2, ICodeEditorService)))
 ], UnusualLineTerminatorsDetector)));
-registerEditorContribution(UnusualLineTerminatorsDetector.ID, UnusualLineTerminatorsDetector, 1 );
+registerEditorContribution(UnusualLineTerminatorsDetector.ID, UnusualLineTerminatorsDetector, EditorContributionInstantiation.AfterFirstRender);
 export { UnusualLineTerminatorsDetector };

package/vscode/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.js

@@ -1,5 +1,5 @@
 import './highlightDecorations.css.js';
-import { OverviewRulerLane } from '../../../common/model.js';
+import { TrackedRangeStickiness, OverviewRulerLane, MinimapPosition } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { DocumentHighlightKind } from '../../../common/languages.js';
 import { localizeWithPath } from '../../../../nls.js';
@@ -59,7 +59,7 @@ const overviewRulerWordHighlightTextForeground = registerColor('editorOverviewRu
 )), true);
 const _WRITE_OPTIONS = ModelDecorationOptions.register({
     description: 'word-highlight-strong',
-    stickiness: 1 ,
+    stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
     className: 'wordHighlightStrong',
     overviewRuler: {
         color: themeColorFromId(overviewRulerWordHighlightStrongForeground),
@@ -67,12 +67,12 @@ const _WRITE_OPTIONS = ModelDecorationOptions.register({
     },
     minimap: {
         color: themeColorFromId(minimapSelectionOccurrenceHighlight),
-        position: 1
+        position: MinimapPosition.Inline
     },
 });
 const _TEXT_OPTIONS = ModelDecorationOptions.register({
     description: 'word-highlight-text',
-    stickiness: 1 ,
+    stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
     className: 'wordHighlightText',
     overviewRuler: {
         color: themeColorFromId(overviewRulerWordHighlightTextForeground),
@@ -80,12 +80,12 @@ const _TEXT_OPTIONS = ModelDecorationOptions.register({
     },
     minimap: {
         color: themeColorFromId(minimapSelectionOccurrenceHighlight),
-        position: 1
+        position: MinimapPosition.Inline
     },
 });
 const _SELECTION_HIGHLIGHT_OPTIONS = ModelDecorationOptions.register({
     description: 'selection-highlight-overview',
-    stickiness: 1 ,
+    stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
     className: 'selectionHighlight',
     overviewRuler: {
         color: themeColorFromId(overviewRulerSelectionHighlightForeground),
@@ -93,17 +93,17 @@ const _SELECTION_HIGHLIGHT_OPTIONS = ModelDecorationOptions.register({
     },
     minimap: {
         color: themeColorFromId(minimapSelectionOccurrenceHighlight),
-        position: 1
+        position: MinimapPosition.Inline
     },
 });
 const _SELECTION_HIGHLIGHT_OPTIONS_NO_OVERVIEW = ModelDecorationOptions.register({
     description: 'selection-highlight',
-    stickiness: 1 ,
+    stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
     className: 'selectionHighlight',
 });
 const _REGULAR_OPTIONS = ModelDecorationOptions.register({
     description: 'word-highlight',
-    stickiness: 1 ,
+    stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
     className: 'wordHighlight',
     overviewRuler: {
         color: themeColorFromId(overviewRulerWordHighlightForeground),
@@ -111,7 +111,7 @@ const _REGULAR_OPTIONS = ModelDecorationOptions.register({
     },
     minimap: {
         color: themeColorFromId(minimapSelectionOccurrenceHighlight),
-        position: 1
+        position: MinimapPosition.Inline
     },
 });
 function getHighlightDecorationOptions(kind) {

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

@@ -5,11 +5,14 @@ import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { first, timeout, createCancelablePromise } from '../../../../base/common/async.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { onUnexpectedError, onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { isDiffEditor } from '../../../browser/editorBrowser.js';
-import { registerModelAndPositionCommand, registerEditorContribution, registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
+import { registerModelAndPositionCommand, registerEditorContribution, registerEditorAction, EditorContributionInstantiation, EditorAction } from '../../../browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
+import { CursorChangeReason } from '../../../common/cursorEvents.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { DocumentHighlightKind } from '../../../common/languages.js';
 import { shouldSynchronizeModel } from '../../../common/model.js';
@@ -17,6 +20,7 @@ import { ILanguageFeaturesService } from '../../../common/services/languageFeatu
 import { getHighlightDecorationOptions } from './highlightDecorations.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { ResourceMap } from '../../../../base/common/map.js';
 import { score } from '../../../common/languageSelector.js';
@@ -221,7 +225,7 @@ let WordHighlighter = class WordHighlighter {
         this.codeEditorService = codeEditorService;
         this._hasWordHighlights = ctxHasWordHighlights.bindTo(contextKeyService);
         this._ignorePositionChangeEvent = false;
-        this.occurrencesHighlight = this.editor.getOption(81 );
+        this.occurrencesHighlight = this.editor.getOption(EditorOption.occurrencesHighlight);
         this.model = this.editor.getModel();
         this.toUnhook.add(editor.onDidChangeCursorPosition((e) => {
             if (this._ignorePositionChangeEvent) {
@@ -254,7 +258,7 @@ let WordHighlighter = class WordHighlighter {
             }
         }));
         this.toUnhook.add(editor.onDidChangeConfiguration((e) => {
-            const newValue = this.editor.getOption(81 );
+            const newValue = this.editor.getOption(EditorOption.occurrencesHighlight);
             if (this.occurrencesHighlight !== newValue) {
                 this.occurrencesHighlight = newValue;
                 this._stopAll();
@@ -415,7 +419,7 @@ let WordHighlighter = class WordHighlighter {
             this._stopAll();
             return;
         }
-        if (e.reason !== 3  && this.editor.getModel()?.uri.scheme !== Schemas.vscodeNotebookCell) {
+        if (e.reason !== CursorChangeReason.Explicit && this.editor.getModel()?.uri.scheme !== Schemas.vscodeNotebookCell) {
             this._stopAll();
             return;
         }
@@ -538,10 +542,10 @@ let WordHighlighter = class WordHighlighter {
     }
     computeWithModel(model, selection, word, otherModels) {
         if (!otherModels.length) {
-            return computeOccurencesAtPosition(this.providers, model, selection, word, this.editor.getOption(131 ));
+            return computeOccurencesAtPosition(this.providers, model, selection, word, this.editor.getOption(EditorOption.wordSeparators));
         }
         else {
-            return computeOccurencesMultiModel(this.multiDocumentProviders, model, selection, word, this.editor.getOption(131 ), otherModels);
+            return computeOccurencesMultiModel(this.multiDocumentProviders, model, selection, word, this.editor.getOption(EditorOption.wordSeparators), otherModels);
         }
     }
     _beginRenderDecorations() {
@@ -693,8 +697,8 @@ class NextWordHighlightAction extends WordHighlightNavigationAction {
             precondition: ctxHasWordHighlights,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 65 ,
-                weight: 100
+                primary: KeyCode.F7,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -708,8 +712,8 @@ class PrevWordHighlightAction extends WordHighlightNavigationAction {
             precondition: ctxHasWordHighlights,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 1024  | 65 ,
-                weight: 100
+                primary: KeyMod$1.Shift | KeyCode.F7,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -724,7 +728,7 @@ class TriggerWordHighlightAction extends EditorAction {
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
                 primary: 0,
-                weight: 100
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -736,7 +740,7 @@ class TriggerWordHighlightAction extends EditorAction {
         controller.restoreViewState(true);
     }
 }
-registerEditorContribution(WordHighlighterContribution.ID, WordHighlighterContribution, 0 );
+registerEditorContribution(WordHighlighterContribution.ID, WordHighlighterContribution, EditorContributionInstantiation.Eager);
 registerEditorAction(NextWordHighlightAction);
 registerEditorAction(PrevWordHighlightAction);
 registerEditorAction(TriggerWordHighlightAction);