development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-28 15:32:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ##229995. Exclude empty editor hint in notebook diff editor (#230001)

Browse source
This commit is contained in:
Peng Lyu 2024-09-27 12:18:29 -07:00 committed by GitHub
parent 83e902b7e2
commit 8f86741073
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
View file

@ -33,6 +33,7 @@ import { IAccessibilityService } from '../../../../../platform/accessibility/com
import { localize } from '../../../../../nls.js';
import { IEditorConstructionOptions } from '../../../../../editor/browser/config/editorConfiguration.js';
import { IDiffEditorConstructionOptions } from '../../../../../editor/browser/editorBrowser.js';
import { EditorExtensionsRegistry } from '../../../../../editor/browser/editorExtensions.js';
export class NotebookCellTextDiffListDelegate implements IListVirtualDelegate<IDiffElementViewModelBase> {
private readonly lineHeight: number;
@ -607,7 +608,9 @@ function buildDiffEditorWidget(instantiationService: IInstantiationService, note
function buildSourceEditor(instantiationService: IInstantiationService, notebookEditor: INotebookTextDiffEditor, sourceContainer: HTMLElement, options: IEditorConstructionOptions = {}) {
const editorContainer = DOM.append(sourceContainer, DOM.$('.editor-container'));
const skipContributions = [
'editor.contrib.emptyTextEditorHint'
];
const editor = instantiationService.createInstance(CodeEditorWidget, editorContainer, {
...fixedEditorOptions,
glyphMargin: false,
@ -618,7 +621,9 @@ function buildSourceEditor(instantiationService: IInstantiationService, notebook
automaticLayout: false,
overflowWidgetsDomNode: notebookEditor.getOverflowContainerDomNode(),
readOnly: true,
}, {});
}, {
contributions: EditorExtensionsRegistry.getEditorContributions().filter(c => skipContributions.indexOf(c.id) === -1)
});
return { editor, editorContainer };
}