Skip to content

Commit

Permalink
Merge branch 'main' into tyriar/177886
Browse files Browse the repository at this point in the history
  • Loading branch information
@meganrogge
meganrogge committed Mar 22, 2023
2 parents 4392789 + 2e954c8 commit d99300a
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 23 deletions.
2 changes: 2 additions & 0 deletions src/vs/workbench/contrib/interactiveSession/browser/media/interactiveSession.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
height: 24px;
border-radius: 50%;
background: var(--vscode-badge-background);
pointer-events: none;
user-select: none;
}

.interactive-list .interactive-item-container .header .avatar .icon {
Expand Down
2 changes: 1 addition & 1 deletion ...ench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class AccessibleBufferContribution extends DisposableStore implements ITerminalC
}
layout(xterm: IXtermTerminal & { raw: Terminal }): void {
if (!this._accessibleBufferWidget) {
this._accessibleBufferWidget = this._instantiationService.createInstance(AccessibleBufferWidget, this._instance, xterm);
this._accessibleBufferWidget = this.add(this._instantiationService.createInstance(AccessibleBufferWidget, this._instance, xterm));
}
}
async show(): Promise<void> {
Expand Down
44 changes: 22 additions & 22 deletions src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBuffer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { URI } from 'vs/base/common/uri';
import * as dom from 'vs/base/browser/dom';
import { Event } from 'vs/base/common/event';
import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
Expand All @@ -28,14 +29,12 @@ import { AudioCue, IAudioCueService } from 'vs/platform/audioCues/browser/audioC
import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';

const enum Constants {
Scheme = 'terminal-accessible-buffer',
const enum CssClass {
Active = 'active',
Hide = 'hide'
}

export class AccessibleBufferWidget extends DisposableStore {
public static ID: string = Constants.Scheme;
private _accessibleBuffer: HTMLElement;
private _bufferEditor: CodeEditorWidget;
private _editorContainer: HTMLElement;
Expand All @@ -49,7 +48,7 @@ export class AccessibleBufferWidget extends DisposableStore {

constructor(
private readonly _instance: ITerminalInstance,
private readonly _xterm: IXtermTerminal & { raw: Terminal },
private readonly _xterm: Pick<IXtermTerminal, 'getFont'> & { raw: Terminal },
@IInstantiationService private readonly _instantiationService: IInstantiationService,
@IModelService private readonly _modelService: IModelService,
@IConfigurationService private readonly _configurationService: IConfigurationService,
Expand Down Expand Up @@ -90,15 +89,13 @@ export class AccessibleBufferWidget extends DisposableStore {
this._accessibleBuffer.ariaRoleDescription = localize('terminal.integrated.accessibleBuffer', 'Terminal buffer');
this._accessibleBuffer.classList.add('accessible-buffer');
this._editorContainer = document.createElement('div');
this._bufferEditor = this._instantiationService.createInstance(CodeEditorWidget, this._editorContainer, editorOptions, codeEditorWidgetOptions);
this._bufferEditor = this.add(this._instantiationService.createInstance(CodeEditorWidget, this._editorContainer, editorOptions, codeEditorWidgetOptions));
this._focusTracker = this.add(dom.trackFocus(this._editorContainer));
this.add(this._focusTracker.onDidFocus(() => this._focusedContextKey.set(true)));
this.add(this._focusTracker.onDidBlur(() => this._focusedContextKey.reset()));
this._accessibleBuffer.replaceChildren(this._editorContainer);
this._xtermElement.insertAdjacentElement('beforebegin', this._accessibleBuffer);
this._bufferEditor.layout({ width: this._xtermElement.clientWidth, height: this._xtermElement.clientHeight });
this.add(this._xterm.raw.onResize(() => this._bufferEditor.layout({ width: this._xtermElement.clientWidth, height: this._xtermElement.clientHeight })));
this.add(this._bufferEditor);
this.add(Event.runAndSubscribe(this._xterm.raw.onResize, () => this._bufferEditor.layout({ width: this._xtermElement.clientWidth, height: this._xtermElement.clientHeight })));
this._bufferEditor.onKeyDown((e) => {
switch (e.keyCode) {
case KeyCode.Tab:
Expand Down Expand Up @@ -130,37 +127,37 @@ export class AccessibleBufferWidget extends DisposableStore {
// if the editor is focused via tab, we need to update the model
// and show it
await this._updateEditor();
this._accessibleBuffer.classList.add(Constants.Active);
this._xtermElement.classList.add(Constants.Hide);
this._accessibleBuffer.classList.add(CssClass.Active);
this._xtermElement.classList.add(CssClass.Hide);
}));
this._updateEditor();
}

private _hide(): void {
this._accessibleBuffer.classList.remove(Constants.Active);
this._xtermElement.classList.remove(Constants.Hide);
this._accessibleBuffer.classList.remove(CssClass.Active);
this._xtermElement.classList.remove(CssClass.Hide);
}

private async _updateModel(insertion?: boolean): Promise<void> {
private async _updateModel(insertion?: boolean): Promise<ITextModel> {
let model = this._bufferEditor.getModel();
const lineCount = model?.getLineCount() ?? 0;
if (insertion && model && lineCount > this._xterm.raw.rows) {
const lineNumber = lineCount + 1;
model.pushEditOperations(null, [{
range: { startLineNumber: lineNumber, endLineNumber: lineNumber, startColumn: 1, endColumn: 1 }, text: await this._getContent(true)
range: { startLineNumber: lineNumber, endLineNumber: lineNumber, startColumn: 1, endColumn: 1 }, text: this._getContent(true)
}], () => []);
} else {
model = await this._getTextModel(URI.from({ scheme: `${Constants.Scheme}-${this._instance.instanceId}`, fragment: await this._getContent() }));
model = await this._getTextModel(this._instance.resource.with({ fragment: this._getContent() }));
}
if (!model) {
throw new Error('Could not create accessible buffer editor model');
}
this._bufferEditor.setModel(model);
return model;
}

private async _updateEditor(insertion?: boolean): Promise<void> {
await this._updateModel(insertion);
const model = this._bufferEditor.getModel();
const model = await this._updateModel(insertion);
if (!model) {
return;
}
Expand Down Expand Up @@ -227,8 +224,8 @@ export class AccessibleBufferWidget extends DisposableStore {
this._prependNewLine = true;
this._accessibleBuffer.tabIndex = -1;
this._bufferEditor.layout({ width: this._xtermElement.clientWidth, height: this._xtermElement.clientHeight });
this._accessibleBuffer.classList.add(Constants.Active);
this._xtermElement.classList.add(Constants.Hide);
this._accessibleBuffer.classList.add(CssClass.Active);
this._xtermElement.classList.add(CssClass.Hide);
this._bufferEditor.focus();
}

Expand All @@ -242,13 +239,11 @@ export class AccessibleBufferWidget extends DisposableStore {
}

private _getContent(lastBufferIndex?: boolean): string {
this._bufferToEditorIndex = new Map();
const lines: string[] = [];
let currentLine: string = '';
const buffer = this._xterm?.raw.buffer.active;
if (!buffer) {
return '';
}

const scrollback: number = this._configurationService.getValue(TerminalSettingId.Scrollback);
const maxBufferSize = scrollback + this._xterm.raw.rows - 1;
const end = Math.min(maxBufferSize, buffer.length - 1);
Expand All @@ -260,6 +255,10 @@ export class AccessibleBufferWidget extends DisposableStore {
this._prependNewLine = false;
return result;
}

this._bufferToEditorIndex = new Map();
const lines: string[] = [];
let currentLine: string = '';
for (let i = 0; i <= end; i++) {
const line = buffer.getLine(i);
if (!line) {
Expand All @@ -273,6 +272,7 @@ export class AccessibleBufferWidget extends DisposableStore {
currentLine = '';
}
}

return lines.join('\n');
}
}

0 comments on commit d99300a

Please sign in to comment.