1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as assert from 'assert';
import { setupInstantiationService, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
import { OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
import { NotebookCellOutline } from 'vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline';
import { IFileIconTheme, IThemeService } from 'vs/platform/theme/common/themeService';
import { mock } from 'vs/base/test/common/mock';
import { Event } from 'vs/base/common/event';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IMarkerService } from 'vs/platform/markers/common/markers';
import { MarkerService } from 'vs/platform/markers/common/markerService';
import { CellKind, IOutputDto, NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { IActiveNotebookEditor, INotebookEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
suite('Notebook Outline', function () {
let disposables: DisposableStore;
let instantiationService: TestInstantiationService;
suiteSetup(() => {
disposables = new DisposableStore();
instantiationService = setupInstantiationService(disposables);
instantiationService.set(IEditorService, new class extends mock<IEditorService>() { });
instantiationService.set(IMarkerService, new MarkerService());
instantiationService.set(IThemeService, new class extends mock<IThemeService>() {
override onDidFileIconThemeChange = Event.None;
override getFileIconTheme(): IFileIconTheme {
return { hasFileIcons: true, hasFolderIcons: true, hidesExplorerArrows: false };
}
});
});
suiteTeardown(() => disposables.dispose());
function withNotebookOutline<R = any>(cells: [source: string, lang: string, kind: CellKind, output?: IOutputDto[], metadata?: NotebookCellMetadata][], callback: (outline: NotebookCellOutline, editor: IActiveNotebookEditor) => R): Promise<R> {
return withTestNotebook(cells, (editor) => {
if (!editor.hasModel()) {
assert.ok(false, 'MUST have active text editor');
}
const outline = instantiationService.createInstance(NotebookCellOutline, new class extends mock<INotebookEditorPane>() {
override getControl() {
return editor;
}
override onDidChangeModel: Event<void> = Event.None;
}, OutlineTarget.OutlinePane);
return callback(outline, editor);
});
}
test('basic', async function () {
await withNotebookOutline([], outline => {
assert.ok(outline instanceof NotebookCellOutline);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements(), []);
});
});
test('special characters in heading', async function () {
await withNotebookOutline([
['# Hellö & Hällo', 'md', CellKind.Markup]
], outline => {
assert.ok(outline instanceof NotebookCellOutline);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'Hellö & Hällo');
});
await withNotebookOutline([
['# bo<i>ld</i>', 'md', CellKind.Markup]
], outline => {
assert.ok(outline instanceof NotebookCellOutline);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'bold');
});
});
test('Notebook falsely detects "empty cells"', async function () {
await withNotebookOutline([
[' 的时代 ', 'md', CellKind.Markup]
], outline => {
assert.ok(outline instanceof NotebookCellOutline);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '的时代');
});
await withNotebookOutline([
[' ', 'md', CellKind.Markup]
], outline => {
assert.ok(outline instanceof NotebookCellOutline);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'empty cell');
});
await withNotebookOutline([
['+++++[]{}--)(0 ', 'md', CellKind.Markup]
], outline => {
assert.ok(outline instanceof NotebookCellOutline);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '+++++[]{}--)(0');
});
await withNotebookOutline([
['+++++[]{}--)(0 Hello **&^ ', 'md', CellKind.Markup]
], outline => {
assert.ok(outline instanceof NotebookCellOutline);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '+++++[]{}--)(0 Hello **&^');
});
await withNotebookOutline([
['!@#$\n Überschrïft', 'md', CellKind.Markup]
], outline => {
assert.ok(outline instanceof NotebookCellOutline);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '!@#$');
});
});
test('Heading text defines entry label', async function () {
return await withNotebookOutline([
['foo\n # h1', 'md', CellKind.Markup]
], outline => {
assert.ok(outline instanceof NotebookCellOutline);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'h1');
});
});
test('Notebook outline ignores markdown headings #115200', async function () {
await withNotebookOutline([
['## h2 \n# h1', 'md', CellKind.Markup]
], outline => {
assert.ok(outline instanceof NotebookCellOutline);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 2);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'h2');
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[1].label, 'h1');
});
await withNotebookOutline([
['## h2', 'md', CellKind.Markup],
['# h1', 'md', CellKind.Markup]
], outline => {
assert.ok(outline instanceof NotebookCellOutline);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 2);
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'h2');
assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[1].label, 'h1');
});
});
});
|
