@codingame/monaco-vscode-notebook-service-override 4.5.0 → 4.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.d.ts +1 -1
- package/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js +30 -44
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.js +24 -32
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.js +30 -53
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.js +40 -84
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFind.js +9 -12
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.js +35 -48
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted.js +13 -16
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions.js +2 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.js +94 -77
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.js +13 -16
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource.js +8 -11
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.js +3 -12
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.js +25 -28
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.js +71 -89
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile.js +4 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants.js +97 -119
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.js +7 -18
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.js +128 -177
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/executeActions.js +132 -145
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/insertCellActions.js +70 -130
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.js +32 -92
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/sectionActions.js +39 -64
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.js +28 -43
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.js +7 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.js +23 -66
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.js +58 -57
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebook.contribution.js +162 -264
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibility.js +33 -36
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookExtensionPoint.js +58 -153
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.js +15 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl.js +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl.js +13 -16
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.js +22 -29
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.js +5 -8
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.js +100 -92
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/common/model/cellEdit.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookDiffEditorInput.js +6 -2
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.js +6 -4
- package/vscode/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.js +1 -1
- package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.js +41 -76
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.js +42 -45
- package/notebook.d.ts +0 -5
|
@@ -4,81 +4,78 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
|
|
|
4
4
|
import { IAccessibleViewService } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleView.service';
|
|
5
5
|
import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
|
|
6
6
|
|
|
7
|
+
const _moduleId = "vs/workbench/contrib/notebook/browser/notebookAccessibility";
|
|
7
8
|
function getAccessibilityHelpText(accessor) {
|
|
8
9
|
const keybindingService = accessor.get(IKeybindingService);
|
|
9
10
|
const content = [];
|
|
10
11
|
content.push(( localizeWithPath(
|
|
11
|
-
|
|
12
|
-
|
|
12
|
+
_moduleId,
|
|
13
|
+
0,
|
|
13
14
|
'The notebook view is a collection of code and markdown cells. Code cells can be executed and will produce output directly below the cell.'
|
|
14
15
|
)));
|
|
15
|
-
content.push(descriptionForCommand('notebook.cell.edit', ( localizeWithPath(
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
'The Edit Cell command ({0}) will focus on the cell input.'
|
|
19
|
-
)), ( localizeWithPath(
|
|
20
|
-
'vs/workbench/contrib/notebook/browser/notebookAccessibility',
|
|
21
|
-
'notebook.cell.editNoKb',
|
|
16
|
+
content.push(descriptionForCommand('notebook.cell.edit', ( localizeWithPath(_moduleId, 1, 'The Edit Cell command ({0}) will focus on the cell input.')), ( localizeWithPath(
|
|
17
|
+
_moduleId,
|
|
18
|
+
2,
|
|
22
19
|
'The Edit Cell command will focus on the cell input and is currently not triggerable by a keybinding.'
|
|
23
20
|
)), keybindingService));
|
|
24
21
|
content.push(descriptionForCommand('notebook.cell.quitEdit', ( localizeWithPath(
|
|
25
|
-
|
|
26
|
-
|
|
22
|
+
_moduleId,
|
|
23
|
+
3,
|
|
27
24
|
'The Quit Edit command ({0}) will set focus on the cell container. The default (Escape) key may need to be pressed twice first exit the virtual cursor if active.'
|
|
28
25
|
)), ( localizeWithPath(
|
|
29
|
-
|
|
30
|
-
|
|
26
|
+
_moduleId,
|
|
27
|
+
4,
|
|
31
28
|
'The Quit Edit command will set focus on the cell container and is currently not triggerable by a keybinding.'
|
|
32
29
|
)), keybindingService));
|
|
33
30
|
content.push(descriptionForCommand('notebook.cell.focusInOutput', ( localizeWithPath(
|
|
34
|
-
|
|
35
|
-
|
|
31
|
+
_moduleId,
|
|
32
|
+
5,
|
|
36
33
|
'The Focus Output command ({0}) will set focus in the cell\'s output.'
|
|
37
34
|
)), ( localizeWithPath(
|
|
38
|
-
|
|
39
|
-
|
|
35
|
+
_moduleId,
|
|
36
|
+
6,
|
|
40
37
|
'The Quit Edit command will set focus in the cell\'s output and is currently not triggerable by a keybinding.'
|
|
41
38
|
)), keybindingService));
|
|
42
39
|
content.push(descriptionForCommand('notebook.focusNextEditor', ( localizeWithPath(
|
|
43
|
-
|
|
44
|
-
|
|
40
|
+
_moduleId,
|
|
41
|
+
7,
|
|
45
42
|
'The Focus Next Cell Editor command ({0}) will set focus in the next cell\'s editor.'
|
|
46
43
|
)), ( localizeWithPath(
|
|
47
|
-
|
|
48
|
-
|
|
44
|
+
_moduleId,
|
|
45
|
+
8,
|
|
49
46
|
'The Focus Next Cell Editor command will set focus in the next cell\'s editor and is currently not triggerable by a keybinding.'
|
|
50
47
|
)), keybindingService));
|
|
51
48
|
content.push(descriptionForCommand('notebook.focusPreviousEditor', ( localizeWithPath(
|
|
52
|
-
|
|
53
|
-
|
|
49
|
+
_moduleId,
|
|
50
|
+
9,
|
|
54
51
|
'The Focus Previous Cell Editor command ({0}) will set focus in the previous cell\'s editor.'
|
|
55
52
|
)), ( localizeWithPath(
|
|
56
|
-
|
|
57
|
-
|
|
53
|
+
_moduleId,
|
|
54
|
+
10,
|
|
58
55
|
'The Focus Previous Cell Editor command will set focus in the previous cell\'s editor and is currently not triggerable by a keybinding.'
|
|
59
56
|
)), keybindingService));
|
|
60
57
|
content.push(( localizeWithPath(
|
|
61
|
-
|
|
62
|
-
|
|
58
|
+
_moduleId,
|
|
59
|
+
11,
|
|
63
60
|
'The up and down arrows will also move focus between cells while focused on the outer cell container.'
|
|
64
61
|
)));
|
|
65
62
|
content.push(descriptionForCommand('notebook.cell.executeAndFocusContainer', ( localizeWithPath(
|
|
66
|
-
|
|
67
|
-
|
|
63
|
+
_moduleId,
|
|
64
|
+
12,
|
|
68
65
|
'The Execute Cell command ({0}) executes the cell that currently has focus.'
|
|
69
66
|
)), ( localizeWithPath(
|
|
70
|
-
|
|
71
|
-
|
|
67
|
+
_moduleId,
|
|
68
|
+
13,
|
|
72
69
|
'The Execute Cell command executes the cell that currently has focus and is currently not triggerable by a keybinding.'
|
|
73
70
|
)), keybindingService));
|
|
74
71
|
content.push(( localizeWithPath(
|
|
75
|
-
|
|
76
|
-
|
|
72
|
+
_moduleId,
|
|
73
|
+
14,
|
|
77
74
|
'The Insert Cell Above/Below commands will create new empty code cells'
|
|
78
75
|
)));
|
|
79
76
|
content.push(( localizeWithPath(
|
|
80
|
-
|
|
81
|
-
|
|
77
|
+
_moduleId,
|
|
78
|
+
15,
|
|
82
79
|
'The Change Cell to Code/Markdown commands are used to switch between cell types.'
|
|
83
80
|
)));
|
|
84
81
|
return content.join('\n\n');
|
|
@@ -114,7 +111,7 @@ function showAccessibleOutput(accessibleViewService, editorService) {
|
|
|
114
111
|
}
|
|
115
112
|
const viewCell = notebookViewModel.viewCells[selections[0].start];
|
|
116
113
|
let outputContent = '';
|
|
117
|
-
const decoder = ( new TextDecoder());
|
|
114
|
+
const decoder = ( (new TextDecoder()));
|
|
118
115
|
for (let i = 0; i < viewCell.outputsViewModels.length; i++) {
|
|
119
116
|
const outputViewModel = viewCell.outputsViewModels[i];
|
|
120
117
|
const outputTextModel = viewCell.model.outputs[i];
|
|
@@ -6,13 +6,14 @@ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/d
|
|
|
6
6
|
import { Extensions } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
|
|
7
7
|
import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
8
8
|
|
|
9
|
-
const
|
|
9
|
+
const _moduleId = "vs/workbench/contrib/notebook/browser/notebookExtensionPoint";
|
|
10
|
+
const NotebookEditorContribution = ( (Object.freeze({
|
|
10
11
|
type: 'type',
|
|
11
12
|
displayName: 'displayName',
|
|
12
13
|
selector: 'selector',
|
|
13
14
|
priority: 'priority',
|
|
14
|
-
}));
|
|
15
|
-
const NotebookRendererContribution = ( Object.freeze({
|
|
15
|
+
})));
|
|
16
|
+
const NotebookRendererContribution = ( (Object.freeze({
|
|
16
17
|
id: 'id',
|
|
17
18
|
displayName: 'displayName',
|
|
18
19
|
mimeTypes: 'mimeTypes',
|
|
@@ -20,18 +21,14 @@ const NotebookRendererContribution = ( Object.freeze({
|
|
|
20
21
|
hardDependencies: 'dependencies',
|
|
21
22
|
optionalDependencies: 'optionalDependencies',
|
|
22
23
|
requiresMessaging: 'requiresMessaging',
|
|
23
|
-
}));
|
|
24
|
-
const NotebookPreloadContribution = ( Object.freeze({
|
|
24
|
+
})));
|
|
25
|
+
const NotebookPreloadContribution = ( (Object.freeze({
|
|
25
26
|
type: 'type',
|
|
26
27
|
entrypoint: 'entrypoint',
|
|
27
28
|
localResourceRoots: 'localResourceRoots',
|
|
28
|
-
}));
|
|
29
|
+
})));
|
|
29
30
|
const notebookProviderContribution = {
|
|
30
|
-
description: ( localizeWithPath(
|
|
31
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
32
|
-
'contributes.notebook.provider',
|
|
33
|
-
'Contributes notebook document provider.'
|
|
34
|
-
)),
|
|
31
|
+
description: ( localizeWithPath(_moduleId, 0, 'Contributes notebook document provider.')),
|
|
35
32
|
type: 'array',
|
|
36
33
|
defaultSnippets: [{ body: [{ type: '', displayName: '', 'selector': [{ 'filenamePattern': '' }] }] }],
|
|
37
34
|
items: {
|
|
@@ -44,45 +41,25 @@ const notebookProviderContribution = {
|
|
|
44
41
|
properties: {
|
|
45
42
|
[NotebookEditorContribution.type]: {
|
|
46
43
|
type: 'string',
|
|
47
|
-
description: ( localizeWithPath(
|
|
48
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
49
|
-
'contributes.notebook.provider.viewType',
|
|
50
|
-
'Type of the notebook.'
|
|
51
|
-
)),
|
|
44
|
+
description: ( localizeWithPath(_moduleId, 1, 'Type of the notebook.')),
|
|
52
45
|
},
|
|
53
46
|
[NotebookEditorContribution.displayName]: {
|
|
54
47
|
type: 'string',
|
|
55
|
-
description: ( localizeWithPath(
|
|
56
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
57
|
-
'contributes.notebook.provider.displayName',
|
|
58
|
-
'Human readable name of the notebook.'
|
|
59
|
-
)),
|
|
48
|
+
description: ( localizeWithPath(_moduleId, 2, 'Human readable name of the notebook.')),
|
|
60
49
|
},
|
|
61
50
|
[NotebookEditorContribution.selector]: {
|
|
62
51
|
type: 'array',
|
|
63
|
-
description: ( localizeWithPath(
|
|
64
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
65
|
-
'contributes.notebook.provider.selector',
|
|
66
|
-
'Set of globs that the notebook is for.'
|
|
67
|
-
)),
|
|
52
|
+
description: ( localizeWithPath(_moduleId, 3, 'Set of globs that the notebook is for.')),
|
|
68
53
|
items: {
|
|
69
54
|
type: 'object',
|
|
70
55
|
properties: {
|
|
71
56
|
filenamePattern: {
|
|
72
57
|
type: 'string',
|
|
73
|
-
description: ( localizeWithPath(
|
|
74
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
75
|
-
'contributes.notebook.provider.selector.filenamePattern',
|
|
76
|
-
'Glob that the notebook is enabled for.'
|
|
77
|
-
)),
|
|
58
|
+
description: ( localizeWithPath(_moduleId, 4, 'Glob that the notebook is enabled for.')),
|
|
78
59
|
},
|
|
79
60
|
excludeFileNamePattern: {
|
|
80
61
|
type: 'string',
|
|
81
|
-
description: ( localizeWithPath(
|
|
82
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
83
|
-
'contributes.notebook.selector.provider.excludeFileNamePattern',
|
|
84
|
-
'Glob that the notebook is disabled for.'
|
|
85
|
-
))
|
|
62
|
+
description: ( localizeWithPath(_moduleId, 5, 'Glob that the notebook is disabled for.'))
|
|
86
63
|
}
|
|
87
64
|
}
|
|
88
65
|
}
|
|
@@ -90,8 +67,8 @@ const notebookProviderContribution = {
|
|
|
90
67
|
[NotebookEditorContribution.priority]: {
|
|
91
68
|
type: 'string',
|
|
92
69
|
markdownDeprecationMessage: ( localizeWithPath(
|
|
93
|
-
|
|
94
|
-
|
|
70
|
+
_moduleId,
|
|
71
|
+
6,
|
|
95
72
|
'Controls if the custom editor is enabled automatically when the user opens a file. This may be overridden by users using the `workbench.editorAssociations` setting.'
|
|
96
73
|
)),
|
|
97
74
|
enum: [
|
|
@@ -100,13 +77,13 @@ const notebookProviderContribution = {
|
|
|
100
77
|
],
|
|
101
78
|
markdownEnumDescriptions: [
|
|
102
79
|
( localizeWithPath(
|
|
103
|
-
|
|
104
|
-
|
|
80
|
+
_moduleId,
|
|
81
|
+
7,
|
|
105
82
|
'The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource.'
|
|
106
83
|
)),
|
|
107
84
|
( localizeWithPath(
|
|
108
|
-
|
|
109
|
-
|
|
85
|
+
_moduleId,
|
|
86
|
+
8,
|
|
110
87
|
'The editor is not automatically used when the user opens a resource, but a user can switch to the editor using the `Reopen With` command.'
|
|
111
88
|
)),
|
|
112
89
|
],
|
|
@@ -115,13 +92,9 @@ const notebookProviderContribution = {
|
|
|
115
92
|
}
|
|
116
93
|
}
|
|
117
94
|
};
|
|
118
|
-
const defaultRendererSnippet = ( Object.freeze({ id: '', displayName: '', mimeTypes: [''], entrypoint: '' }));
|
|
95
|
+
const defaultRendererSnippet = ( (Object.freeze({ id: '', displayName: '', mimeTypes: [''], entrypoint: '' })));
|
|
119
96
|
const notebookRendererContribution = {
|
|
120
|
-
description: ( localizeWithPath(
|
|
121
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
122
|
-
'contributes.notebook.renderer',
|
|
123
|
-
'Contributes notebook output renderer provider.'
|
|
124
|
-
)),
|
|
97
|
+
description: ( localizeWithPath(_moduleId, 9, 'Contributes notebook output renderer provider.')),
|
|
125
98
|
type: 'array',
|
|
126
99
|
defaultSnippets: [{ body: [defaultRendererSnippet] }],
|
|
127
100
|
items: {
|
|
@@ -136,27 +109,19 @@ const notebookRendererContribution = {
|
|
|
136
109
|
properties: {
|
|
137
110
|
[NotebookRendererContribution.id]: {
|
|
138
111
|
type: 'string',
|
|
139
|
-
description: ( localizeWithPath(
|
|
140
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
141
|
-
'contributes.notebook.renderer.viewType',
|
|
142
|
-
'Unique identifier of the notebook output renderer.'
|
|
143
|
-
)),
|
|
112
|
+
description: ( localizeWithPath(_moduleId, 10, 'Unique identifier of the notebook output renderer.')),
|
|
144
113
|
},
|
|
145
114
|
[NotebookRendererContribution.displayName]: {
|
|
146
115
|
type: 'string',
|
|
147
|
-
description: ( localizeWithPath(
|
|
148
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
149
|
-
'contributes.notebook.renderer.displayName',
|
|
150
|
-
'Human readable name of the notebook output renderer.'
|
|
151
|
-
)),
|
|
116
|
+
description: ( localizeWithPath(_moduleId, 11, 'Human readable name of the notebook output renderer.')),
|
|
152
117
|
},
|
|
153
118
|
[NotebookRendererContribution.hardDependencies]: {
|
|
154
119
|
type: 'array',
|
|
155
120
|
uniqueItems: true,
|
|
156
121
|
items: { type: 'string' },
|
|
157
122
|
markdownDescription: ( localizeWithPath(
|
|
158
|
-
|
|
159
|
-
|
|
123
|
+
_moduleId,
|
|
124
|
+
12,
|
|
160
125
|
'List of kernel dependencies the renderer requires. If any of the dependencies are present in the `NotebookKernel.preloads`, the renderer can be used.'
|
|
161
126
|
)),
|
|
162
127
|
},
|
|
@@ -165,8 +130,8 @@ const notebookRendererContribution = {
|
|
|
165
130
|
uniqueItems: true,
|
|
166
131
|
items: { type: 'string' },
|
|
167
132
|
markdownDescription: ( localizeWithPath(
|
|
168
|
-
|
|
169
|
-
|
|
133
|
+
_moduleId,
|
|
134
|
+
13,
|
|
170
135
|
'List of soft kernel dependencies the renderer can make use of. If any of the dependencies are present in the `NotebookKernel.preloads`, the renderer will be preferred over renderers that don\'t interact with the kernel.'
|
|
171
136
|
)),
|
|
172
137
|
},
|
|
@@ -179,24 +144,20 @@ const notebookRendererContribution = {
|
|
|
179
144
|
],
|
|
180
145
|
enumDescriptions: [
|
|
181
146
|
( localizeWithPath(
|
|
182
|
-
|
|
183
|
-
|
|
147
|
+
_moduleId,
|
|
148
|
+
14,
|
|
184
149
|
'Messaging is required. The renderer will only be used when it\'s part of an extension that can be run in an extension host.'
|
|
185
150
|
)),
|
|
186
151
|
( localizeWithPath(
|
|
187
|
-
|
|
188
|
-
|
|
152
|
+
_moduleId,
|
|
153
|
+
15,
|
|
189
154
|
'The renderer is better with messaging available, but it\'s not requried.'
|
|
190
155
|
)),
|
|
191
|
-
( localizeWithPath(
|
|
192
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
193
|
-
'contributes.notebook.renderer.requiresMessaging.never',
|
|
194
|
-
'The renderer does not require messaging.'
|
|
195
|
-
)),
|
|
156
|
+
( localizeWithPath(_moduleId, 16, 'The renderer does not require messaging.')),
|
|
196
157
|
],
|
|
197
158
|
description: ( localizeWithPath(
|
|
198
|
-
|
|
199
|
-
|
|
159
|
+
_moduleId,
|
|
160
|
+
17,
|
|
200
161
|
'Defines how and if the renderer needs to communicate with an extension host, via `createRendererMessaging`. Renderers with stronger messaging requirements may not work in all environments.'
|
|
201
162
|
)),
|
|
202
163
|
},
|
|
@@ -212,21 +173,13 @@ const notebookRendererContribution = {
|
|
|
212
173
|
properties: {
|
|
213
174
|
[NotebookRendererContribution.mimeTypes]: {
|
|
214
175
|
type: 'array',
|
|
215
|
-
description: ( localizeWithPath(
|
|
216
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
217
|
-
'contributes.notebook.selector',
|
|
218
|
-
'Set of globs that the notebook is for.'
|
|
219
|
-
)),
|
|
176
|
+
description: ( localizeWithPath(_moduleId, 18, 'Set of globs that the notebook is for.')),
|
|
220
177
|
items: {
|
|
221
178
|
type: 'string'
|
|
222
179
|
}
|
|
223
180
|
},
|
|
224
181
|
[NotebookRendererContribution.entrypoint]: {
|
|
225
|
-
description: ( localizeWithPath(
|
|
226
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
227
|
-
'contributes.notebook.renderer.entrypoint',
|
|
228
|
-
'File to load in the webview to render the extension.'
|
|
229
|
-
)),
|
|
182
|
+
description: ( localizeWithPath(_moduleId, 19, 'File to load in the webview to render the extension.')),
|
|
230
183
|
type: 'string',
|
|
231
184
|
},
|
|
232
185
|
}
|
|
@@ -237,29 +190,17 @@ const notebookRendererContribution = {
|
|
|
237
190
|
],
|
|
238
191
|
properties: {
|
|
239
192
|
[NotebookRendererContribution.entrypoint]: {
|
|
240
|
-
description: ( localizeWithPath(
|
|
241
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
242
|
-
'contributes.notebook.renderer.entrypoint',
|
|
243
|
-
'File to load in the webview to render the extension.'
|
|
244
|
-
)),
|
|
193
|
+
description: ( localizeWithPath(_moduleId, 19, 'File to load in the webview to render the extension.')),
|
|
245
194
|
type: 'object',
|
|
246
195
|
required: ['extends', 'path'],
|
|
247
196
|
properties: {
|
|
248
197
|
extends: {
|
|
249
198
|
type: 'string',
|
|
250
|
-
description: ( localizeWithPath(
|
|
251
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
252
|
-
'contributes.notebook.renderer.entrypoint.extends',
|
|
253
|
-
'Existing renderer that this one extends.'
|
|
254
|
-
)),
|
|
199
|
+
description: ( localizeWithPath(_moduleId, 20, 'Existing renderer that this one extends.')),
|
|
255
200
|
},
|
|
256
201
|
path: {
|
|
257
202
|
type: 'string',
|
|
258
|
-
description: ( localizeWithPath(
|
|
259
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
260
|
-
'contributes.notebook.renderer.entrypoint',
|
|
261
|
-
'File to load in the webview to render the extension.'
|
|
262
|
-
)),
|
|
203
|
+
description: ( localizeWithPath(_moduleId, 19, 'File to load in the webview to render the extension.')),
|
|
263
204
|
},
|
|
264
205
|
}
|
|
265
206
|
},
|
|
@@ -271,11 +212,7 @@ const notebookRendererContribution = {
|
|
|
271
212
|
}
|
|
272
213
|
};
|
|
273
214
|
const notebookPreloadContribution = {
|
|
274
|
-
description: ( localizeWithPath(
|
|
275
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
276
|
-
'contributes.preload.provider',
|
|
277
|
-
'Contributes notebook preloads.'
|
|
278
|
-
)),
|
|
215
|
+
description: ( localizeWithPath(_moduleId, 21, 'Contributes notebook preloads.')),
|
|
279
216
|
type: 'array',
|
|
280
217
|
defaultSnippets: [{ body: [{ type: '', entrypoint: '' }] }],
|
|
281
218
|
items: {
|
|
@@ -287,26 +224,18 @@ const notebookPreloadContribution = {
|
|
|
287
224
|
properties: {
|
|
288
225
|
[NotebookPreloadContribution.type]: {
|
|
289
226
|
type: 'string',
|
|
290
|
-
description: ( localizeWithPath(
|
|
291
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
292
|
-
'contributes.preload.provider.viewType',
|
|
293
|
-
'Type of the notebook.'
|
|
294
|
-
)),
|
|
227
|
+
description: ( localizeWithPath(_moduleId, 22, 'Type of the notebook.')),
|
|
295
228
|
},
|
|
296
229
|
[NotebookPreloadContribution.entrypoint]: {
|
|
297
230
|
type: 'string',
|
|
298
|
-
description: ( localizeWithPath(
|
|
299
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
300
|
-
'contributes.preload.entrypoint',
|
|
301
|
-
'Path to file loaded in the webview.'
|
|
302
|
-
)),
|
|
231
|
+
description: ( localizeWithPath(_moduleId, 23, 'Path to file loaded in the webview.')),
|
|
303
232
|
},
|
|
304
233
|
[NotebookPreloadContribution.localResourceRoots]: {
|
|
305
234
|
type: 'array',
|
|
306
235
|
items: { type: 'string' },
|
|
307
236
|
description: ( localizeWithPath(
|
|
308
|
-
|
|
309
|
-
|
|
237
|
+
_moduleId,
|
|
238
|
+
24,
|
|
310
239
|
'Paths to additional resources that should be allowed in the webview.'
|
|
311
240
|
)),
|
|
312
241
|
},
|
|
@@ -353,25 +282,17 @@ class NotebooksDataRenderer extends Disposable {
|
|
|
353
282
|
return { data: { headers: [], rows: [] }, dispose: () => { } };
|
|
354
283
|
}
|
|
355
284
|
const headers = [
|
|
356
|
-
( localizeWithPath(
|
|
357
|
-
|
|
358
|
-
'Notebook id',
|
|
359
|
-
"ID"
|
|
360
|
-
)),
|
|
361
|
-
( localizeWithPath(
|
|
362
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
363
|
-
'Notebook name',
|
|
364
|
-
"Name"
|
|
365
|
-
)),
|
|
285
|
+
( localizeWithPath(_moduleId, 25, "ID")),
|
|
286
|
+
( localizeWithPath(_moduleId, 26, "Name")),
|
|
366
287
|
];
|
|
367
|
-
const rows = ( contrib
|
|
288
|
+
const rows = ( (contrib
|
|
368
289
|
.sort((a, b) => a.type.localeCompare(b.type))
|
|
369
290
|
.map(notebook => {
|
|
370
291
|
return [
|
|
371
292
|
notebook.type,
|
|
372
293
|
notebook.displayName
|
|
373
294
|
];
|
|
374
|
-
}));
|
|
295
|
+
})));
|
|
375
296
|
return {
|
|
376
297
|
data: {
|
|
377
298
|
headers,
|
|
@@ -395,25 +316,17 @@ class NotebookRenderersDataRenderer extends Disposable {
|
|
|
395
316
|
return { data: { headers: [], rows: [] }, dispose: () => { } };
|
|
396
317
|
}
|
|
397
318
|
const headers = [
|
|
398
|
-
( localizeWithPath(
|
|
399
|
-
|
|
400
|
-
'Notebook renderer name',
|
|
401
|
-
"Name"
|
|
402
|
-
)),
|
|
403
|
-
( localizeWithPath(
|
|
404
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
405
|
-
'Notebook mimetypes',
|
|
406
|
-
"Mimetypes"
|
|
407
|
-
)),
|
|
319
|
+
( localizeWithPath(_moduleId, 27, "Name")),
|
|
320
|
+
( localizeWithPath(_moduleId, 28, "Mimetypes")),
|
|
408
321
|
];
|
|
409
|
-
const rows = ( contrib
|
|
322
|
+
const rows = ( (contrib
|
|
410
323
|
.sort((a, b) => a.displayName.localeCompare(b.displayName))
|
|
411
324
|
.map(notebookRenderer => {
|
|
412
325
|
return [
|
|
413
326
|
notebookRenderer.displayName,
|
|
414
327
|
notebookRenderer.mimeTypes.join(',')
|
|
415
328
|
];
|
|
416
|
-
}));
|
|
329
|
+
})));
|
|
417
330
|
return {
|
|
418
331
|
data: {
|
|
419
332
|
headers,
|
|
@@ -423,29 +336,21 @@ class NotebookRenderersDataRenderer extends Disposable {
|
|
|
423
336
|
};
|
|
424
337
|
}
|
|
425
338
|
}
|
|
426
|
-
( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
|
|
339
|
+
( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
|
|
427
340
|
id: 'notebooks',
|
|
428
|
-
label: ( localizeWithPath(
|
|
429
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
430
|
-
'notebooks',
|
|
431
|
-
"Notebooks"
|
|
432
|
-
)),
|
|
341
|
+
label: ( localizeWithPath(_moduleId, 29, "Notebooks")),
|
|
433
342
|
access: {
|
|
434
343
|
canToggle: false
|
|
435
344
|
},
|
|
436
|
-
renderer: ( new SyncDescriptor(NotebooksDataRenderer)),
|
|
345
|
+
renderer: ( (new SyncDescriptor(NotebooksDataRenderer))),
|
|
437
346
|
});
|
|
438
|
-
( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
|
|
347
|
+
( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
|
|
439
348
|
id: 'notebookRenderer',
|
|
440
|
-
label: ( localizeWithPath(
|
|
441
|
-
'vs/workbench/contrib/notebook/browser/notebookExtensionPoint',
|
|
442
|
-
'notebookRenderer',
|
|
443
|
-
"Notebook Renderers"
|
|
444
|
-
)),
|
|
349
|
+
label: ( localizeWithPath(_moduleId, 30, "Notebook Renderers")),
|
|
445
350
|
access: {
|
|
446
351
|
canToggle: false
|
|
447
352
|
},
|
|
448
|
-
renderer: ( new SyncDescriptor(NotebookRenderersDataRenderer)),
|
|
353
|
+
renderer: ( (new SyncDescriptor(NotebookRenderersDataRenderer))),
|
|
449
354
|
});
|
|
450
355
|
|
|
451
356
|
export { notebookPreloadExtensionPoint, notebookRendererExtensionPoint, notebooksExtensionPoint };
|
package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.js
CHANGED
|
@@ -108,7 +108,7 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
|
|
|
108
108
|
}
|
|
109
109
|
const widget = this._borrowableEditors.get(sourceID)?.get(input.resource);
|
|
110
110
|
if (!widget) {
|
|
111
|
-
throw new Error('no widget at source group');
|
|
111
|
+
throw ( new Error('no widget at source group'));
|
|
112
112
|
}
|
|
113
113
|
this._borrowableEditors.get(sourceID)?.delete(input.resource);
|
|
114
114
|
let targetMap = this._borrowableEditors.get(targetID);
|
package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.js
CHANGED
|
@@ -9,6 +9,7 @@ import { CellKind, NotebookCellExecutionState } from 'vscode/vscode/vs/workbench
|
|
|
9
9
|
import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
|
|
10
10
|
import { INotebookKernelService, INotebookKernelHistoryService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
|
|
11
11
|
|
|
12
|
+
const _moduleId = "vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl";
|
|
12
13
|
let NotebookExecutionService = class NotebookExecutionService {
|
|
13
14
|
constructor(_commandService, _notebookKernelService, _notebookKernelHistoryService, _workspaceTrustRequestService, _logService, _notebookExecutionStateService) {
|
|
14
15
|
this._commandService = _commandService;
|
|
@@ -17,7 +18,7 @@ let NotebookExecutionService = class NotebookExecutionService {
|
|
|
17
18
|
this._workspaceTrustRequestService = _workspaceTrustRequestService;
|
|
18
19
|
this._logService = _logService;
|
|
19
20
|
this._notebookExecutionStateService = _notebookExecutionStateService;
|
|
20
|
-
this.cellExecutionParticipants = ( new Set());
|
|
21
|
+
this.cellExecutionParticipants = ( (new Set()));
|
|
21
22
|
}
|
|
22
23
|
async executeNotebookCells(notebook, cells, contextKeyService) {
|
|
23
24
|
const cellsArr = Array.from(cells)
|
|
@@ -25,10 +26,10 @@ let NotebookExecutionService = class NotebookExecutionService {
|
|
|
25
26
|
if (!cellsArr.length) {
|
|
26
27
|
return;
|
|
27
28
|
}
|
|
28
|
-
this._logService.debug(`NotebookExecutionService#executeNotebookCells ${JSON.stringify(( cellsArr.map(c => c.handle)))}`);
|
|
29
|
+
this._logService.debug(`NotebookExecutionService#executeNotebookCells ${JSON.stringify(( (cellsArr.map(c => c.handle))))}`);
|
|
29
30
|
const message = ( localizeWithPath(
|
|
30
|
-
|
|
31
|
-
|
|
31
|
+
_moduleId,
|
|
32
|
+
0,
|
|
32
33
|
"Executing a notebook cell will run code from this workspace."
|
|
33
34
|
));
|
|
34
35
|
const trust = await this._workspaceTrustRequestService.requestWorkspaceTrust({ message });
|
|
@@ -61,10 +62,10 @@ let NotebookExecutionService = class NotebookExecutionService {
|
|
|
61
62
|
if (validCellExecutions.length > 0) {
|
|
62
63
|
await this.runExecutionParticipants(validCellExecutions);
|
|
63
64
|
this._notebookKernelService.selectKernelForNotebook(kernel, notebook);
|
|
64
|
-
await kernel.executeNotebookCellsRequest(notebook.uri, ( validCellExecutions.map(c => c.cellHandle)));
|
|
65
|
+
await kernel.executeNotebookCellsRequest(notebook.uri, ( (validCellExecutions.map(c => c.cellHandle))));
|
|
65
66
|
const unconfirmed = validCellExecutions.filter(exe => exe.state === NotebookCellExecutionState.Unconfirmed);
|
|
66
67
|
if (unconfirmed.length) {
|
|
67
|
-
this._logService.debug(`NotebookExecutionService#executeNotebookCells completing unconfirmed executions ${JSON.stringify(( unconfirmed.map(exe => exe.cellHandle)))}`);
|
|
68
|
+
this._logService.debug(`NotebookExecutionService#executeNotebookCells completing unconfirmed executions ${JSON.stringify(( (unconfirmed.map(exe => exe.cellHandle))))}`);
|
|
68
69
|
unconfirmed.forEach(exe => exe.complete({}));
|
|
69
70
|
}
|
|
70
71
|
}
|
|
@@ -94,13 +95,13 @@ let NotebookExecutionService = class NotebookExecutionService {
|
|
|
94
95
|
this._activeProxyKernelExecutionToken?.dispose(true);
|
|
95
96
|
}
|
|
96
97
|
};
|
|
97
|
-
NotebookExecutionService = ( __decorate([
|
|
98
|
-
( __param(0, ICommandService)),
|
|
99
|
-
( __param(1, INotebookKernelService)),
|
|
100
|
-
( __param(2, INotebookKernelHistoryService)),
|
|
101
|
-
( __param(3, IWorkspaceTrustRequestService)),
|
|
102
|
-
( __param(4, ILogService)),
|
|
103
|
-
( __param(5, INotebookExecutionStateService))
|
|
104
|
-
], NotebookExecutionService));
|
|
98
|
+
NotebookExecutionService = ( (__decorate([
|
|
99
|
+
( (__param(0, ICommandService))),
|
|
100
|
+
( (__param(1, INotebookKernelService))),
|
|
101
|
+
( (__param(2, INotebookKernelHistoryService))),
|
|
102
|
+
( (__param(3, IWorkspaceTrustRequestService))),
|
|
103
|
+
( (__param(4, ILogService))),
|
|
104
|
+
( (__param(5, INotebookExecutionStateService)))
|
|
105
|
+
], NotebookExecutionService)));
|
|
105
106
|
|
|
106
107
|
export { NotebookExecutionService };
|
|
@@ -51,7 +51,7 @@ let NotebookExecutionStateService = class NotebookExecutionStateService extends
|
|
|
51
51
|
getCellExecution(cellUri) {
|
|
52
52
|
const parsed = CellUri.parse(cellUri);
|
|
53
53
|
if (!parsed) {
|
|
54
|
-
throw new Error(`Not a cell URI: ${cellUri}`);
|
|
54
|
+
throw ( new Error(`Not a cell URI: ${cellUri}`));
|
|
55
55
|
}
|
|
56
56
|
const exeMap = this._executions.get(parsed.notebook);
|
|
57
57
|
if (exeMap) {
|
|
@@ -119,7 +119,7 @@ let NotebookExecutionStateService = class NotebookExecutionStateService extends
|
|
|
119
119
|
createCellExecution(notebookUri, cellHandle) {
|
|
120
120
|
const notebook = this._notebookService.getNotebookTextModel(notebookUri);
|
|
121
121
|
if (!notebook) {
|
|
122
|
-
throw new Error(`Notebook not found: ${notebookUri.toString()}`);
|
|
122
|
+
throw ( new Error(`Notebook not found: ${( notebookUri.toString())}`));
|
|
123
123
|
}
|
|
124
124
|
let notebookExecutionMap = this._executions.get(notebookUri);
|
|
125
125
|
if (!notebookExecutionMap) {
|
|
@@ -140,7 +140,7 @@ let NotebookExecutionStateService = class NotebookExecutionStateService extends
|
|
|
140
140
|
createExecution(notebookUri) {
|
|
141
141
|
const notebook = this._notebookService.getNotebookTextModel(notebookUri);
|
|
142
142
|
if (!notebook) {
|
|
143
|
-
throw new Error(`Notebook not found: ${notebookUri.toString()}`);
|
|
143
|
+
throw ( new Error(`Notebook not found: ${( notebookUri.toString())}`));
|
|
144
144
|
}
|
|
145
145
|
if (!( this._notebookListeners.has(notebookUri))) {
|
|
146
146
|
const listeners = this._instantiationService.createInstance(NotebookExecutionListeners, notebookUri);
|
|
@@ -276,7 +276,7 @@ let NotebookExecutionListeners = class NotebookExecutionListeners extends Dispos
|
|
|
276
276
|
this._logService.debug(`NotebookExecution#ctor ${( notebook.toString())}`);
|
|
277
277
|
const notebookModel = this._notebookService.getNotebookTextModel(notebook);
|
|
278
278
|
if (!notebookModel) {
|
|
279
|
-
throw new Error('Notebook not found: ' + notebook);
|
|
279
|
+
throw ( new Error('Notebook not found: ' + notebook));
|
|
280
280
|
}
|
|
281
281
|
this._notebookModel = notebookModel;
|
|
282
282
|
this._register(this._notebookModel.onWillAddRemoveCells(e => this.onWillAddRemoveCells(e)));
|
|
@@ -362,7 +362,7 @@ function updateToEdit(update, cellHandle) {
|
|
|
362
362
|
internalMetadata: newInternalMetadata
|
|
363
363
|
};
|
|
364
364
|
}
|
|
365
|
-
throw new Error('Unknown cell update type');
|
|
365
|
+
throw ( new Error('Unknown cell update type'));
|
|
366
366
|
}
|
|
367
367
|
let CellExecution = class CellExecution extends Disposable {
|
|
368
368
|
get state() {
|