@codingame/monaco-vscode-api 2.2.2 → 3.1.0

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js

@@ -2,7 +2,7 @@ import { VSBuffer } from '../../../../../base/common/buffer.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ILanguageService } from '../../../../../editor/common/languages/language.js';
-import { localizeWithPath, localize2WithPath } from '../../../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
 import { Action2 } from '../../../../../platform/actions/common/actions.js';
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
 import '../../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
@@ -23,14 +23,11 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                    'merge.dev.copyState',
-                    'Copy Merge Editor State as JSON'
-                )),
-                original: 'Copy Merge Editor State as JSON',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
+                'merge.dev.copyState',
+                "Copy Merge Editor State as JSON"
+            )),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -88,14 +85,11 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                    'merge.dev.saveContentsToFolder',
-                    'Save Merge Editor State to Folder'
-                )),
-                original: 'Save Merge Editor State to Folder',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
+                'merge.dev.saveContentsToFolder',
+                "Save Merge Editor State to Folder"
+            )),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -170,14 +164,11 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: 'merge.dev.loadContentsFromFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
-                    'merge.dev.loadContentsFromFolder',
-                    'Load Merge Editor State from Folder'
-                )),
-                original: 'Load Merge Editor State from Folder',
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/devCommands',
+                'merge.dev.loadContentsFromFolder',
+                "Load Merge Editor State from Folder"
+            )),
             icon: Codicon.layoutCentered,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.js

