Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 02:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Directly accepting editor selection when using text area edit context (#239211)

Browse Source 
* allowing two offsets

* changing to true
This commit is contained in:
Aiday Marlen Kyzy
2025-01-30 15:53:12 +01:00
committed by GitHub
parent 405f21fb2c
commit 060de16f9d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/automation/src/settings.ts
View File

@@ -25,8 +25,7 @@ export class SettingsEditor {
await this.openUserSettingsFile();
await this.code.dispatchKeybinding('right');
const selectionOffset = this._editContextSelectionOffset();
await this.editor.waitForEditorSelection('settings.json', s => s.selectionStart === selectionOffset && s.selectionEnd === selectionOffset);
await this.editor.waitForEditorSelection('settings.json', (s) => this._acceptEditorSelection(this.code.quality, s));
await this.editor.waitForTypeInEditor('settings.json', `"${setting}": ${value},`);
await this.editors.saveOpenedFile();
}
@@ -41,8 +40,7 @@ export class SettingsEditor {
await this.openUserSettingsFile();
await this.code.dispatchKeybinding('right');
const selectionOffset = this._editContextSelectionOffset();
await this.editor.waitForEditorSelection('settings.json', (s) => s.selectionStart === selectionOffset && s.selectionEnd === selectionOffset);
await this.editor.waitForEditorSelection('settings.json', (s) => this._acceptEditorSelection(this.code.quality, s));
await this.editor.waitForTypeInEditor('settings.json', settings.map(v => `"${v[0]}": ${v[1]},`).join(''));
await this.editors.saveOpenedFile();
}
@@ -86,7 +84,10 @@ export class SettingsEditor {
return this.code.quality === Quality.Stable ? SEARCH_BOX_TEXTAREA : SEARCH_BOX_NATIVE_EDIT_CONTEXT;
}
private _editContextSelectionOffset(): number {
return this.code.quality === Quality.Stable ? 0 : 1;
private _acceptEditorSelection(quality: Quality, s: { selectionStart: number; selectionEnd: number }): boolean {
if (quality === Quality.Stable) {
return true;
}
return s.selectionStart === 1 && s.selectionEnd === 1;
}
}