@codingame/monaco-vscode-notebook-service-override 37.2.0 → 37.3.1
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 +3 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebook.js +6 -6
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDocuments.js +6 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.js +8 -8
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookKernels.js +5 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js +1 -1
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js +9 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.js +26 -26
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.js +6 -6
- 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.js +6 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.js +21 -21
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.js +10 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.js +10 -10
- 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 +8 -8
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.js +10 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted.js +1 -1
- 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 +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.js +36 -23
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookSelectionHighlight.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.js +14 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.js +7 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableContextKeys.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.js +2 -2
- 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 +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.js +16 -16
- 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 +29 -29
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.js +6 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/viewportWarmup/viewportWarmup.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/apiActions.js +11 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/editActions.js +40 -40
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/executeActions.js +33 -29
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.js +22 -22
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.js +11 -11
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/sectionActions.js +15 -15
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/variablesActions.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.js +25 -25
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.js +8 -8
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebook.contribution.js +73 -73
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.js +10 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibleView.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookExtensionPoint.js +35 -35
- package/vscode/src/vs/workbench/contrib/notebook/browser/outputEditor/notebookOutputEditor.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/outputEditor/notebookOutputEditor.js +10 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/outputEditor/notebookOutputEditorInput.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/outputEditor/notebookOutputEditorInput.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/replEditorAccessibleView.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookCellStatusBarServiceImpl.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.js +2 -2
- 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 +9 -6
- 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 +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl.js +7 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKeymapServiceImpl.js +15 -12
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookRendererMessagingServiceImpl.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.js +9 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.js +8 -8
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js +2 -2
- 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 +28 -28
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/common/services/notebookWebWorker.js +44 -18
- package/vscode/src/vs/workbench/contrib/replNotebook/browser/repl.contribution.js +7 -7
- package/vscode/src/vs/workbench/contrib/replNotebook/browser/replEditorAccessibilityHelp.js +14 -14
- package/vscode/src/vs/workbench/services/workingCopy/common/abstractFileWorkingCopyManager.js +2 -2
- package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.js +12 -12
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.js +5 -5
package/index.js
CHANGED
|
@@ -30,8 +30,8 @@ import { NotebookDocumentWorkbenchService } from '@codingame/monaco-vscode-api/v
|
|
|
30
30
|
import { INotebookDocumentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/notebook/common/notebookDocumentService.service';
|
|
31
31
|
import { INotebookOriginalCellModelFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalCellModelFactory.service';
|
|
32
32
|
import { INotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory.service';
|
|
33
|
-
import { OriginalNotebookCellModelFactory } from '@codingame/monaco-vscode-
|
|
34
|
-
import { NotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-
|
|
33
|
+
import { OriginalNotebookCellModelFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalCellModelFactory';
|
|
34
|
+
import { NotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory';
|
|
35
35
|
import { INotebookCellOutlineDataSourceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.service';
|
|
36
36
|
import { NotebookCellOutlineDataSourceFactory } from './vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.js';
|
|
37
37
|
import { NotebookOutlineEntryFactory } from './vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-notebook-service-override",
|
|
3
|
-
"version": "37.
|
|
3
|
+
"version": "37.3.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - notebook service-override",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-api": "37.
|
|
19
|
-
"@codingame/monaco-vscode-katex-common": "37.
|
|
18
|
+
"@codingame/monaco-vscode-api": "37.3.1",
|
|
19
|
+
"@codingame/monaco-vscode-katex-common": "37.3.1"
|
|
20
20
|
},
|
|
21
21
|
"main": "index.js",
|
|
22
22
|
"module": "index.js",
|
|
@@ -9,7 +9,7 @@ import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/t
|
|
|
9
9
|
import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
|
|
10
10
|
import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
|
|
11
11
|
import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
|
|
12
|
-
import { NotebookDto } from '@codingame/monaco-vscode-
|
|
12
|
+
import { NotebookDto } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/browser/mainThreadNotebookDto';
|
|
13
13
|
import { INotebookCellStatusBarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service';
|
|
14
14
|
import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService';
|
|
15
15
|
import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
|
|
@@ -87,10 +87,10 @@ let MainThreadNotebooks = class MainThreadNotebooks {
|
|
|
87
87
|
};
|
|
88
88
|
}
|
|
89
89
|
const fileNames = contributedType.selectors;
|
|
90
|
-
const includes =
|
|
90
|
+
const includes = fileNames.map(selector => {
|
|
91
91
|
const globPattern = selector.include || selector;
|
|
92
92
|
return ( globPattern.toString());
|
|
93
|
-
})
|
|
93
|
+
});
|
|
94
94
|
if (!includes.length) {
|
|
95
95
|
return {
|
|
96
96
|
results: [],
|
|
@@ -108,13 +108,13 @@ let MainThreadNotebooks = class MainThreadNotebooks {
|
|
|
108
108
|
return [];
|
|
109
109
|
});
|
|
110
110
|
const searchComplete = await this._proxy.$searchInNotebooks(handle, textQuery, thisPriorityInfo, otherEditorsPriorityInfo, token);
|
|
111
|
-
const revivedResults =
|
|
111
|
+
const revivedResults = searchComplete.results.map(result => {
|
|
112
112
|
const resource = URI.revive(result.resource);
|
|
113
113
|
return {
|
|
114
114
|
resource,
|
|
115
|
-
cellResults:
|
|
115
|
+
cellResults: result.cellResults.map(e => revive(e))
|
|
116
116
|
};
|
|
117
|
-
})
|
|
117
|
+
});
|
|
118
118
|
return {
|
|
119
119
|
results: revivedResults,
|
|
120
120
|
limitHit: searchComplete.limitHit
|
|
@@ -9,7 +9,7 @@ import { NotebookCellsChangeType } from '@codingame/monaco-vscode-api/vscode/vs/
|
|
|
9
9
|
import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
|
|
10
10
|
import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
|
|
11
11
|
import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
|
|
12
|
-
import { NotebookDto } from '@codingame/monaco-vscode-
|
|
12
|
+
import { NotebookDto } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/browser/mainThreadNotebookDto';
|
|
13
13
|
import { SerializableObjectWithBuffers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier';
|
|
14
14
|
|
|
15
15
|
let MainThreadNotebookDocuments = class MainThreadNotebookDocuments {
|
|
@@ -48,7 +48,9 @@ let MainThreadNotebookDocuments = class MainThreadNotebookDocuments {
|
|
|
48
48
|
case NotebookCellsChangeType.ModelChange:
|
|
49
49
|
eventDto.rawEvents.push({
|
|
50
50
|
kind: e.kind,
|
|
51
|
-
changes:
|
|
51
|
+
changes: e.changes.map(
|
|
52
|
+
diff => [diff[0], diff[1], diff[2].map(cell => NotebookDto.toNotebookCellDto(cell))]
|
|
53
|
+
)
|
|
52
54
|
});
|
|
53
55
|
break;
|
|
54
56
|
case NotebookCellsChangeType.Move:
|
|
@@ -63,7 +65,7 @@ let MainThreadNotebookDocuments = class MainThreadNotebookDocuments {
|
|
|
63
65
|
eventDto.rawEvents.push({
|
|
64
66
|
kind: e.kind,
|
|
65
67
|
index: e.index,
|
|
66
|
-
outputs:
|
|
68
|
+
outputs: e.outputs.map(NotebookDto.toNotebookOutputDto)
|
|
67
69
|
});
|
|
68
70
|
break;
|
|
69
71
|
case NotebookCellsChangeType.OutputItem:
|
|
@@ -71,7 +73,7 @@ let MainThreadNotebookDocuments = class MainThreadNotebookDocuments {
|
|
|
71
73
|
kind: e.kind,
|
|
72
74
|
index: e.index,
|
|
73
75
|
outputId: e.outputId,
|
|
74
|
-
outputItems:
|
|
76
|
+
outputItems: e.outputItems.map(NotebookDto.toNotebookOutputItemDto),
|
|
75
77
|
append: e.append
|
|
76
78
|
});
|
|
77
79
|
break;
|
|
@@ -5,7 +5,7 @@ import { DisposableStore, DisposableMap, combinedDisposable } from '@codingame/m
|
|
|
5
5
|
import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
|
|
6
6
|
import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
|
|
7
7
|
import { MainThreadNotebookDocuments } from './mainThreadNotebookDocuments.js';
|
|
8
|
-
import { NotebookDto } from '@codingame/monaco-vscode-
|
|
8
|
+
import { NotebookDto } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/browser/mainThreadNotebookDto';
|
|
9
9
|
import { MainThreadNotebookEditors } from './mainThreadNotebookEditors.js';
|
|
10
10
|
import { extHostCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
|
|
11
11
|
import { editorGroupToColumn } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupColumn';
|
|
@@ -26,7 +26,7 @@ class NotebookAndEditorState {
|
|
|
26
26
|
removedDocuments: [],
|
|
27
27
|
addedEditors: [...( after.textEditors.values())],
|
|
28
28
|
removedEditors: [],
|
|
29
|
-
visibleEditors:
|
|
29
|
+
visibleEditors: [...after.visibleEditors].map(editor => editor[0])
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
32
|
const documentDelta = diffSets(before.documents, after.documents);
|
|
@@ -35,11 +35,11 @@ class NotebookAndEditorState {
|
|
|
35
35
|
const visibleEditorDelta = diffMaps(before.visibleEditors, after.visibleEditors);
|
|
36
36
|
return {
|
|
37
37
|
addedDocuments: documentDelta.added,
|
|
38
|
-
removedDocuments:
|
|
38
|
+
removedDocuments: documentDelta.removed.map(e => e.uri),
|
|
39
39
|
addedEditors: editorDelta.added,
|
|
40
|
-
removedEditors:
|
|
40
|
+
removedEditors: editorDelta.removed.map(removed => removed.getId()),
|
|
41
41
|
newActiveEditor: newActiveEditor,
|
|
42
|
-
visibleEditors: visibleEditorDelta.added.length === 0 && visibleEditorDelta.removed.length === 0 ? undefined :
|
|
42
|
+
visibleEditors: visibleEditorDelta.added.length === 0 && visibleEditorDelta.removed.length === 0 ? undefined : [...after.visibleEditors].map(editor => editor[0])
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
45
|
constructor(documents, textEditors, activeEditor, visibleEditors) {
|
|
@@ -138,8 +138,8 @@ let MainThreadNotebooksAndEditors = MainThreadNotebooksAndEditors_1 = class Main
|
|
|
138
138
|
removedEditors: delta.removedEditors,
|
|
139
139
|
newActiveEditor: delta.newActiveEditor,
|
|
140
140
|
visibleEditors: delta.visibleEditors,
|
|
141
|
-
addedDocuments:
|
|
142
|
-
addedEditors:
|
|
141
|
+
addedDocuments: delta.addedDocuments.map(MainThreadNotebooksAndEditors_1._asModelAddData),
|
|
142
|
+
addedEditors: delta.addedEditors.map(this._asEditorAddData, this)
|
|
143
143
|
};
|
|
144
144
|
this._proxy.$acceptDocumentAndEditorsDelta(( new SerializableObjectWithBuffers(dto)));
|
|
145
145
|
this._mainThreadEditors.handleEditorsRemoved(delta.removedEditors);
|
|
@@ -174,7 +174,7 @@ let MainThreadNotebooksAndEditors = MainThreadNotebooksAndEditors_1 = class Main
|
|
|
174
174
|
uri: e.uri,
|
|
175
175
|
metadata: e.metadata,
|
|
176
176
|
versionId: e.versionId,
|
|
177
|
-
cells:
|
|
177
|
+
cells: e.cells.map(NotebookDto.toNotebookCellDto)
|
|
178
178
|
};
|
|
179
179
|
}
|
|
180
180
|
_asEditorAddData(add) {
|
|
@@ -7,7 +7,7 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
|
|
|
7
7
|
import { DisposableMap, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
8
8
|
import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
|
|
9
9
|
import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
|
|
10
|
-
import { NotebookDto } from '@codingame/monaco-vscode-
|
|
10
|
+
import { NotebookDto } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/browser/mainThreadNotebookDto';
|
|
11
11
|
import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
|
|
12
12
|
import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
|
|
13
13
|
import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
|
|
@@ -18,7 +18,7 @@ import { AsyncIterableProducer } from '@codingame/monaco-vscode-api/vscode/vs/ba
|
|
|
18
18
|
|
|
19
19
|
class MainThreadKernel {
|
|
20
20
|
get preloadUris() {
|
|
21
|
-
return
|
|
21
|
+
return this.preloads.map(p => p.uri);
|
|
22
22
|
}
|
|
23
23
|
get preloadProvides() {
|
|
24
24
|
return this.preloads.flatMap(p => p.provides);
|
|
@@ -253,7 +253,7 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
253
253
|
const updates = data.value;
|
|
254
254
|
try {
|
|
255
255
|
const execution = this._executions.get(handle);
|
|
256
|
-
execution?.update(
|
|
256
|
+
execution?.update(updates.map(NotebookDto.fromCellExecuteUpdateDto));
|
|
257
257
|
} catch (e) {
|
|
258
258
|
onUnexpectedError(e);
|
|
259
259
|
}
|
|
@@ -317,7 +317,7 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
317
317
|
viewType: notebookType,
|
|
318
318
|
provideKernelSourceActions: async () => {
|
|
319
319
|
const actions = await this._proxy.$provideKernelSourceActions(handle, CancellationToken.None);
|
|
320
|
-
return
|
|
320
|
+
return actions.map(action => {
|
|
321
321
|
let documentation = action.documentation;
|
|
322
322
|
if (action.documentation && typeof action.documentation !== "string") {
|
|
323
323
|
documentation = URI.revive(action.documentation);
|
|
@@ -329,7 +329,7 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
|
|
|
329
329
|
detail: action.detail,
|
|
330
330
|
documentation
|
|
331
331
|
};
|
|
332
|
-
})
|
|
332
|
+
});
|
|
333
333
|
}
|
|
334
334
|
};
|
|
335
335
|
if (typeof eventHandle === "number") {
|
|
@@ -18,7 +18,7 @@ class ExtHostNotebookDocumentSaveParticipant {
|
|
|
18
18
|
}
|
|
19
19
|
let _warningTimeout;
|
|
20
20
|
const p = ( new Promise((resolve, reject) => {
|
|
21
|
-
_warningTimeout = setTimeout(() => reject(( new Error(( localize(
|
|
21
|
+
_warningTimeout = setTimeout(() => reject(( new Error(( localize(5002, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
|
|
22
22
|
this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
|
|
23
23
|
clearTimeout(_warningTimeout);
|
|
24
24
|
return undefined;
|
|
@@ -31,7 +31,7 @@ import { EmptyTextEditorHintContributionId } from '@codingame/monaco-vscode-api/
|
|
|
31
31
|
import * as emptyTextEditorHint from './emptyTextEditorHint.css';
|
|
32
32
|
|
|
33
33
|
var EmptyTextEditorHintContentWidget_1;
|
|
34
|
-
registerCss(emptyTextEditorHint);
|
|
34
|
+
registerCss(emptyTextEditorHint, 1);
|
|
35
35
|
const emptyTextEditorHintSetting = "workbench.editor.empty.hint";
|
|
36
36
|
let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution extends Disposable {
|
|
37
37
|
static {
|
|
@@ -180,8 +180,8 @@ let EmptyTextEditorHintContentWidget = class EmptyTextEditorHintContentWidget ex
|
|
|
180
180
|
getActions: () => {
|
|
181
181
|
return [{
|
|
182
182
|
id: "workench.action.disableEmptyEditorHint",
|
|
183
|
-
label: ( localize(
|
|
184
|
-
tooltip: ( localize(
|
|
183
|
+
label: ( localize(13109, "Disable Empty Editor Hint")),
|
|
184
|
+
tooltip: ( localize(13109, "Disable Empty Editor Hint")),
|
|
185
185
|
enabled: true,
|
|
186
186
|
class: undefined,
|
|
187
187
|
run: () => {
|
|
@@ -231,14 +231,14 @@ let EmptyTextEditorHintContentWidget = class EmptyTextEditorHintContentWidget ex
|
|
|
231
231
|
this.editor.focus();
|
|
232
232
|
};
|
|
233
233
|
const keybindingsLookup = [askSomethingCommandId, ChangeLanguageAction.ID];
|
|
234
|
-
const keybindingLabels =
|
|
234
|
+
const keybindingLabels = keybindingsLookup.map(id => this.keybindingService.lookupKeybinding(id)?.getLabel());
|
|
235
235
|
const hintMsg = (hasInlineChatProvider ? ( localize(
|
|
236
|
-
|
|
236
|
+
13110,
|
|
237
237
|
"[[Generate code]] ({0}), or [[select a language]] ({1}). Start typing to dismiss or [[don't show]] this again.",
|
|
238
238
|
keybindingLabels.at(0) ?? "",
|
|
239
239
|
keybindingLabels.at(1) ?? ""
|
|
240
240
|
)) : ( localize(
|
|
241
|
-
|
|
241
|
+
13111,
|
|
242
242
|
"[[Select a language]] ({0}) to get started. Start typing to dismiss or [[don't show]] this again.",
|
|
243
243
|
keybindingLabels.at(1) ?? ""
|
|
244
244
|
))).replaceAll(" ()", "");
|
|
@@ -248,11 +248,11 @@ let EmptyTextEditorHintContentWidget = class EmptyTextEditorHintContentWidget ex
|
|
|
248
248
|
});
|
|
249
249
|
hintElement.style.fontStyle = "italic";
|
|
250
250
|
const ariaLabel = hasInlineChatProvider ? ( localize(
|
|
251
|
-
|
|
251
|
+
13112,
|
|
252
252
|
"Execute {0} to ask a question, execute {1} to select a language and get started. Start typing to dismiss.",
|
|
253
253
|
...keybindingLabels
|
|
254
254
|
)) : ( localize(
|
|
255
|
-
|
|
255
|
+
13113,
|
|
256
256
|
"Execute {0} to select a language and get started. Start typing to dismiss.",
|
|
257
257
|
...keybindingLabels
|
|
258
258
|
));
|
|
@@ -275,7 +275,7 @@ let EmptyTextEditorHintContentWidget = class EmptyTextEditorHintContentWidget ex
|
|
|
275
275
|
} = this.getHint();
|
|
276
276
|
this.domNode.append(hintElement);
|
|
277
277
|
this.ariaLabel = ariaLabel.concat(( localize(
|
|
278
|
-
|
|
278
|
+
13114,
|
|
279
279
|
" Toggle {0} in settings to disable this hint.",
|
|
280
280
|
AccessibilityVerbositySettingId.EmptyEditorHint
|
|
281
281
|
)));
|
package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.js
CHANGED
|
@@ -9,11 +9,11 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
|
|
|
9
9
|
import { InputFocusedContext, InputFocusedContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
|
|
10
10
|
import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
|
|
11
11
|
import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
|
|
12
|
-
import { moveCellRange, copyCellRange, computeCellLinesContents, joinCellsWithSurrounds, joinSelectedCells, changeCellToKind } from '@codingame/monaco-vscode-
|
|
13
|
-
import { NotebookCellAction, CellOverflowToolbarGroups, CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, NotebookMultiCellAction, parseMultiCellExecutionArgs, cellExecutionArgs } from '@codingame/monaco-vscode-
|
|
12
|
+
import { moveCellRange, copyCellRange, computeCellLinesContents, joinCellsWithSurrounds, joinSelectedCells, changeCellToKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
|
|
13
|
+
import { NotebookCellAction, CellOverflowToolbarGroups, CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, NotebookMultiCellAction, parseMultiCellExecutionArgs, cellExecutionArgs } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
|
|
14
14
|
import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, EXPAND_CELL_OUTPUT_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
|
|
15
15
|
import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_HAS_OUTPUTS } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
|
|
16
|
-
import { moveUpIcon, moveDownIcon, splitCellIcon } from '@codingame/monaco-vscode-
|
|
16
|
+
import { moveUpIcon, moveDownIcon, splitCellIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
|
|
17
17
|
import { CellEditType, CellKind, NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
18
18
|
import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
|
|
19
19
|
import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
|
|
@@ -27,7 +27,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
27
27
|
constructor() {
|
|
28
28
|
super({
|
|
29
29
|
id: MOVE_CELL_UP_COMMAND_ID,
|
|
30
|
-
title: ( localize2(
|
|
30
|
+
title: ( localize2(16476, "Move Cell Up")),
|
|
31
31
|
icon: moveUpIcon,
|
|
32
32
|
keybinding: {
|
|
33
33
|
primary: KeyMod.Alt | KeyCode.UpArrow,
|
|
@@ -50,7 +50,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
50
50
|
constructor() {
|
|
51
51
|
super({
|
|
52
52
|
id: MOVE_CELL_DOWN_COMMAND_ID,
|
|
53
|
-
title: ( localize2(
|
|
53
|
+
title: ( localize2(16477, "Move Cell Down")),
|
|
54
54
|
icon: moveDownIcon,
|
|
55
55
|
keybinding: {
|
|
56
56
|
primary: KeyMod.Alt | KeyCode.DownArrow,
|
|
@@ -73,7 +73,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
73
73
|
constructor() {
|
|
74
74
|
super({
|
|
75
75
|
id: COPY_CELL_UP_COMMAND_ID,
|
|
76
|
-
title: ( localize2(
|
|
76
|
+
title: ( localize2(16478, "Copy Cell Up")),
|
|
77
77
|
keybinding: {
|
|
78
78
|
primary: KeyMod.Alt | KeyMod.Shift | KeyCode.UpArrow,
|
|
79
79
|
when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( InputFocusedContext.toNegated()))),
|
|
@@ -89,7 +89,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
89
89
|
constructor() {
|
|
90
90
|
super({
|
|
91
91
|
id: COPY_CELL_DOWN_COMMAND_ID,
|
|
92
|
-
title: ( localize2(
|
|
92
|
+
title: ( localize2(16479, "Copy Cell Down")),
|
|
93
93
|
keybinding: {
|
|
94
94
|
primary: KeyMod.Alt | KeyMod.Shift | KeyCode.DownArrow,
|
|
95
95
|
when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( InputFocusedContext.toNegated()))),
|
|
@@ -115,7 +115,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
115
115
|
constructor() {
|
|
116
116
|
super({
|
|
117
117
|
id: SPLIT_CELL_COMMAND_ID,
|
|
118
|
-
title: ( localize2(
|
|
118
|
+
title: ( localize2(16480, "Split Cell")),
|
|
119
119
|
menu: {
|
|
120
120
|
id: MenuId.NotebookCellTitle,
|
|
121
121
|
when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, ( NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated()))),
|
|
@@ -167,14 +167,14 @@ registerAction2(class extends NotebookCellAction {
|
|
|
167
167
|
editType: CellEditType.Replace,
|
|
168
168
|
index: index + 1,
|
|
169
169
|
count: 0,
|
|
170
|
-
cells:
|
|
170
|
+
cells: newLinesContents.slice(1).map(line => ({
|
|
171
171
|
cellKind: kind,
|
|
172
172
|
language,
|
|
173
173
|
mime,
|
|
174
174
|
source: line,
|
|
175
175
|
outputs: [],
|
|
176
176
|
metadata: {}
|
|
177
|
-
}))
|
|
177
|
+
}))
|
|
178
178
|
}))], {
|
|
179
179
|
quotableLabel: "Split Notebook Cell"
|
|
180
180
|
});
|
|
@@ -187,7 +187,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
187
187
|
constructor() {
|
|
188
188
|
super({
|
|
189
189
|
id: JOIN_CELL_ABOVE_COMMAND_ID,
|
|
190
|
-
title: ( localize2(
|
|
190
|
+
title: ( localize2(16481, "Join With Previous Cell")),
|
|
191
191
|
keybinding: {
|
|
192
192
|
when: NOTEBOOK_EDITOR_FOCUSED,
|
|
193
193
|
primary: KeyMod.WinCtrl | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyJ,
|
|
@@ -210,7 +210,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
210
210
|
constructor() {
|
|
211
211
|
super({
|
|
212
212
|
id: JOIN_CELL_BELOW_COMMAND_ID,
|
|
213
|
-
title: ( localize2(
|
|
213
|
+
title: ( localize2(16482, "Join With Next Cell")),
|
|
214
214
|
keybinding: {
|
|
215
215
|
when: NOTEBOOK_EDITOR_FOCUSED,
|
|
216
216
|
primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.KeyJ,
|
|
@@ -233,7 +233,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
233
233
|
constructor() {
|
|
234
234
|
super({
|
|
235
235
|
id: JOIN_SELECTED_CELLS_COMMAND_ID,
|
|
236
|
-
title: ( localize2(
|
|
236
|
+
title: ( localize2(16483, "Join Selected Cells")),
|
|
237
237
|
menu: {
|
|
238
238
|
id: MenuId.NotebookCellTitle,
|
|
239
239
|
when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE)),
|
|
@@ -254,7 +254,7 @@ registerAction2(class ChangeCellToCodeAction extends NotebookMultiCellAction {
|
|
|
254
254
|
constructor() {
|
|
255
255
|
super({
|
|
256
256
|
id: CHANGE_CELL_TO_CODE_COMMAND_ID,
|
|
257
|
-
title: ( localize2(
|
|
257
|
+
title: ( localize2(16484, "Change Cell to Code")),
|
|
258
258
|
keybinding: {
|
|
259
259
|
when: ( ContextKeyExpr.and(
|
|
260
260
|
NOTEBOOK_EDITOR_FOCUSED,
|
|
@@ -285,7 +285,7 @@ registerAction2(class ChangeCellToMarkdownAction extends NotebookMultiCellAction
|
|
|
285
285
|
constructor() {
|
|
286
286
|
super({
|
|
287
287
|
id: CHANGE_CELL_TO_MARKDOWN_COMMAND_ID,
|
|
288
|
-
title: ( localize2(
|
|
288
|
+
title: ( localize2(16485, "Change Cell to Markdown")),
|
|
289
289
|
keybinding: {
|
|
290
290
|
when: ( ContextKeyExpr.and(
|
|
291
291
|
NOTEBOOK_EDITOR_FOCUSED,
|
|
@@ -324,7 +324,7 @@ registerAction2(class CollapseCellInputAction extends NotebookMultiCellAction {
|
|
|
324
324
|
constructor() {
|
|
325
325
|
super({
|
|
326
326
|
id: COLLAPSE_CELL_INPUT_COMMAND_ID,
|
|
327
|
-
title: ( localize2(
|
|
327
|
+
title: ( localize2(16486, "Collapse Cell Input")),
|
|
328
328
|
keybinding: {
|
|
329
329
|
when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated()), ( InputFocusedContext.toNegated()))),
|
|
330
330
|
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyC),
|
|
@@ -347,7 +347,7 @@ registerAction2(class ExpandCellInputAction extends NotebookMultiCellAction {
|
|
|
347
347
|
constructor() {
|
|
348
348
|
super({
|
|
349
349
|
id: EXPAND_CELL_INPUT_COMMAND_ID,
|
|
350
|
-
title: ( localize2(
|
|
350
|
+
title: ( localize2(16487, "Expand Cell Input")),
|
|
351
351
|
keybinding: {
|
|
352
352
|
when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_INPUT_COLLAPSED)),
|
|
353
353
|
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyC),
|
|
@@ -370,7 +370,7 @@ registerAction2(class CollapseCellOutputAction extends NotebookMultiCellAction {
|
|
|
370
370
|
constructor() {
|
|
371
371
|
super({
|
|
372
372
|
id: COLLAPSE_CELL_OUTPUT_COMMAND_ID,
|
|
373
|
-
title: ( localize2(
|
|
373
|
+
title: ( localize2(16488, "Collapse Cell Output")),
|
|
374
374
|
keybinding: {
|
|
375
375
|
when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( NOTEBOOK_CELL_OUTPUT_COLLAPSED.toNegated()), ( InputFocusedContext.toNegated()), NOTEBOOK_CELL_HAS_OUTPUTS)),
|
|
376
376
|
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyT),
|
|
@@ -390,7 +390,7 @@ registerAction2(class ExpandCellOuputAction extends NotebookMultiCellAction {
|
|
|
390
390
|
constructor() {
|
|
391
391
|
super({
|
|
392
392
|
id: EXPAND_CELL_OUTPUT_COMMAND_ID,
|
|
393
|
-
title: ( localize2(
|
|
393
|
+
title: ( localize2(16489, "Expand Cell Output")),
|
|
394
394
|
keybinding: {
|
|
395
395
|
when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED)),
|
|
396
396
|
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyT),
|
|
@@ -411,9 +411,9 @@ registerAction2(class extends NotebookMultiCellAction {
|
|
|
411
411
|
super({
|
|
412
412
|
id: TOGGLE_CELL_OUTPUTS_COMMAND_ID,
|
|
413
413
|
precondition: NOTEBOOK_CELL_LIST_FOCUSED,
|
|
414
|
-
title: ( localize2(
|
|
414
|
+
title: ( localize2(16490, "Toggle Outputs")),
|
|
415
415
|
metadata: {
|
|
416
|
-
description: ( localize(
|
|
416
|
+
description: ( localize(16490, "Toggle Outputs")),
|
|
417
417
|
args: cellExecutionArgs
|
|
418
418
|
}
|
|
419
419
|
});
|
|
@@ -437,7 +437,7 @@ registerAction2(class CollapseAllCellInputsAction extends NotebookMultiCellActio
|
|
|
437
437
|
constructor() {
|
|
438
438
|
super({
|
|
439
439
|
id: COLLAPSE_ALL_CELL_INPUTS_COMMAND_ID,
|
|
440
|
-
title: ( localize2(
|
|
440
|
+
title: ( localize2(16491, "Collapse All Cell Inputs")),
|
|
441
441
|
f1: true
|
|
442
442
|
});
|
|
443
443
|
}
|
|
@@ -449,7 +449,7 @@ registerAction2(class ExpandAllCellInputsAction extends NotebookMultiCellAction
|
|
|
449
449
|
constructor() {
|
|
450
450
|
super({
|
|
451
451
|
id: EXPAND_ALL_CELL_INPUTS_COMMAND_ID,
|
|
452
|
-
title: ( localize2(
|
|
452
|
+
title: ( localize2(16492, "Expand All Cell Inputs")),
|
|
453
453
|
f1: true
|
|
454
454
|
});
|
|
455
455
|
}
|
|
@@ -461,7 +461,7 @@ registerAction2(class CollapseAllCellOutputsAction extends NotebookMultiCellActi
|
|
|
461
461
|
constructor() {
|
|
462
462
|
super({
|
|
463
463
|
id: COLLAPSE_ALL_CELL_OUTPUTS_COMMAND_ID,
|
|
464
|
-
title: ( localize2(
|
|
464
|
+
title: ( localize2(16493, "Collapse All Cell Outputs")),
|
|
465
465
|
f1: true
|
|
466
466
|
});
|
|
467
467
|
}
|
|
@@ -473,7 +473,7 @@ registerAction2(class ExpandAllCellOutputsAction extends NotebookMultiCellAction
|
|
|
473
473
|
constructor() {
|
|
474
474
|
super({
|
|
475
475
|
id: EXPAND_ALL_CELL_OUTPUTS_COMMAND_ID,
|
|
476
|
-
title: ( localize2(
|
|
476
|
+
title: ( localize2(16494, "Expand All Cell Outputs")),
|
|
477
477
|
f1: true
|
|
478
478
|
});
|
|
479
479
|
}
|
|
@@ -485,7 +485,7 @@ registerAction2(class ToggleCellOutputScrolling extends NotebookMultiCellAction
|
|
|
485
485
|
constructor() {
|
|
486
486
|
super({
|
|
487
487
|
id: TOGGLE_CELL_OUTPUT_SCROLLING,
|
|
488
|
-
title: ( localize2(
|
|
488
|
+
title: ( localize2(16495, "Toggle Scroll Cell Output")),
|
|
489
489
|
keybinding: {
|
|
490
490
|
when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( InputFocusedContext.toNegated()), NOTEBOOK_CELL_HAS_OUTPUTS)),
|
|
491
491
|
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyY),
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
3
|
import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
4
4
|
import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
|
|
5
|
-
import { NotebookExecutionType } from '@codingame/monaco-vscode-
|
|
5
|
+
import { NotebookExecutionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
|
|
6
6
|
import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
|
|
7
7
|
import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
|
|
8
8
|
import { NotebookSetting, CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
9
|
-
import { registerNotebookContribution } from '@codingame/monaco-vscode-
|
|
10
|
-
import { CodeCellViewModel } from '@codingame/monaco-vscode-
|
|
9
|
+
import { registerNotebookContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
|
|
10
|
+
import { CodeCellViewModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
|
|
11
11
|
import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
12
12
|
import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
|
|
13
13
|
import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
|
|
@@ -7,8 +7,8 @@ import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls'
|
|
|
7
7
|
import { registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
|
|
8
8
|
import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
|
|
9
9
|
import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
|
|
10
|
-
import { NotebookCellAction, findTargetCellEditor } from '@codingame/monaco-vscode-
|
|
11
|
-
import { CodeCellViewModel } from '@codingame/monaco-vscode-
|
|
10
|
+
import { NotebookCellAction, findTargetCellEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
|
|
11
|
+
import { CodeCellViewModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
|
|
12
12
|
import { NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_EDITOR_FOCUSED } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
|
|
13
13
|
import { InlineChatController } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
|
|
14
14
|
import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
|
|
@@ -20,7 +20,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
20
20
|
constructor() {
|
|
21
21
|
super({
|
|
22
22
|
id: OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID,
|
|
23
|
-
title: ( localize2(
|
|
23
|
+
title: ( localize2(16496, "Show Cell Failure Actions")),
|
|
24
24
|
precondition: ( ContextKeyExpr.and(NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, ( NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated()))),
|
|
25
25
|
f1: true,
|
|
26
26
|
keybinding: {
|
|
@@ -44,7 +44,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
44
44
|
const editor = findTargetCellEditor(context, context.cell);
|
|
45
45
|
if (editor) {
|
|
46
46
|
const controller = CodeActionController.get(editor);
|
|
47
|
-
controller?.manualTriggerAtCurrentPosition(( localize(
|
|
47
|
+
controller?.manualTriggerAtCurrentPosition(( localize(16497, "No code actions available")), CodeActionTriggerSource.Default, {
|
|
48
48
|
include: CodeActionKind.QuickFix
|
|
49
49
|
});
|
|
50
50
|
}
|
|
@@ -56,7 +56,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
56
56
|
constructor() {
|
|
57
57
|
super({
|
|
58
58
|
id: FIX_CELL_ERROR_COMMAND_ID,
|
|
59
|
-
title: ( localize2(
|
|
59
|
+
title: ( localize2(16498, "Fix Cell Error")),
|
|
60
60
|
precondition: ( ContextKeyExpr.and(NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, ( NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated()))),
|
|
61
61
|
f1: true
|
|
62
62
|
});
|
|
@@ -92,7 +92,7 @@ registerAction2(class extends NotebookCellAction {
|
|
|
92
92
|
constructor() {
|
|
93
93
|
super({
|
|
94
94
|
id: EXPLAIN_CELL_ERROR_COMMAND_ID,
|
|
95
|
-
title: ( localize2(
|
|
95
|
+
title: ( localize2(16499, "Explain Cell Error")),
|
|
96
96
|
precondition: ( ContextKeyExpr.and(NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, ( NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated()))),
|
|
97
97
|
f1: true
|
|
98
98
|
});
|
|
@@ -6,9 +6,9 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
|
6
6
|
import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
|
|
7
7
|
import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
|
|
8
8
|
import { OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID } from './cellDiagnosticsActions.js';
|
|
9
|
-
import { NotebookStatusBarController } from '@codingame/monaco-vscode-
|
|
10
|
-
import { registerNotebookContribution } from '@codingame/monaco-vscode-
|
|
11
|
-
import { CodeCellViewModel } from '@codingame/monaco-vscode-
|
|
9
|
+
import { NotebookStatusBarController } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
|
|
10
|
+
import { registerNotebookContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
|
|
11
|
+
import { CodeCellViewModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
|
|
12
12
|
import { CellStatusbarAlignment } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
|
|
13
13
|
import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
|
|
14
14
|
import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
|
|
@@ -47,7 +47,7 @@ let DiagnosticCellStatusBarItem = class DiagnosticCellStatusBarItem extends Disp
|
|
|
47
47
|
async updateSparkleItem(error) {
|
|
48
48
|
let item;
|
|
49
49
|
if (error?.location && this.hasNotebookAgent()) {
|
|
50
|
-
const tooltip = this.keybindingService.appendKeybinding(( localize(
|
|
50
|
+
const tooltip = this.keybindingService.appendKeybinding(( localize(16500, "Quick Actions")), OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID);
|
|
51
51
|
item = {
|
|
52
52
|
text: `$(sparkle)`,
|
|
53
53
|
tooltip,
|
|
@@ -3,8 +3,8 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
|
|
|
3
3
|
import { Throttler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
|
|
4
4
|
import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
|
|
5
5
|
import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
6
|
-
import { NotebookVisibleCellObserver } from '@codingame/monaco-vscode-
|
|
7
|
-
import { registerNotebookContribution } from '@codingame/monaco-vscode-
|
|
6
|
+
import { NotebookVisibleCellObserver } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/notebookVisibleCellObserver';
|
|
7
|
+
import { registerNotebookContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
|
|
8
8
|
import { INotebookCellStatusBarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service';
|
|
9
9
|
|
|
10
10
|
let ContributedStatusBarItemController = class ContributedStatusBarItemController extends Disposable {
|
|
@@ -28,15 +28,15 @@ let ContributedStatusBarItemController = class ContributedStatusBarItemControlle
|
|
|
28
28
|
}
|
|
29
29
|
_updateEverything() {
|
|
30
30
|
const newCells = this._observer.visibleCells.filter(cell => !( this._visibleCells.has(cell.handle)));
|
|
31
|
-
const visibleCellHandles = ( new Set(
|
|
31
|
+
const visibleCellHandles = ( new Set(this._observer.visibleCells.map(item => item.handle)));
|
|
32
32
|
const currentCellHandles = Array.from(( this._visibleCells.keys()));
|
|
33
33
|
const removedCells = currentCellHandles.filter(handle => !( visibleCellHandles.has(handle)));
|
|
34
34
|
const itemsToUpdate = currentCellHandles.filter(handle => ( visibleCellHandles.has(handle)));
|
|
35
35
|
this._updateVisibleCells({
|
|
36
36
|
added: newCells,
|
|
37
|
-
removed:
|
|
37
|
+
removed: removedCells.map(handle => ({
|
|
38
38
|
handle
|
|
39
|
-
}))
|
|
39
|
+
}))
|
|
40
40
|
});
|
|
41
41
|
itemsToUpdate.forEach(handle => this._visibleCells.get(handle)?.update());
|
|
42
42
|
}
|
|
@@ -100,7 +100,7 @@ class CellStatusBarHelper extends Disposable {
|
|
|
100
100
|
itemLists.forEach(itemList => itemList.dispose && itemList.dispose());
|
|
101
101
|
return;
|
|
102
102
|
}
|
|
103
|
-
const items =
|
|
103
|
+
const items = itemLists.map(itemList => itemList.items).flat();
|
|
104
104
|
const newIds = this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{
|
|
105
105
|
handle: this._cell.handle,
|
|
106
106
|
items
|