@codingame/monaco-vscode-scm-service-override 24.2.0 → 25.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "24.2.0",
+  "version": "25.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - scm service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "24.2.0"
+    "@codingame/monaco-vscode-api": "25.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/contrib/scm/browser/activity.js

@@ -46,7 +46,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
             { name: 'activeRepositoryBranchName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryBranchName.key, }
         ]);
         this._countBadgeConfig = observableConfigValue('scm.countBadge', 'all', this.configurationService);
-        this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
+        this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => Iterable.filter(this.scmService.repositories, r => r.provider.isHidden !== true));
         this._activeRepositoryHistoryItemRefName = derived(reader => {
             const activeRepository = this.scmViewService.activeRepository.read(reader);
             const historyProvider = activeRepository?.repository.provider.historyProvider.read(reader);
@@ -103,7 +103,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (count === 0) {
             return;
         }
-        const badge = ( new NumberBadge(count, num => ( localize(10406, '{0} pending changes', num))));
+        const badge = ( new NumberBadge(count, num => ( localize(10436, '{0} pending changes', num))));
         store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
     }
     _updateStatusBar(activeRepository, commands, store) {
@@ -118,7 +118,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
             const tooltip = `${label}${command.tooltip ? ` - ${command.tooltip}` : ''}`;
             const genericCommandName = getStatusBarCommandGenericName(command);
             const statusbarEntry = {
-                name: ( localize(10407, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ''),
+                name: ( localize(10437, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ''),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
@@ -128,10 +128,10 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                 this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, StatusbarAlignment.LEFT, 10000) :
                 this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, StatusbarAlignment.LEFT, { location: { id: `status.scm.${index - 1}`, priority: 10000 }, alignment: StatusbarAlignment.RIGHT, compact: true }));
         }
-        if (this.scmService.repositoryCount > 1) {
+        if (this.scmViewService.repositories.length > 1) {
             const icon = getSCMRepositoryIcon(activeRepository, activeRepository.repository);
             const repositoryStatusbarEntry = {
-                name: ( localize(10408, "Source Control Provider")),
+                name: ( localize(10438, "Source Control Provider")),
                 text: `$(${icon.id}) ${activeRepository.repository.provider.name}`,
                 ariaLabel: label,
                 tooltip: label,
@@ -160,8 +160,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
         this.scmService = scmService;
         this.uriIdentityService = uriIdentityService;
         this._onDidRepositoryChange = ( new Emitter());
-        const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(10409, "Whether the active resource has changes"))));
-        const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(10410, "The active resource's repository"))));
+        const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(10439, "Whether the active resource has changes"))));
+        const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(10440, "The active resource's repository"))));
         this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
         this._register(autorun((reader) => {
             for (const repository of this._repositories.read(reader)) {

package/vscode/src/vs/workbench/contrib/scm/browser/menus.js

@@ -305,7 +305,7 @@ SCMMenus = ( __decorate([
     ( __param(1, IInstantiationService))
 ], SCMMenus));
 MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
-    title: ( localize(10411, "Share")),
+    title: ( localize(10441, "Share")),
     submenu: MenuId.SCMResourceContextShare,
     group: '45_share',
     order: 3,

package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.js

@@ -61,7 +61,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
         const gutter = decorations === 'all' || decorations === 'gutter';
         const overview = decorations === 'all' || decorations === 'overview';
         const minimap = decorations === 'all' || decorations === 'minimap';
-        const diffAdded = ( localize(10412, 'Added lines'));
+        const diffAdded = ( localize(10442, 'Added lines'));
         const diffAddedOptions = {
             gutter,
             overview: { active: overview, color: overviewRulerAddedForeground },
@@ -72,7 +72,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
         this.addedPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-added primary pattern', diffAdded, diffAddedOptions);
         this.addedSecondaryOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-added secondary', diffAdded, diffAddedOptions);
         this.addedSecondaryPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-added secondary pattern', diffAdded, diffAddedOptions);
-        const diffModified = ( localize(10413, 'Changed lines'));
+        const diffModified = ( localize(10443, 'Changed lines'));
         const diffModifiedOptions = {
             gutter,
             overview: { active: overview, color: overviewRulerModifiedForeground },
@@ -83,7 +83,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
         this.modifiedPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-modified primary pattern', diffModified, diffModifiedOptions);
         this.modifiedSecondaryOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-modified secondary', diffModified, diffModifiedOptions);
         this.modifiedSecondaryPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-modified secondary pattern', diffModified, diffModifiedOptions);
-        const diffDeleted = ( localize(10414, 'Removed lines'));
+        const diffDeleted = ( localize(10444, 'Removed lines'));
         const diffDeletedOptions = {
             gutter,
             overview: { active: overview, color: overviewRulerDeletedForeground },

package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.d.ts

@@ -15,7 +15,7 @@ import { ISplice } from "@codingame/monaco-vscode-api/vscode/vs/base/common/sequ
 import { IDiffEditorModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
-import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
+import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { IQuickDiffModelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service";
 export interface QuickDiffModelOptions {

package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.js

@@ -21,8 +21,8 @@ import { toLineChanges } from '@codingame/monaco-vscode-api/vscode/vs/editor/bro
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
-import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -314,48 +314,39 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         return this.quickDiffService.getQuickDiffs(uri, this._model.getLanguageId(), isSynchronized);
     }
     findNextClosestChange(lineNumber, inclusive = true, providerId) {
-        const visibleQuickDiffIds = ( this.quickDiffs
-            .filter(quickDiff => (!providerId || quickDiff.id === providerId) &&
-            this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id))
-            .map(quickDiff => quickDiff.id));
-        if (!inclusive) {
-            let nextChangeIndex = this.changes
-                .findIndex(change => visibleQuickDiffIds.includes(change.providerId) &&
-                change.change.modifiedStartLineNumber > lineNumber);
-            if (nextChangeIndex !== -1) {
-                return nextChangeIndex;
+        const visibleQuickDiffIds = ( new Set(( this.quickDiffs
+            .filter(quickDiff => this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id))
+            .map(quickDiff => quickDiff.id))));
+        for (let i = 0; i < this.changes.length; i++) {
+            if (providerId && this.changes[i].providerId !== providerId) {
+                continue;
+            }
+            if (!( visibleQuickDiffIds.has(this.changes[i].providerId))) {
+                continue;
+            }
+            const change = this.changes[i].change;
+            if (inclusive) {
+                if (getModifiedEndLineNumber(change) >= lineNumber) {
+                    return i;
+                }
+            }
+            else {
+                if (change.modifiedStartLineNumber > lineNumber) {
+                    return i;
+                }
             }
-            nextChangeIndex = this.changes
-                .findIndex(change => visibleQuickDiffIds.includes(change.providerId));
-            return nextChangeIndex !== -1 ? nextChangeIndex : 0;
-        }
-        const primaryQuickDiffId = this.quickDiffs
-            .find(quickDiff => quickDiff.kind === 'primary')?.id;
-        const primaryInclusiveChangeIndex = this.changes
-            .findIndex(change => change.providerId === primaryQuickDiffId &&
-            change.change.modifiedStartLineNumber <= lineNumber &&
-            getModifiedEndLineNumber(change.change) >= lineNumber);
-        if (primaryInclusiveChangeIndex !== -1) {
-            return primaryInclusiveChangeIndex;
-        }
-        let nextChangeIndex = this.changes
-            .findIndex(change => visibleQuickDiffIds.includes(change.providerId) &&
-            change.change.modifiedStartLineNumber <= lineNumber &&
-            getModifiedEndLineNumber(change.change) >= lineNumber);
-        if (nextChangeIndex !== -1) {
-            return nextChangeIndex;
         }
-        nextChangeIndex = this.changes
-            .findIndex(change => visibleQuickDiffIds.includes(change.providerId));
-        return nextChangeIndex !== -1 ? nextChangeIndex : 0;
+        return 0;
     }
     findPreviousClosestChange(lineNumber, inclusive = true, providerId) {
+        const visibleQuickDiffIds = ( new Set(( this.quickDiffs
+            .filter(quickDiff => this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id))
+            .map(quickDiff => quickDiff.id))));
         for (let i = this.changes.length - 1; i >= 0; i--) {
             if (providerId && this.changes[i].providerId !== providerId) {
                 continue;
             }
-            const quickDiff = this.quickDiffs.find(quickDiff => quickDiff.id === this.changes[i].providerId);
-            if (!quickDiff || !this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id)) {
+            if (!( visibleQuickDiffIds.has(this.changes[i].providerId))) {
                 continue;
             }
             const change = this.changes[i].change;

package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.d.ts

@@ -50,6 +50,7 @@ export declare class QuickDiffEditorController extends Disposable implements IEd
     private onDidChangeGutterAction;
     canNavigate(): boolean;
     refresh(): void;
+    toggleFocus(): void;
     next(lineNumber?: number): void;
     previous(lineNumber?: number): void;
     close(): void;

package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.js

@@ -53,7 +53,7 @@ import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/th
 import { gotoPreviousLocation, gotoNextLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Color } from '@codingame/monaco-vscode-api/vscode/vs/base/common/color';
-import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { KeyMod, KeyCode, KeyChord } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { getOuterEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
 import { quickDiffDecorationCount } from './quickDiffDecorator.js';
 import { hasNativeContextMenu } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
@@ -68,7 +68,7 @@ let QuickDiffPickerViewItem = class QuickDiffPickerViewItem extends SelectAction
         const peekTitleColor = theme.getColor(peekViewTitleBackground);
         const opaqueTitleColor = peekTitleColor?.makeOpaque(editorBackgroundColor) ?? editorBackgroundColor;
         styles.selectBackground = ( ( opaqueTitleColor.lighten(.6)).toString());
-        super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(10415, 'Switch quick diff base')), useCustomDrawn: !hasNativeContextMenu(configurationService) });
+        super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(10445, 'Switch quick diff base')), useCustomDrawn: !hasNativeContextMenu(configurationService) });
         this.optionsItems = [];
     }
     setSelection(quickDiffs, providerId) {
@@ -91,7 +91,7 @@ QuickDiffPickerViewItem = ( __decorate([
 ], QuickDiffPickerViewItem));
 class QuickDiffPickerBaseAction extends Action {
     static { this.ID = 'quickDiff.base.switch'; }
-    static { this.LABEL = ( localize(10416, "Switch Quick Diff Base")); }
+    static { this.LABEL = ( localize(10446, "Switch Quick Diff Base")); }
     constructor(callback) {
         super(QuickDiffPickerBaseAction.ID, QuickDiffPickerBaseAction.LABEL, undefined, undefined);
         this.callback = callback;
@@ -218,14 +218,14 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
                 .find(quickDiff => quickDiff.id === this._providerId)?.label ?? '';
             detail = this.model.changes.length > 1
                 ? ( localize(
-                10417,
+                10447,
                 "{0} - {1} of {2} changes",
                 label,
                 providerIndex + 1,
                 providerChanges.length
             ))
                 : ( localize(
-                10418,
+                10448,
                 "{0} - {1} of {2} change",
                 label,
                 providerIndex + 1,
@@ -235,8 +235,8 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         }
         else {
             detail = this.model.changes.length > 1
-                ? ( localize(10419, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
-                : ( localize(10420, "{0} of {1} change", providerIndex + 1, providerChanges.length));
+                ? ( localize(10449, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
+                : ( localize(10450, "{0} of {1} change", providerIndex + 1, providerChanges.length));
             this.dropdownContainer.style.display = 'inherit';
         }
         this.setTitle(this.title, detail);
@@ -285,7 +285,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         this._actionbarWidget.clear();
         this._actionbarWidget.push(actions.reverse(), { label: false, icon: true });
         this._actionbarWidget.push([next, previous], { label: false, icon: true });
-        this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(10421, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
+        this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(10451, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
     }
     updateDropdown() {
         const quickDiffs = this.getQuickDiffsContainingChange();
@@ -302,8 +302,10 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
     }
     _fillHead(container) {
         super._fillHead(container, true);
+        const action = ( new QuickDiffPickerBaseAction((event) => this.switchQuickDiff(event)));
+        this._disposables.add(action);
         this.dropdownContainer = prepend(this._titleElement, $('.dropdown'));
-        this.dropdown = this.instantiationService.createInstance(QuickDiffPickerViewItem, ( new QuickDiffPickerBaseAction((event) => this.switchQuickDiff(event))));
+        this.dropdown = this.instantiationService.createInstance(QuickDiffPickerViewItem, action);
         this.dropdown.render(this.dropdownContainer);
     }
     _getActionBarOptions() {
@@ -389,9 +391,18 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
     hasFocus() {
         return this.diffEditor.hasTextFocus();
     }
+    toggleFocus() {
+        if (this.diffEditor.hasTextFocus()) {
+            this.editor.focus();
+        }
+        else {
+            this.diffEditor.focus();
+        }
+    }
     dispose() {
-        super.dispose();
+        this.dropdown?.dispose();
         this.menu?.dispose();
+        super.dispose();
     }
 };
 QuickDiffWidget = ( __decorate([
@@ -463,6 +474,11 @@ let QuickDiffEditorController = class QuickDiffEditorController extends Disposab
     refresh() {
         this.widget?.showChange(this.widget.index, false);
     }
+    toggleFocus() {
+        if (this.widget) {
+            this.widget.toggleFocus();
+        }
+    }
     next(lineNumber) {
         if (!this.assertWidget()) {
             return;
@@ -636,7 +652,7 @@ class ShowPreviousChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.previous',
-            label: ( localize2(10422, "Show Previous Change")),
+            label: ( localize2(10452, "Show Previous Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
         });
@@ -662,7 +678,7 @@ class ShowNextChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.next',
-            label: ( localize2(10423, "Show Next Change")),
+            label: ( localize2(10453, "Show Next Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
         });
@@ -688,7 +704,7 @@ class GotoPreviousChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.previousChange',
-            label: ( localize2(10424, "Go to Previous Change")),
+            label: ( localize2(10454, "Go to Previous Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
         });
@@ -723,7 +739,7 @@ class GotoNextChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.nextChange',
-            label: ( localize2(10425, "Go to Next Change")),
+            label: ( localize2(10455, "Go to Next Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
         });
@@ -758,7 +774,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.next',
-        title: ( localize(10426, "Next &&Change"))
+        title: ( localize(10456, "Next &&Change"))
     },
     order: 1
 });
@@ -766,7 +782,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.previous',
-        title: ( localize(10427, "Previous &&Change"))
+        title: ( localize(10457, "Previous &&Change"))
     },
     order: 2
 });
@@ -788,6 +804,23 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         controller.close();
     }
 });
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'togglePeekWidgetFocus',
+    weight: KeybindingWeight.EditorContrib,
+    primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.F2),
+    when: isQuickDiffVisible,
+    handler: (accessor) => {
+        const outerEditor = getOuterEditorFromDiffEditor(accessor);
+        if (!outerEditor) {
+            return;
+        }
+        const controller = QuickDiffEditorController.get(outerEditor);
+        if (!controller) {
+            return;
+        }
+        controller.toggleFocus();
+    }
+});
 function setPositionAndSelection(change, editor, accessibilityService, codeEditorService) {
     const position = ( new Position(change.modifiedStartLineNumber, 1));
     editor.setPosition(position);