@@ -4,7 +4,7 @@ import { Extensions } from '../../../../platform/configuration/common/configurat
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { EditorPaneDescriptor } from '../../../browser/editor.js';
-import { Extensions as Extensions$1 } from '../../../common/contributions.js';
+import { Extensions as Extensions$1, registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { EditorExtensions } from '../../../common/editor.js';
 import { OpenResultResource, SetMixedLayout, SetColumnLayout, OpenMergeEditor, OpenBaseFile, ShowNonConflictingChanges, ShowHideBase, ShowHideTopBase, ShowHideCenterBase, GoToNextUnhandledConflict, GoToPreviousUnhandledConflict, ToggleActiveConflictInput1, ToggleActiveConflictInput2, CompareInput1WithBaseCommand, CompareInput2WithBaseCommand, AcceptAllInput1, AcceptAllInput2, ResetToBaseAndAutoMergeCommand, AcceptMerge, ResetCloseWithConflictsChoice } from './commands/commands.js';
 import { MergeEditorCopyContentsToJSON, MergeEditorSaveContentsToFolder, MergeEditorLoadContentsFromFolder } from './commands/devCommands.js';
@@ -71,6 +71,4 @@ registerAction2(MergeEditorLoadContentsFromFolder);
 ( Registry
     .as(Extensions$1.Workbench))
     .registerWorkbenchContribution(MergeEditorOpenHandlerContribution, 3 );
-( Registry
-    .as(Extensions$1.Workbench))
-    .registerWorkbenchContribution(MergeEditorResolverContribution, 1 );
+registerWorkbenchContribution2(MergeEditorResolverContribution.ID, MergeEditorResolverContribution, 1 );

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -12,7 +12,8 @@ import { TextModelDiffs } from './textModelDiffs.js';
 import { leftJoin } from '../utils.js';
 import { ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateKind } from './modifiedBaseRange.js';
 import { derived } from '../../../../../base/common/observableInternal/derived.js';
-import { waitForState, keepObserved } from '../../../../../base/common/observableInternal/utils.js';
+import { waitForState } from '../../../../../base/common/observableInternal/promise.js';
+import { keepObserved } from '../../../../../base/common/observableInternal/utils.js';
 import { autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
 import { transaction, observableValue } from '../../../../../base/common/observableInternal/base.js';
 let MergeEditorModel = class MergeEditorModel extends EditorModel {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.js

@@ -10,32 +10,32 @@ import { autorun } from '../../../../../base/common/observableInternal/autorun.j
 import { observableSignal } from '../../../../../base/common/observableInternal/utils.js';
 class TextModelDiffs extends Disposable {
     get isApplyingChange() {
-        return this.barrier.isActive;
+        return this._barrier.isActive;
     }
     constructor(baseTextModel, textModel, diffComputer) {
         super();
         this.baseTextModel = baseTextModel;
         this.textModel = textModel;
         this.diffComputer = diffComputer;
-        this.recomputeCount = 0;
+        this._recomputeCount = 0;
         this._state = observableValue(this, 1 );
         this._diffs = observableValue(this, []);
-        this.barrier = ( new ReentrancyBarrier());
-        this.isDisposed = false;
-        this.isInitializing = true;
+        this._barrier = ( new ReentrancyBarrier());
+        this._isDisposed = false;
+        this._isInitializing = true;
         const recomputeSignal = observableSignal('recompute');
         this._register(autorun(reader => {
             recomputeSignal.read(reader);
-            this.recompute(reader);
+            this._recompute(reader);
         }));
-        this._register(baseTextModel.onDidChangeContent(this.barrier.makeExclusive(() => {
+        this._register(baseTextModel.onDidChangeContent(this._barrier.makeExclusive(() => {
             recomputeSignal.trigger(undefined);
         })));
-        this._register(textModel.onDidChangeContent(this.barrier.makeExclusive(() => {
+        this._register(textModel.onDidChangeContent(this._barrier.makeExclusive(() => {
             recomputeSignal.trigger(undefined);
         })));
         this._register(toDisposable(() => {
-            this.isDisposed = true;
+            this._isDisposed = true;
         }));
     }
     get state() {
@@ -44,21 +44,21 @@ class TextModelDiffs extends Disposable {
     get diffs() {
         return this._diffs;
     }
-    recompute(reader) {
-        this.recomputeCount++;
-        const currentRecomputeIdx = this.recomputeCount;
+    _recompute(reader) {
+        this._recomputeCount++;
+        const currentRecomputeIdx = this._recomputeCount;
         if (this._state.get() === 1 ) {
-            this.isInitializing = true;
+            this._isInitializing = true;
         }
         transaction(tx => {
-            this._state.set(this.isInitializing ? 1  : 3 , tx, 0 );
+            this._state.set(this._isInitializing ? 1  : 3 , tx, 0 );
         });
         const result = this.diffComputer.computeDiff(this.baseTextModel, this.textModel, reader);
         result.then((result) => {
-            if (this.isDisposed) {
+            if (this._isDisposed) {
                 return;
             }
-            if (currentRecomputeIdx !== this.recomputeCount) {
+            if (currentRecomputeIdx !== this._recomputeCount) {
                 return;
             }
             transaction(tx => {
@@ -69,7 +69,7 @@ class TextModelDiffs extends Disposable {
                 else {
                     this._state.set(4 , tx, 1 );
                 }
-                this.isInitializing = false;
+                this._isInitializing = false;
             });
         });
     }
@@ -89,7 +89,7 @@ class TextModelDiffs extends Disposable {
             if (len === diffs.length) {
                 throw new BugIndicatingError();
             }
-            this.barrier.runExclusivelyOrThrow(() => {
+            this._barrier.runExclusivelyOrThrow(() => {
                 const edits = diffToRemove.getReverseLineEdit().toEdits(this.textModel.getLineCount());
                 this.textModel.pushEditOperations(null, edits, () => null, group);
             });
@@ -127,7 +127,7 @@ class TextModelDiffs extends Disposable {
             firstAfter = true;
             newDiffs.push(editMapping.addOutputLineDelta(delta));
         }
-        this.barrier.runExclusivelyOrThrow(() => {
+        this._barrier.runExclusivelyOrThrow(() => {
             const edits = ( new LineRangeEdit(edit.range.delta(delta), edit.newLines)).toEdits(this.textModel.getLineCount());
             this.textModel.pushEditOperations(null, edits, () => null, group);
         });

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js

@@ -42,7 +42,7 @@ class ConflictActionsFactory extends Disposable {
         this._editor.getContainerDomNode().style.setProperty(fontFeaturesVar, editorFontInfo.fontFeatureSettings);
     }
     _getLayoutInfo() {
-        const lineHeightFactor = Math.max(1.3, this._editor.getOption(66 ) / this._editor.getOption(52 ));
+        const lineHeightFactor = Math.max(1.3, this._editor.getOption(67 ) / this._editor.getOption(52 ));
         let fontSize = this._editor.getOption(19 );
         if (!fontSize || fontSize < 5) {
             fontSize = (this._editor.getOption(52 ) * .9) | 0;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js

@@ -577,6 +577,7 @@ MergeEditorOpenHandlerContribution = ( __decorate([
     ( __param(1, ICodeEditorService))
 ], MergeEditorOpenHandlerContribution));
 let MergeEditorResolverContribution = class MergeEditorResolverContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.mergeEditorResolver'; }
     constructor(editorResolverService, instantiationService) {
         super();
         const mergeEditorInputFactory = (mergeEditor) => {

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

@@ -17,7 +17,7 @@ registerAction2(class CopyCellOutputAction extends Action2 {
             title: ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/controller/cellOutputActions',
                 'notebookActions.copyOutput',
-                "Copy Output"
+                "Copy Cell Output"
             )),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
@@ -34,12 +34,26 @@ registerAction2(class CopyCellOutputAction extends Action2 {
             return;
         }
         let outputViewModel;
-        if ('outputId' in outputContext && typeof outputContext.outputId === 'string') {
+        if (outputContext && 'outputId' in outputContext && typeof outputContext.outputId === 'string') {
             outputViewModel = getOutputViewModelFromId(outputContext.outputId, notebookEditor);
         }
-        else {
+        else if (outputContext && 'outputViewModel' in outputContext) {
             outputViewModel = outputContext.outputViewModel;
         }
+        if (!outputViewModel) {
+            const activeCell = notebookEditor.getActiveCell();
+            if (!activeCell) {
+                return;
+            }
+            if (activeCell.focusedOutputId !== undefined) {
+                outputViewModel = activeCell.outputsViewModels.find(output => {
+                    return output.model.outputId === activeCell.focusedOutputId;
+                });
+            }
+            else {
+                outputViewModel = activeCell.outputsViewModels.find(output => output.pickedMimeType?.isTrusted);
+            }
+        }
         if (!outputViewModel) {
             return;
         }

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

@@ -1,32 +1,37 @@
 import { Mimes } from '../../../../../base/common/mime.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { getIconClasses } from '../../../../../editor/common/services/getIconClasses.js';
 import { IModelService } from '../../../../../editor/common/services/model.js';
-import { ILanguageService } from '../../../../../editor/common/languages/language.js';
-import { localizeWithPath } from '../../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../../nls.js';
 import { registerAction2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { InputFocusedContextKey, InputFocusedContext } from '../../../../../platform/contextkey/common/contextkeys.js';
+import '../../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js';
+import { CTX_INLINE_CHAT_FOCUSED } from '../../../inlineChat/common/inlineChat.js';
 import { runDeleteAction, changeCellToKind } from './cellOperations.js';
 import { NotebookCellAction, CELL_TITLE_CELL_GROUP_ID, findTargetCellEditor, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, executeNotebookCondition, CELL_TITLE_OUTPUT_GROUP_ID, NotebookAction } from './coreActions.js';
-import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_IS_ACTIVE_EDITOR } from '../../common/notebookContextKeys.js';
-import { QUIT_EDIT_CELL_COMMAND_ID, CellEditState, CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE } from '../notebookBrowser.js';
-import { editIcon, stopEditIcon, deleteCellIcon, clearIcon } from '../notebookIcons.js';
+import { NotebookIndentUsingTabs, NotebookIndentUsingSpaces, NotebookChangeTabDisplaySize, NotebookIndentationToTabsAction, NotebookIndentationToSpacesAction } from './notebookIndentationActions.js';
+import { QUIT_EDIT_CELL_COMMAND_ID, CellEditState, CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE, getNotebookEditorFromEditorPane } from '../notebookBrowser.js';
 import { CellKind, NotebookCellExecutionState, NotebookSetting } from '../../common/notebookCommon.js';
-import { ILanguageDetectionService } from '../../../../services/languageDetection/common/languageDetectionWorkerService.js';
+import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_IS_ACTIVE_EDITOR } from '../../common/notebookContextKeys.js';
 import { INotebookExecutionStateService } from '../../common/notebookExecutionStateService.js';
-import { INotificationService } from '../../../../../platform/notification/common/notification.js';
 import { INotebookKernelService } from '../../common/notebookKernelService.js';
-import '../../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { ILanguageDetectionService } from '../../../../services/languageDetection/common/languageDetectionWorkerService.js';
+import { editIcon, stopEditIcon, deleteCellIcon, clearIcon } from '../notebookIcons.js';
 import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
 const CLEAR_ALL_CELLS_OUTPUTS_COMMAND_ID = 'notebook.clearAllCellsOutputs';
 const EDIT_CELL_COMMAND_ID = 'notebook.cell.edit';
 const DELETE_CELL_COMMAND_ID = 'notebook.cell.delete';
 const CLEAR_CELL_OUTPUTS_COMMAND_ID = 'notebook.cell.clearOutputs';
+const SELECT_NOTEBOOK_INDENTATION_ID = 'notebook.selectIndentation';
 registerAction2(class EditCellAction extends NotebookCellAction {
     constructor() {
         super({
@@ -66,7 +71,7 @@ registerAction2(class EditCellAction extends NotebookCellAction {
         }
     }
 });
-const quitEditCondition = ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, InputFocusedContext));
+const quitEditCondition = ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, InputFocusedContext, ( CTX_INLINE_CHAT_FOCUSED.toNegated())));
 registerAction2(class QuitEditCellAction extends NotebookCellAction {
     constructor() {
         super({
@@ -489,11 +494,11 @@ registerAction2(class DetectCellLanguageAction extends NotebookCellAction {
     constructor() {
         super({
             id: DETECT_CELL_LANGUAGE,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/notebook/browser/controller/editActions',
                 'detectLanguage',
-                'Accept Detected Language for Cell'
-            )), original: 'Accept Detected Language for Cell' },
+                "Accept Detected Language for Cell"
+            )),
             f1: true,
             precondition: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE)),
             keybinding: { primary: 34  | 512  | 1024 , weight: 200  }
@@ -536,4 +541,86 @@ async function setCellToLanguage(languageId, context) {
         context.notebookEditor.textModel.applyEdits([{ editType: 4 , index, language: languageId }], true, undefined, () => undefined, undefined, !context.notebookEditor.isReadOnly);
     }
 }
-export { CLEAR_CELL_OUTPUTS_COMMAND_ID };
+registerAction2(class SelectNotebookIndentation extends NotebookAction {
+    constructor() {
+        super({
+            id: SELECT_NOTEBOOK_INDENTATION_ID,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/controller/editActions',
+                'selectNotebookIndentation',
+                'Select Indentation'
+            )),
+            f1: true,
+            precondition: ( ContextKeyExpr.and(
+                NOTEBOOK_IS_ACTIVE_EDITOR,
+                NOTEBOOK_EDITOR_EDITABLE,
+                NOTEBOOK_CELL_EDITABLE
+            )),
+        });
+    }
+    async runWithContext(accessor, context) {
+        await this.showNotebookIndentationPicker(accessor, context);
+    }
+    async showNotebookIndentationPicker(accessor, context) {
+        const quickInputService = accessor.get(IQuickInputService);
+        const editorService = accessor.get(IEditorService);
+        const instantiationService = accessor.get(IInstantiationService);
+        const activeNotebook = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+        if (!activeNotebook || activeNotebook.isDisposed) {
+            return quickInputService.pick([{ label: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/editActions',
+                'noNotebookEditor',
+                "No notebook editor active at this time"
+            )) }]);
+        }
+        if (activeNotebook.isReadOnly) {
+            return quickInputService.pick([{ label: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/editActions',
+                'noWritableCodeEditor',
+                "The active notebook editor is read-only."
+            )) }]);
+        }
+        const picks = ( [
+            (
+            new NotebookIndentUsingTabs()),
+            (
+            new NotebookIndentUsingSpaces()),
+            (
+            new NotebookChangeTabDisplaySize()),
+            (
+            new NotebookIndentationToTabsAction()),
+            (
+            new NotebookIndentationToSpacesAction())
+        ].map(item => {
+            return {
+                id: item.desc.id,
+                label: ( item.desc.title.toString()),
+                run: () => {
+                    instantiationService.invokeFunction(item.run);
+                }
+            };
+        }));
+        picks.splice(3, 0, { type: 'separator', label: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/editActions',
+            'indentConvert',
+            "convert file"
+        )) });
+        picks.unshift({ type: 'separator', label: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/editActions',
+            'indentView',
+            "change view"
+        )) });
+        const action = await quickInputService.pick(picks, { placeHolder: ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/controller/editActions',
+            'pickAction',
+            "Select Action"
+        )), matchOnDetail: true });
+        if (!action) {
+            return;
+        }
+        action.run();
+        context.notebookEditor.focus();
+        return;
+    }
+});
+export { CLEAR_CELL_OUTPUTS_COMMAND_ID, SELECT_NOTEBOOK_INDENTATION_ID };

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

@@ -111,7 +111,7 @@ const NOTEBOOK_FOLD_COMMAND_LABEL = ( localizeWithPath(
     'fold.cell',
     "Fold Cell"
 ));
-const NOTEBOOK_UNFOLD_COMMAND_LABEL = ( localizeWithPath(
+const NOTEBOOK_UNFOLD_COMMAND_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/notebook/browser/controller/foldingController',
     'unfold.cell',
     "Unfold Cell"
@@ -212,7 +212,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.unfold',
-            title: { value: NOTEBOOK_UNFOLD_COMMAND_LABEL, original: 'Unfold Cell' },
+            title: NOTEBOOK_UNFOLD_COMMAND_LABEL,
             category: NOTEBOOK_ACTIONS_CATEGORY,
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),