Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-12 08:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix code block sizing (#204536)

Browse Source 
Missed this in previous PR
This commit is contained in:
Matt Bierner
2024-02-06 21:09:45 +01:00
committed by GitHub
parent 5700e15f44
commit ea16ecb7ac
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
+18 -6
View File
@@ -13,7 +13,7 @@ import { Disposable, IReference, MutableDisposable } from 'vs/base/common/lifecy
import { URI, UriComponents } from 'vs/base/common/uri';
import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
import { EDITOR_FONT_DEFAULTS, EditorOption, IEditorOptions } from 'vs/editor/common/config/editorOptions';
import { IRange, Range } from 'vs/editor/common/core/range';
import { ScrollType } from 'vs/editor/common/editorCommon';
import { ILanguageService } from 'vs/editor/common/languages/language';
@@ -256,13 +256,16 @@ abstract class BaseCodeBlockPart<Data extends ICodeBlockData> extends Disposable
}
layout(width: number): void {
const realContentHeight = this.editor.getContentHeight();
const contentHeight = this.getContentHeight();
const editorBorder = 2;
// TODO: Min added for testing. Compute proper height based on range
this.editor.layout({ width: width - editorBorder, height: Math.min(realContentHeight, 100) });
this.editor.layout({ width: width - editorBorder, height: contentHeight });
this.updatePaddingForLayout();
}
protected getContentHeight() {
return this.editor.getContentHeight();
}
async render(data: Data, width: number) {
if (data.parentContextKeyService) {
this.contextKeyService.updateParent(data.parentContextKeyService);
@@ -323,8 +326,8 @@ export class SimpleCodeBlockPart extends BaseCodeBlockPart<ISimpleCodeBlockData>
buttonSeparator: undefined,
supportIcons: true
});
this.textModel = this._register(this.modelService.createModel('', null, undefined, true));
const x = URI.from({ scheme: 'ai', path: `chat-code-block-${Date.now()}.txt` });
this.textModel = this._register(this.modelService.createModel('', null, x, true));
this.editor.setModel(this.textModel);
this.vulnsListElement = dom.append(vulnsContainer, $('ul.interactive-result-vulns-list'));
@@ -457,6 +460,15 @@ export class LocalFileCodeBlockPart extends BaseCodeBlockPart<ILocalFileCodeBloc
return this.currentCodeBlockData!.uri;
}
protected override getContentHeight() {
if (this.currentCodeBlockData?.range) {
const lineCount = this.currentCodeBlockData.range.endLineNumber - this.currentCodeBlockData.range.startLineNumber + 1;
const lineHeight = this.editor.getOption(EditorOption.lineHeight);
return lineCount * lineHeight;
}
return super.getContentHeight();
}
protected override createEditor(instantiationService: IInstantiationService, parent: HTMLElement, options: Readonly<IEditorConstructionOptions>): CodeEditorWidget {
return this._register(instantiationService.createInstance(CodeEditorWidget, parent, {
...options,