@codingame/monaco-vscode-notebook-service-override 16.1.0 → 17.0.0
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.js +2 -2
- package/package.json +26 -24
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.d.ts +7 -24
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js +88 -166
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.js +27 -27
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.js +10 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.js +9 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/contributedStatusBarItemController.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.js +10 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.d.ts +4 -11
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.js +11 -26
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.js +12 -12
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/execute/executionEditorProgress.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/execute/executionEditorProgress.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFind.js +7 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.js +7 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.js +12 -12
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookSelectionHighlight.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.js +18 -18
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.d.ts +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.js +14 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants.js +14 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.js +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/viewportWarmup/viewportWarmup.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.js +34 -34
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.js +23 -52
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/editActions.js +31 -31
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/executeActions.js +30 -30
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/insertCellActions.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/insertCellActions.js +28 -28
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.js +20 -20
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.js +8 -8
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/sectionActions.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/sectionActions.js +17 -17
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/variablesActions.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.js +26 -26
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebook.contribution.d.ts +6 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebook.contribution.js +111 -84
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.js +11 -11
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibleView.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookExtensionPoint.js +33 -33
- package/vscode/src/vs/workbench/contrib/notebook/browser/outputEditor/notebookOutputEditor.d.ts +89 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/outputEditor/notebookOutputEditor.js +292 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/outputEditor/notebookOutputEditorInput.d.ts +39 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/outputEditor/notebookOutputEditorInput.js +93 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.js +7 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.d.ts +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/model/cellEdit.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/services/notebookWebWorker.js +1 -1
- package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.js +12 -12
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.js +1 -1
|
@@ -0,0 +1,292 @@
|
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
|
+
import { append, $, scheduleAtNextAnimationFrame } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
|
|
4
|
+
import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
5
|
+
import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
6
|
+
import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
7
|
+
import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
|
|
8
|
+
import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
|
|
9
|
+
import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
|
|
10
|
+
import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
|
|
11
|
+
import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
|
|
12
|
+
import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
|
|
13
|
+
import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
|
|
14
|
+
import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
|
|
15
|
+
import { EditorPane } from '@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/parts/editor/editorPane';
|
|
16
|
+
import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
|
|
17
|
+
import { RegisteredEditorPriority } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
|
|
18
|
+
import { IEditorResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService.service';
|
|
19
|
+
import { NOTEBOOK_OUTPUT_EDITOR_ID, CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
20
|
+
import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
|
|
21
|
+
import { RenderOutputType } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
|
|
22
|
+
import { getDefaultNotebookCreationOptions } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';
|
|
23
|
+
import { NotebookOptions } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookOptions';
|
|
24
|
+
import { BackLayerWebView } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView';
|
|
25
|
+
import { NotebookOutputEditorInput } from './notebookOutputEditorInput.js';
|
|
26
|
+
import { BareFontInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/fontInfo';
|
|
27
|
+
import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
|
|
28
|
+
import { FontMeasurements } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/config/fontMeasurements';
|
|
29
|
+
import { PixelRatio } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/pixelRatio';
|
|
30
|
+
import { NotebookViewModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
|
|
31
|
+
import { NotebookEventDispatcher } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
|
|
32
|
+
import { ViewContext } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/viewContext';
|
|
33
|
+
|
|
34
|
+
var NotebookOutputEditor_1;
|
|
35
|
+
class NoopCellEditorOptions extends Disposable {
|
|
36
|
+
static { this.fixedEditorOptions = {
|
|
37
|
+
scrollBeyondLastLine: false,
|
|
38
|
+
scrollbar: {
|
|
39
|
+
verticalScrollbarSize: 14,
|
|
40
|
+
horizontal: 'auto',
|
|
41
|
+
useShadows: true,
|
|
42
|
+
verticalHasArrows: false,
|
|
43
|
+
horizontalHasArrows: false,
|
|
44
|
+
alwaysConsumeMouseWheel: false
|
|
45
|
+
},
|
|
46
|
+
renderLineHighlightOnlyWhenFocus: true,
|
|
47
|
+
overviewRulerLanes: 0,
|
|
48
|
+
lineDecorationsWidth: 0,
|
|
49
|
+
folding: true,
|
|
50
|
+
fixedOverflowWidgets: true,
|
|
51
|
+
minimap: { enabled: false },
|
|
52
|
+
renderValidationDecorations: 'on',
|
|
53
|
+
lineNumbersMinChars: 3
|
|
54
|
+
}; }
|
|
55
|
+
get value() {
|
|
56
|
+
return this._value;
|
|
57
|
+
}
|
|
58
|
+
constructor() {
|
|
59
|
+
super();
|
|
60
|
+
this._onDidChange = this._register(( new Emitter()));
|
|
61
|
+
this.onDidChange = this._onDidChange.event;
|
|
62
|
+
this._value = ( Object.freeze({
|
|
63
|
+
...NoopCellEditorOptions.fixedEditorOptions,
|
|
64
|
+
padding: { top: 12, bottom: 12 },
|
|
65
|
+
readOnly: true
|
|
66
|
+
}));
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
let NotebookOutputEditor = class NotebookOutputEditor extends EditorPane {
|
|
70
|
+
static { NotebookOutputEditor_1 = this; }
|
|
71
|
+
static { this.ID = NOTEBOOK_OUTPUT_EDITOR_ID; }
|
|
72
|
+
get isDisposed() {
|
|
73
|
+
return this._isDisposed;
|
|
74
|
+
}
|
|
75
|
+
constructor(group, instantiationService, themeService, telemetryService, storageService, configurationService, notebookService) {
|
|
76
|
+
super(NotebookOutputEditor_1.ID, group, telemetryService, themeService, storageService);
|
|
77
|
+
this.instantiationService = instantiationService;
|
|
78
|
+
this.configurationService = configurationService;
|
|
79
|
+
this.notebookService = notebookService;
|
|
80
|
+
this.creationOptions = getDefaultNotebookCreationOptions();
|
|
81
|
+
this._outputWebview = null;
|
|
82
|
+
this._isDisposed = false;
|
|
83
|
+
this._notebookOptions = this.instantiationService.createInstance(NotebookOptions, this.window, false, undefined);
|
|
84
|
+
this._register(this._notebookOptions);
|
|
85
|
+
}
|
|
86
|
+
createEditor(parent) {
|
|
87
|
+
this._rootElement = append(parent, $('.notebook-output-editor'));
|
|
88
|
+
}
|
|
89
|
+
get fontInfo() {
|
|
90
|
+
if (!this._fontInfo) {
|
|
91
|
+
this._fontInfo = this.createFontInfo();
|
|
92
|
+
}
|
|
93
|
+
return this._fontInfo;
|
|
94
|
+
}
|
|
95
|
+
createFontInfo() {
|
|
96
|
+
const editorOptions = this.configurationService.getValue('editor');
|
|
97
|
+
return FontMeasurements.readFontInfo(this.window, BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.getInstance(this.window).value));
|
|
98
|
+
}
|
|
99
|
+
async _createOriginalWebview(id, viewType, resource) {
|
|
100
|
+
this._outputWebview?.dispose();
|
|
101
|
+
this._outputWebview = this.instantiationService.createInstance(BackLayerWebView, this, id, viewType, resource, {
|
|
102
|
+
...this._notebookOptions.computeDiffWebviewOptions(),
|
|
103
|
+
fontFamily: this._generateFontFamily()
|
|
104
|
+
}, undefined);
|
|
105
|
+
append(this._rootElement, this._outputWebview.element);
|
|
106
|
+
this._outputWebview.createWebview(this.window);
|
|
107
|
+
this._outputWebview.element.style.width = `calc(100% - 16px)`;
|
|
108
|
+
this._outputWebview.element.style.left = `16px`;
|
|
109
|
+
}
|
|
110
|
+
_generateFontFamily() {
|
|
111
|
+
return this.fontInfo.fontFamily ?? `"SF Mono", Monaco, Menlo, Consolas, "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace`;
|
|
112
|
+
}
|
|
113
|
+
getTitle() {
|
|
114
|
+
if (this.input) {
|
|
115
|
+
return this.input.getName();
|
|
116
|
+
}
|
|
117
|
+
return localize(8384, "Notebook Output Editor");
|
|
118
|
+
}
|
|
119
|
+
async setInput(input, options, context, token) {
|
|
120
|
+
await super.setInput(input, options, context, token);
|
|
121
|
+
const model = await input.resolve();
|
|
122
|
+
if (!model) {
|
|
123
|
+
throw ( new Error('Invalid notebook output editor input'));
|
|
124
|
+
}
|
|
125
|
+
const resolvedNotebookEditorModel = model.resolvedNotebookEditorModel;
|
|
126
|
+
await this._createOriginalWebview(generateUuid(), resolvedNotebookEditorModel.viewType, ( URI.from(
|
|
127
|
+
{ scheme: Schemas.vscodeNotebookCellOutput, path: '', query: 'openIn=notebookOutputEditor' }
|
|
128
|
+
)));
|
|
129
|
+
const notebookTextModel = resolvedNotebookEditorModel.notebook;
|
|
130
|
+
const eventDispatcher = this._register(( new NotebookEventDispatcher()));
|
|
131
|
+
const editorOptions = this._register(( new NoopCellEditorOptions()));
|
|
132
|
+
const viewContext = ( new ViewContext(this._notebookOptions, eventDispatcher, _language => editorOptions));
|
|
133
|
+
this._notebookViewModel = this.instantiationService.createInstance(NotebookViewModel, notebookTextModel.viewType, notebookTextModel, viewContext, null, { isReadOnly: true });
|
|
134
|
+
const cellViewModel = this._notebookViewModel.getCellByHandle(model.cell.handle);
|
|
135
|
+
if (!cellViewModel) {
|
|
136
|
+
throw ( new Error('Invalid NotebookOutputEditorInput, no matching cell view model'));
|
|
137
|
+
}
|
|
138
|
+
const cellOutputViewModel = cellViewModel.outputsViewModels.find(outputViewModel => outputViewModel.model.outputId === model.outputId);
|
|
139
|
+
if (!cellOutputViewModel) {
|
|
140
|
+
throw ( new Error('Invalid NotebookOutputEditorInput, no matching cell output view model'));
|
|
141
|
+
}
|
|
142
|
+
let result = undefined;
|
|
143
|
+
const [mimeTypes, pick] = cellOutputViewModel.resolveMimeTypes(notebookTextModel, undefined);
|
|
144
|
+
const pickedMimeTypeRenderer = cellOutputViewModel.pickedMimeType || mimeTypes[pick];
|
|
145
|
+
if (mimeTypes.length !== 0) {
|
|
146
|
+
const renderer = this.notebookService.getRendererInfo(pickedMimeTypeRenderer.rendererId);
|
|
147
|
+
result = renderer
|
|
148
|
+
? { type: RenderOutputType.Extension, renderer, source: cellOutputViewModel, mimeType: pickedMimeTypeRenderer.mimeType }
|
|
149
|
+
: this._renderMissingRenderer(cellOutputViewModel, pickedMimeTypeRenderer.mimeType);
|
|
150
|
+
}
|
|
151
|
+
if (!result) {
|
|
152
|
+
throw ( new Error('No InsetRenderInfo for output'));
|
|
153
|
+
}
|
|
154
|
+
const cellInfo = {
|
|
155
|
+
cellId: cellViewModel.id,
|
|
156
|
+
cellHandle: model.cell.handle,
|
|
157
|
+
cellUri: model.cell.uri,
|
|
158
|
+
};
|
|
159
|
+
this._outputWebview?.createOutput(cellInfo, result, 0, 0);
|
|
160
|
+
}
|
|
161
|
+
_renderMissingRenderer(viewModel, preferredMimeType) {
|
|
162
|
+
if (!viewModel.model.outputs.length) {
|
|
163
|
+
return this._renderMessage(viewModel, ( localize(8385, "Cell has no output")));
|
|
164
|
+
}
|
|
165
|
+
if (!preferredMimeType) {
|
|
166
|
+
const mimeTypes = ( viewModel.model.outputs.map(op => op.mime));
|
|
167
|
+
const mimeTypesMessage = mimeTypes.join(', ');
|
|
168
|
+
return this._renderMessage(viewModel, ( localize(
|
|
169
|
+
8386,
|
|
170
|
+
"No renderer could be found for output. It has the following mimetypes: {0}",
|
|
171
|
+
mimeTypesMessage
|
|
172
|
+
)));
|
|
173
|
+
}
|
|
174
|
+
return this._renderSearchForMimetype(viewModel, preferredMimeType);
|
|
175
|
+
}
|
|
176
|
+
_renderMessage(viewModel, message) {
|
|
177
|
+
const el = $('p', undefined, message);
|
|
178
|
+
return { type: RenderOutputType.Html, source: viewModel, htmlContent: el.outerHTML };
|
|
179
|
+
}
|
|
180
|
+
_renderSearchForMimetype(viewModel, mimeType) {
|
|
181
|
+
const query = `@tag:notebookRenderer ${mimeType}`;
|
|
182
|
+
const p = $('p', undefined, `No renderer could be found for mimetype "${mimeType}", but one might be available on the Marketplace.`);
|
|
183
|
+
const a = $('a', { href: `command:workbench.extensions.search?%22${query}%22`, class: 'monaco-button monaco-text-button', tabindex: 0, role: 'button', style: 'padding: 8px; text-decoration: none; color: rgb(255, 255, 255); background-color: rgb(14, 99, 156); max-width: 200px;' }, `Search Marketplace`);
|
|
184
|
+
return {
|
|
185
|
+
type: RenderOutputType.Html,
|
|
186
|
+
source: viewModel,
|
|
187
|
+
htmlContent: p.outerHTML + a.outerHTML,
|
|
188
|
+
};
|
|
189
|
+
}
|
|
190
|
+
scheduleOutputHeightAck(cellInfo, outputId, height) {
|
|
191
|
+
scheduleAtNextAnimationFrame(this.window, () => {
|
|
192
|
+
this._outputWebview?.ackHeight([{ cellId: cellInfo.cellId, outputId, height }]);
|
|
193
|
+
}, 10);
|
|
194
|
+
}
|
|
195
|
+
async focusNotebookCell(cell, focus) {
|
|
196
|
+
}
|
|
197
|
+
async focusNextNotebookCell(cell, focus) {
|
|
198
|
+
}
|
|
199
|
+
toggleNotebookCellSelection(cell) {
|
|
200
|
+
throw ( new Error('Not implemented.'));
|
|
201
|
+
}
|
|
202
|
+
getCellById(cellId) {
|
|
203
|
+
throw ( new Error('Not implemented'));
|
|
204
|
+
}
|
|
205
|
+
getCellByInfo(cellInfo) {
|
|
206
|
+
return this._notebookViewModel?.getCellByHandle(cellInfo.cellHandle);
|
|
207
|
+
}
|
|
208
|
+
layout(dimension, position) {
|
|
209
|
+
}
|
|
210
|
+
setScrollTop(scrollTop) {
|
|
211
|
+
}
|
|
212
|
+
triggerScroll(event) {
|
|
213
|
+
}
|
|
214
|
+
getOutputRenderer() {
|
|
215
|
+
}
|
|
216
|
+
updateOutputHeight(cellInfo, output, height, isInit, source) {
|
|
217
|
+
}
|
|
218
|
+
updateMarkupCellHeight(cellId, height, isInit) {
|
|
219
|
+
}
|
|
220
|
+
setMarkupCellEditState(cellId, editState) {
|
|
221
|
+
}
|
|
222
|
+
didResizeOutput(cellId) {
|
|
223
|
+
}
|
|
224
|
+
didStartDragMarkupCell(cellId, event) {
|
|
225
|
+
}
|
|
226
|
+
didDragMarkupCell(cellId, event) {
|
|
227
|
+
}
|
|
228
|
+
didDropMarkupCell(cellId, event) {
|
|
229
|
+
}
|
|
230
|
+
didEndDragMarkupCell(cellId) {
|
|
231
|
+
}
|
|
232
|
+
updatePerformanceMetadata(cellId, executionId, duration, rendererId) {
|
|
233
|
+
}
|
|
234
|
+
didFocusOutputInputChange(inputFocused) {
|
|
235
|
+
}
|
|
236
|
+
dispose() {
|
|
237
|
+
this._isDisposed = true;
|
|
238
|
+
super.dispose();
|
|
239
|
+
}
|
|
240
|
+
};
|
|
241
|
+
NotebookOutputEditor = NotebookOutputEditor_1 = ( __decorate([
|
|
242
|
+
( __param(1, IInstantiationService)),
|
|
243
|
+
( __param(2, IThemeService)),
|
|
244
|
+
( __param(3, ITelemetryService)),
|
|
245
|
+
( __param(4, IStorageService)),
|
|
246
|
+
( __param(5, IConfigurationService)),
|
|
247
|
+
( __param(6, INotebookService))
|
|
248
|
+
], NotebookOutputEditor));
|
|
249
|
+
let NotebookOutputEditorContribution = class NotebookOutputEditorContribution {
|
|
250
|
+
static { this.ID = 'workbench.contribution.notebookOutputEditorContribution'; }
|
|
251
|
+
constructor(editorResolverService, instantiationService, uriIdentityService) {
|
|
252
|
+
this.instantiationService = instantiationService;
|
|
253
|
+
this.uriIdentityService = uriIdentityService;
|
|
254
|
+
editorResolverService.registerEditor(`${Schemas.vscodeNotebookCellOutput}:/**`, {
|
|
255
|
+
id: 'notebookOutputEditor',
|
|
256
|
+
label: 'Notebook Output Editor',
|
|
257
|
+
priority: RegisteredEditorPriority.option
|
|
258
|
+
}, {
|
|
259
|
+
canSupportResource: (resource) => {
|
|
260
|
+
if (resource.scheme === Schemas.vscodeNotebookCellOutput) {
|
|
261
|
+
const params = ( new URLSearchParams(resource.query));
|
|
262
|
+
return params.get('openIn') === 'notebookOutputEditor';
|
|
263
|
+
}
|
|
264
|
+
return false;
|
|
265
|
+
}
|
|
266
|
+
}, {
|
|
267
|
+
createEditorInput: async ({ resource, options }) => {
|
|
268
|
+
const outputUriData = CellUri.parseCellOutputUri(resource);
|
|
269
|
+
if (!outputUriData || !outputUriData.notebook || outputUriData.cellIndex === undefined || outputUriData.outputIndex === undefined || !outputUriData.outputId) {
|
|
270
|
+
throw ( new Error('Invalid output uri for notebook output editor'));
|
|
271
|
+
}
|
|
272
|
+
const notebookUri = this.uriIdentityService.asCanonicalUri(outputUriData.notebook);
|
|
273
|
+
const cellIndex = outputUriData.cellIndex;
|
|
274
|
+
const outputId = outputUriData.outputId;
|
|
275
|
+
const outputIndex = outputUriData.outputIndex;
|
|
276
|
+
const editorInput = this.instantiationService.createInstance(NotebookOutputEditorInput, notebookUri, cellIndex, outputId, outputIndex);
|
|
277
|
+
return {
|
|
278
|
+
editor: editorInput,
|
|
279
|
+
options: options
|
|
280
|
+
};
|
|
281
|
+
}
|
|
282
|
+
});
|
|
283
|
+
}
|
|
284
|
+
};
|
|
285
|
+
NotebookOutputEditorContribution = ( __decorate([
|
|
286
|
+
( __param(0, IEditorResolverService)),
|
|
287
|
+
( __param(1, IInstantiationService)),
|
|
288
|
+
( __param(2, IUriIdentityService))
|
|
289
|
+
], NotebookOutputEditorContribution));
|
|
290
|
+
registerWorkbenchContribution2(NotebookOutputEditorContribution.ID, NotebookOutputEditorContribution, WorkbenchPhase.BlockRestore);
|
|
291
|
+
|
|
292
|
+
export { NoopCellEditorOptions, NotebookOutputEditor, NotebookOutputEditorContribution };
|
package/vscode/src/vs/workbench/contrib/notebook/browser/outputEditor/notebookOutputEditorInput.d.ts
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
|
|
2
|
+
import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
|
|
3
|
+
import { EditorInputCapabilities } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
|
|
4
|
+
import { EditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
|
|
5
|
+
import { IResolvedNotebookEditorModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
|
|
6
|
+
import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
|
|
7
|
+
import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
|
|
8
|
+
declare class ResolvedNotebookOutputEditorInputModel implements IDisposable {
|
|
9
|
+
readonly resolvedNotebookEditorModel: IResolvedNotebookEditorModel;
|
|
10
|
+
readonly notebookUri: URI;
|
|
11
|
+
readonly cell: NotebookCellTextModel;
|
|
12
|
+
readonly outputId: string;
|
|
13
|
+
constructor(resolvedNotebookEditorModel: IResolvedNotebookEditorModel, notebookUri: URI, cell: NotebookCellTextModel, outputId: string);
|
|
14
|
+
dispose(): void;
|
|
15
|
+
}
|
|
16
|
+
export declare class NotebookOutputEditorInput extends EditorInput {
|
|
17
|
+
private readonly notebookEditorModelResolverService;
|
|
18
|
+
static readonly ID: string;
|
|
19
|
+
private _notebookRef;
|
|
20
|
+
private readonly _notebookUri;
|
|
21
|
+
readonly cellIndex: number;
|
|
22
|
+
cellUri: URI | undefined;
|
|
23
|
+
readonly outputIndex: number;
|
|
24
|
+
private outputId;
|
|
25
|
+
constructor(notebookUri: URI, cellIndex: number, outputId: string | undefined, outputIndex: number, notebookEditorModelResolverService: INotebookEditorModelResolverService);
|
|
26
|
+
get typeId(): string;
|
|
27
|
+
resolve(): Promise<ResolvedNotebookOutputEditorInputModel>;
|
|
28
|
+
getSerializedData(): {
|
|
29
|
+
notebookUri: URI;
|
|
30
|
+
cellIndex: number;
|
|
31
|
+
outputIndex: number;
|
|
32
|
+
} | undefined;
|
|
33
|
+
getName(): string;
|
|
34
|
+
get editorId(): string;
|
|
35
|
+
get resource(): URI | undefined;
|
|
36
|
+
get capabilities(): EditorInputCapabilities;
|
|
37
|
+
dispose(): void;
|
|
38
|
+
}
|
|
39
|
+
export {};
|
package/vscode/src/vs/workbench/contrib/notebook/browser/outputEditor/notebookOutputEditorInput.js
ADDED
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
|
+
import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
4
|
+
import { EditorInputCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
|
|
5
|
+
import { EditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput';
|
|
6
|
+
import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
|
|
7
|
+
import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
|
|
8
|
+
|
|
9
|
+
var NotebookOutputEditorInput_1;
|
|
10
|
+
class ResolvedNotebookOutputEditorInputModel {
|
|
11
|
+
constructor(resolvedNotebookEditorModel, notebookUri, cell, outputId) {
|
|
12
|
+
this.resolvedNotebookEditorModel = resolvedNotebookEditorModel;
|
|
13
|
+
this.notebookUri = notebookUri;
|
|
14
|
+
this.cell = cell;
|
|
15
|
+
this.outputId = outputId;
|
|
16
|
+
}
|
|
17
|
+
dispose() {
|
|
18
|
+
this.resolvedNotebookEditorModel.dispose();
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
let NotebookOutputEditorInput = class NotebookOutputEditorInput extends EditorInput {
|
|
22
|
+
static { NotebookOutputEditorInput_1 = this; }
|
|
23
|
+
static { this.ID = 'workbench.input.notebookOutputEditorInput'; }
|
|
24
|
+
constructor(notebookUri, cellIndex, outputId, outputIndex, notebookEditorModelResolverService) {
|
|
25
|
+
super();
|
|
26
|
+
this.notebookEditorModelResolverService = notebookEditorModelResolverService;
|
|
27
|
+
this._notebookUri = notebookUri;
|
|
28
|
+
this.cellUri = undefined;
|
|
29
|
+
this.cellIndex = cellIndex;
|
|
30
|
+
this.outputId = outputId;
|
|
31
|
+
this.outputIndex = outputIndex;
|
|
32
|
+
}
|
|
33
|
+
get typeId() {
|
|
34
|
+
return NotebookOutputEditorInput_1.ID;
|
|
35
|
+
}
|
|
36
|
+
async resolve() {
|
|
37
|
+
if (!this._notebookRef) {
|
|
38
|
+
this._notebookRef = await this.notebookEditorModelResolverService.resolve(this._notebookUri);
|
|
39
|
+
}
|
|
40
|
+
const cell = this._notebookRef.object.notebook.cells[this.cellIndex];
|
|
41
|
+
if (!cell) {
|
|
42
|
+
throw ( new Error('Cell not found'));
|
|
43
|
+
}
|
|
44
|
+
this.cellUri = cell.uri;
|
|
45
|
+
const resolvedOutputId = cell.outputs[this.outputIndex]?.outputId;
|
|
46
|
+
if (!resolvedOutputId) {
|
|
47
|
+
throw ( new Error('Output not found'));
|
|
48
|
+
}
|
|
49
|
+
if (!this.outputId) {
|
|
50
|
+
this.outputId = resolvedOutputId;
|
|
51
|
+
}
|
|
52
|
+
return ( new ResolvedNotebookOutputEditorInputModel(this._notebookRef.object, this._notebookUri, cell, resolvedOutputId));
|
|
53
|
+
}
|
|
54
|
+
getSerializedData() {
|
|
55
|
+
if (!this._notebookRef) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
const cellIndex = this._notebookRef.object.notebook.cells.findIndex(c => isEqual(c.uri, this.cellUri));
|
|
59
|
+
const cell = this._notebookRef.object.notebook.cells[cellIndex];
|
|
60
|
+
if (!cell) {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
const outputIndex = cell.outputs.findIndex(o => o.outputId === this.outputId);
|
|
64
|
+
if (outputIndex === -1) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
return {
|
|
68
|
+
notebookUri: this._notebookUri,
|
|
69
|
+
cellIndex: cellIndex,
|
|
70
|
+
outputIndex: outputIndex,
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
getName() {
|
|
74
|
+
return localize(8387, "Notebook Output Preview");
|
|
75
|
+
}
|
|
76
|
+
get editorId() {
|
|
77
|
+
return 'notebookOutputEditor';
|
|
78
|
+
}
|
|
79
|
+
get resource() {
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
get capabilities() {
|
|
83
|
+
return EditorInputCapabilities.Readonly;
|
|
84
|
+
}
|
|
85
|
+
dispose() {
|
|
86
|
+
super.dispose();
|
|
87
|
+
}
|
|
88
|
+
};
|
|
89
|
+
NotebookOutputEditorInput = NotebookOutputEditorInput_1 = ( __decorate([
|
|
90
|
+
( __param(4, INotebookEditorModelResolverService))
|
|
91
|
+
], NotebookOutputEditorInput));
|
|
92
|
+
|
|
93
|
+
export { NotebookOutputEditorInput };
|
package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { CodeWindow } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/window";
|
|
2
|
-
import { NotebookEditorWidget } from "@codingame/monaco-vscode-
|
|
2
|
+
import { NotebookEditorWidget } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget";
|
|
3
3
|
import { DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
|
|
4
4
|
import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
|
|
5
5
|
import { IInstantiationService, ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
|
|
6
6
|
import { IBorrowValue } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService";
|
|
7
7
|
import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
|
|
8
|
-
import { INotebookEditor, INotebookEditorCreationOptions } from "@codingame/monaco-vscode-
|
|
8
|
+
import { INotebookEditor, INotebookEditorCreationOptions } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
|
|
9
9
|
import { Dimension } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
|
|
10
10
|
import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
|
|
11
11
|
import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
|
package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.js
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
|
|
2
2
|
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
3
|
import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
|
|
4
|
-
import { getDefaultNotebookCreationOptions, NotebookEditorWidget } from '@codingame/monaco-vscode-
|
|
4
|
+
import { getDefaultNotebookCreationOptions, NotebookEditorWidget } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';
|
|
5
5
|
import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
6
6
|
import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
|
|
7
7
|
import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
|
|
8
|
-
import { NotebookEditorInput, isCompositeNotebookEditorInput, isNotebookEditorInput } from '@codingame/monaco-vscode-
|
|
8
|
+
import { NotebookEditorInput, isCompositeNotebookEditorInput, isNotebookEditorInput } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
|
|
9
9
|
import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
10
10
|
import { GroupModelChangeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
|
|
11
11
|
import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
12
12
|
import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
|
|
13
|
-
import { MOST_RECENT_REPL_EDITOR, InteractiveWindowOpen } from '@codingame/monaco-vscode-
|
|
13
|
+
import { MOST_RECENT_REPL_EDITOR, InteractiveWindowOpen } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
|
|
14
14
|
import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
|
|
15
15
|
import { IEditorProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
|
|
16
|
-
import { NotebookDiffEditorInput } from '@codingame/monaco-vscode-
|
|
16
|
+
import { NotebookDiffEditorInput } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
|
|
17
17
|
|
|
18
18
|
let NotebookEditorWidgetService = class NotebookEditorWidgetService {
|
|
19
19
|
constructor(editorGroupService, editorService, contextKeyService, instantiationService) {
|
package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/
|
|
|
2
2
|
import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
|
|
3
3
|
import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
|
|
4
4
|
import { IWorkspaceTrustRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
|
|
5
|
-
import { NotebookCellTextModel } from "@codingame/monaco-vscode-
|
|
5
|
+
import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
|
|
6
6
|
import { INotebookTextModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
|
|
7
7
|
import { ICellExecutionParticipant } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService";
|
|
8
8
|
import { INotebookExecutionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService.service";
|
package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.js
CHANGED
|
@@ -4,7 +4,7 @@ import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common
|
|
|
4
4
|
import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
5
5
|
import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
|
|
6
6
|
import { IWorkspaceTrustRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
|
|
7
|
-
import { KernelPickerMRUStrategy } from '@codingame/monaco-vscode-
|
|
7
|
+
import { KernelPickerMRUStrategy } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy';
|
|
8
8
|
import { CellKind, NotebookCellExecutionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
9
9
|
import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
|
|
10
10
|
import { INotebookKernelService, INotebookKernelHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
|
|
@@ -27,7 +27,7 @@ let NotebookExecutionService = class NotebookExecutionService {
|
|
|
27
27
|
return;
|
|
28
28
|
}
|
|
29
29
|
this._logService.debug(`Execution`, `${JSON.stringify(( cellsArr.map(c => c.handle)))}`);
|
|
30
|
-
const message = ( localize(
|
|
30
|
+
const message = ( localize(8388, "Executing a notebook cell will run code from this workspace."));
|
|
31
31
|
const trust = await this._workspaceTrustRequestService.requestWorkspaceTrust({ message });
|
|
32
32
|
if (!trust) {
|
|
33
33
|
return;
|
|
@@ -3,7 +3,7 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
|
|
|
3
3
|
import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
|
|
4
4
|
import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
|
|
5
5
|
import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
|
|
6
|
-
import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookCellExecution, INotebookExecution, INotebookFailStateChangedEvent } from "@codingame/monaco-vscode-
|
|
6
|
+
import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookCellExecution, INotebookExecution, INotebookFailStateChangedEvent } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
|
|
7
7
|
import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
|
|
8
8
|
import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
|
|
9
9
|
export declare class NotebookExecutionStateService extends Disposable implements INotebookExecutionStateService {
|
|
@@ -12,7 +12,7 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
|
|
|
12
12
|
import { CellUri, NotebookCellExecutionState, CellEditType, NotebookExecutionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
13
13
|
import { CellExecutionUpdateType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService';
|
|
14
14
|
import { INotebookExecutionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService.service';
|
|
15
|
-
import { NotebookExecutionType } from '@codingame/monaco-vscode-
|
|
15
|
+
import { NotebookExecutionType } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
|
|
16
16
|
import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
|
|
17
17
|
import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
|
|
18
18
|
import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
|
|
@@ -114,7 +114,7 @@ registerAction2(class extends Action2 {
|
|
|
114
114
|
constructor() {
|
|
115
115
|
super({
|
|
116
116
|
id: 'notebook.clearNotebookKernelsMRUCache',
|
|
117
|
-
title: ( localize2(
|
|
117
|
+
title: ( localize2(8389, "Clear Notebook Kernels MRU Cache")),
|
|
118
118
|
category: Categories.Developer,
|
|
119
119
|
f1: true
|
|
120
120
|
});
|
package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.js
CHANGED
|
@@ -16,7 +16,7 @@ import { IExtensionManagementService } from '@codingame/monaco-vscode-api/vscode
|
|
|
16
16
|
import { areSameExtensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
|
|
17
17
|
import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
|
|
18
18
|
import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
|
|
19
|
-
import { Memento } from '@codingame/monaco-vscode-
|
|
19
|
+
import { Memento } from '@codingame/monaco-vscode-c8227507-8e59-53d6-b50b-71c0ab384cf4-common/vscode/vs/workbench/common/memento';
|
|
20
20
|
import { distinct } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
|
|
21
21
|
import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
|
|
22
22
|
|
|
@@ -75,14 +75,14 @@ let NotebookKeymapService = class NotebookKeymapService extends Disposable {
|
|
|
75
75
|
}
|
|
76
76
|
};
|
|
77
77
|
this.notificationService.prompt(Severity.Info, ( localize(
|
|
78
|
-
|
|
78
|
+
8390,
|
|
79
79
|
"Disable other keymaps ({0}) to avoid conflicts between keybindings?",
|
|
80
80
|
( distinct(( oldKeymaps.map(k => k.local.manifest.displayName))).map(name => `'${name}'`)).join(', ')
|
|
81
81
|
)), [{
|
|
82
|
-
label: ( localize(
|
|
82
|
+
label: ( localize(8391, "Yes")),
|
|
83
83
|
run: () => onPrompt(true)
|
|
84
84
|
}, {
|
|
85
|
-
label: ( localize(
|
|
85
|
+
label: ( localize(8392, "No")),
|
|
86
86
|
run: () => onPrompt(false)
|
|
87
87
|
}]);
|
|
88
88
|
}
|
package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.js
CHANGED
|
@@ -10,7 +10,7 @@ let NotebookLoggingService = class NotebookLoggingService extends Disposable {
|
|
|
10
10
|
static { this.ID = 'notebook'; }
|
|
11
11
|
constructor(loggerService) {
|
|
12
12
|
super();
|
|
13
|
-
this._logger = this._register(loggerService.createLogger(logChannelId, { name: ( localize(
|
|
13
|
+
this._logger = this._register(loggerService.createLogger(logChannelId, { name: ( localize(8393, "Notebook")), group: windowLogGroup }));
|
|
14
14
|
}
|
|
15
15
|
debug(category, output) {
|
|
16
16
|
this._logger.debug(`[${category}] ${output}`);
|
|
@@ -7,13 +7,13 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
|
|
|
7
7
|
import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
|
|
8
8
|
import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
|
|
9
9
|
import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
|
|
10
|
-
import { NotebookCellTextModel } from "@codingame/monaco-vscode-
|
|
10
|
+
import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
|
|
11
11
|
import { NotebookTextModel } from "../../common/model/notebookTextModel.js";
|
|
12
12
|
import { INotebookContributionData, INotebookRendererInfo, IOrderedMimeType, IOutputDto, NotebookExtensionDescription, INotebookStaticPreloadInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
|
|
13
13
|
import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
|
|
14
14
|
import { NotebookOutputRendererInfo } from "../../common/notebookOutputRenderer.js";
|
|
15
15
|
import { NotebookProviderInfo } from "../../common/notebookProvider.js";
|
|
16
|
-
import { INotebookSerializer, SimpleNotebookProviderInfo } from "@codingame/monaco-vscode-
|
|
16
|
+
import { INotebookSerializer, SimpleNotebookProviderInfo } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookService";
|
|
17
17
|
import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
|
|
18
18
|
import { IEditorType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService";
|
|
19
19
|
import { IEditorResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService.service";
|