ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-28 17:23:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve code selection and undo, add tests (#10160)

Browse Source
This commit is contained in:
Chris LaFreniere
2020-04-28 16:26:23 -07:00
committed by GitHub
parent fb1fbb214d
commit 98f3f57f77
2 changed files with 97 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/sql/workbench/contrib/notebook/test/browser/MarkdownTextTransformer.test.ts
View File

@@ -37,9 +37,11 @@ suite('MarkdownTextTransformer', () => {
let markdownTextTransformer: MarkdownTextTransformer;
let widget: IEditor;
let textModel: TextModel;
let notebookEditor: TestNotebookEditor;
let mockNotebookService: TypeMoq.Mock<INotebookService>;
let cellModel: CellModel;
setup(() => {
let mockNotebookService: TypeMoq.Mock<INotebookService>;
const dialogService = new TestDialogService();
const notificationService = new TestNotificationService();
const undoRedoService = new UndoRedoService(dialogService, notificationService);
@@ -55,8 +57,8 @@ suite('MarkdownTextTransformer', () => {
mockNotebookService = TypeMoq.Mock.ofType(NotebookService, undefined, new TestLifecycleService(), undefined, undefined, undefined, instantiationService, new MockContextKeyService(),
undefined, undefined, undefined, undefined, undefined, undefined, TestEnvironmentService);
let cellModel = new CellModel(undefined, undefined, mockNotebookService.object);
let notebookEditor = new TestNotebookEditor(cellModel.cellGuid, instantiationService);
cellModel = new CellModel(undefined, undefined, mockNotebookService.object);
notebookEditor = new TestNotebookEditor(cellModel.cellGuid, instantiationService);
markdownTextTransformer = new MarkdownTextTransformer(mockNotebookService.object, cellModel, notebookEditor);
mockNotebookService.setup(s => s.findNotebookEditor(TypeMoq.It.isAny())).returns(() => notebookEditor);
@@ -81,8 +83,8 @@ suite('MarkdownTextTransformer', () => {
testWithNoSelection(MarkdownButtonType.BOLD, '');
testWithNoSelection(MarkdownButtonType.ITALIC, '__', true);
testWithNoSelection(MarkdownButtonType.ITALIC, '');
// testWithNoSelection(MarkdownButtonType.CODE, '```\n\n```', true);
// testWithNoSelection(MarkdownButtonType.CODE, '\n');
testWithNoSelection(MarkdownButtonType.CODE, '```\n\n```', true);
testWithNoSelection(MarkdownButtonType.CODE, '');
testWithNoSelection(MarkdownButtonType.HIGHLIGHT, '<mark></mark>', true);
testWithNoSelection(MarkdownButtonType.HIGHLIGHT, '');
testWithNoSelection(MarkdownButtonType.LINK, '[]()', true);
@@ -128,6 +130,17 @@ suite('MarkdownTextTransformer', () => {
testWithMultipleLinesSelected(MarkdownButtonType.IMAGE, '![Multi\nLines\nSelected]()');
});
test('Ensure notebook editor returns expected object', () => {
assert.deepEqual(notebookEditor, markdownTextTransformer.notebookEditor, 'Notebook editor does not match expected value');
// Set markdown text transformer to not have a notebook editor passed in
markdownTextTransformer = new MarkdownTextTransformer(mockNotebookService.object, cellModel);
assert.equal(markdownTextTransformer.notebookEditor, undefined, 'No notebook editor should be returned');
// Even after text is attempted to be transformed, there should be no editor, and therefore nothing on the text model
markdownTextTransformer.transformText(MarkdownButtonType.BOLD);
assert.equal(markdownTextTransformer.notebookEditor, undefined, 'Notebook model does not have a valid uri, so no editor should be returned');
assert.equal(textModel.getValue(), '', 'No text should exist on the textModel');
});
function testWithNoSelection(type: MarkdownButtonType, expectedValue: string, setValue = false): void {
if (setValue) {
textModel.setValue('');